From 683b188b288fe43526e1649c784fa44435559655 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 30 Apr 2020 13:51:42 +0100
Subject: Move per-row Contact lookup to the database.

On admin report lists, and in front-end lists when an inspector, each
row was querying the database for `category_display`. We create a new
relationship for this query, and join/prefetch it wherever we request
this data.

Include staff joins on /around page, copying what happens on /reports
to prevent more lookups there too. Also add some joins for user email
in admin report list.
---
 perllib/FixMyStreet/App/Controller/Admin.pm        | 14 ++++++--
 .../FixMyStreet/App/Controller/Admin/Reports.pm    |  9 ++++-
 perllib/FixMyStreet/App/Controller/Dashboard.pm    | 10 +++++-
 perllib/FixMyStreet/App/Controller/My.pm           | 14 +++++---
 perllib/FixMyStreet/App/Controller/Report.pm       |  4 ++-
 .../FixMyStreet/App/Controller/Report/Update.pm    | 16 ++++-----
 perllib/FixMyStreet/App/Controller/Reports.pm      | 11 +++---
 perllib/FixMyStreet/Cobrand/Bexley.pm              |  2 +-
 perllib/FixMyStreet/Cobrand/Bromley.pm             | 12 +++----
 perllib/FixMyStreet/Cobrand/EastSussex.pm          |  1 -
 perllib/FixMyStreet/Cobrand/FixMyStreet.pm         |  4 +--
 perllib/FixMyStreet/Cobrand/IsleOfWight.pm         |  4 +--
 perllib/FixMyStreet/Cobrand/Peterborough.pm        |  2 +-
 perllib/FixMyStreet/DB/Result/Problem.pm           | 42 +++++++++++-----------
 perllib/FixMyStreet/DB/ResultSet/Nearby.pm         | 21 ++++++++---
 perllib/FixMyStreet/DB/ResultSet/Problem.pm        | 30 +++++++++++-----
 t/roles/translatable.t                             |  5 +--
 .../web/isleofwight/report/_item_heading.html      |  2 +-
 18 files changed, 131 insertions(+), 72 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 038cba9e5..8d6a41b9f 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -71,13 +71,16 @@ sub index : Path : Args(0) {
     }
 
     my @unsent = $c->cobrand->problems->search( {
-        state => [ FixMyStreet::DB::Result::Problem::open_states() ],
+        'me.state' => [ FixMyStreet::DB::Result::Problem::open_states() ],
         whensent => undef,
         bodies_str => { '!=', undef },
         # Ignore very recent ones that probably just haven't been sent yet
         confirmed => { '<', \"current_timestamp - '5 minutes'::interval" },
     },
     {
+        '+columns' => ['user.email'],
+        prefetch => 'contact',
+        join => 'user',
         order_by => 'confirmed',
     } )->all;
     $c->stash->{unsent_reports} = \@unsent;
@@ -301,7 +304,14 @@ sub add_flags : Private {
 sub flagged : Path('flagged') : Args(0) {
     my ( $self, $c ) = @_;
 
-    my $problems = $c->cobrand->problems->search( { flagged => 1 } );
+    my $problems = $c->cobrand->problems->search(
+        { 'me.flagged' => 1 },
+        {
+            '+columns' => ['user.email'],
+            join => 'user',
+            prefetch => 'contact',
+        }
+    );
 
     # pass in as array ref as using same template as search_reports
     # which has to use an array ref for sql quoting reasons
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
index 7300fe676..88c4380fc 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
@@ -110,6 +110,7 @@ sub index : Path {
             {
                 join => 'user',
                 '+columns' => 'user.email',
+                prefetch => 'contact',
                 rows => 50,
                 order_by => $order,
             }
@@ -166,7 +167,13 @@ sub index : Path {
 
         my $problems = $c->cobrand->problems->search(
             $query,
-            { order_by => $order, rows => 50 }
+            {
+                '+columns' => ['user.email'],
+                join => 'user',
+                prefetch => 'contact',
+                order_by => $order,
+                rows => 50
+            }
         )->page( $p_page );
         $c->stash->{problems} = [ $problems->all ];
         $c->stash->{problems_pager} = $problems->pager;
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index ad6c9ba98..f3b607ba8 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -591,7 +591,15 @@ sub heatmap_sidebar :Private {
         order_by => 'lastupdate',
     })->all ];
 
-    my $params = { map { my $n = $_; s/me\./problem\./; $_ => $where->{$n} } keys %$where };
+    my $params = { map {
+        my $v = $where->{$_};
+        if (ref $v eq 'HASH') {
+            $v = { map { my $vv = $v->{$_}; s/me\./problem\./; $_ => $vv } keys %$v };
+        } else {
+            s/me\./problem\./;
+        }
+        $_ => $v;
+    } keys %$where };
     my $body = $c->stash->{body};
 
     my @user;
diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm
index 3328caac0..316fe08b8 100644
--- a/perllib/FixMyStreet/App/Controller/My.pm
+++ b/perllib/FixMyStreet/App/Controller/My.pm
@@ -135,13 +135,14 @@ sub get_problems : Private {
     my $problems = [];
 
     my $states = $c->stash->{filter_problem_states};
+    my $table = $c->action eq 'my/planned' ? 'report' : 'me';
     my $params = {
-        state => [ keys %$states ],
+        "$table.state" => [ keys %$states ],
     };
 
     my $categories = [ $c->get_param_list('filter_category', 1) ];
     if ( @$categories ) {
-        $params->{category} = $categories;
+        $params->{"$table.category"} = $categories;
         $c->stash->{filter_category} = { map { $_ => 1 } @$categories };
     }
 
@@ -149,6 +150,7 @@ sub get_problems : Private {
     $rows = 5000 if $c->stash->{sort_key} eq 'shortlist'; # Want all reports
 
     my $rs = $c->stash->{problems_rs}->search( $params, {
+        prefetch => 'contact',
         order_by => $c->stash->{sort_order},
         rows => $rows,
     } )->include_comment_counts->page( $p_page );
@@ -186,12 +188,14 @@ sub get_updates : Private {
 sub setup_page_data : Private {
     my ($self, $c) = @_;
 
+    my $table = $c->action eq 'my/planned' ? 'report' : 'me';
     my @categories = $c->stash->{problems_rs}->search({
-        state => [ FixMyStreet::DB::Result::Problem->visible_states() ],
+        "$table.state" => [ FixMyStreet::DB::Result::Problem->visible_states() ],
     }, {
-        columns => [ 'category', 'bodies_str', 'extra' ],
+        join => 'contact',
+        columns => [ "$table.category", 'contact.extra', 'contact.category' ],
         distinct => 1,
-        order_by => [ 'category' ],
+        order_by => [ "$table.category" ],
     } )->all;
     $c->stash->{filter_categories} = \@categories;
     $c->forward('/report/stash_category_groups', [ \@categories ]) if $c->cobrand->enable_category_groups;
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 72f96013a..058edebd8 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -133,11 +133,13 @@ sub support :Chained('id') :Args(0) {
 sub load_problem_or_display_error : Private {
     my ( $self, $c, $id ) = @_;
 
+    my $attrs = { prefetch => 'contact' };
+
     # try to load a report if the id is a number
     my $problem
       = ( !$id || $id =~ m{\D} ) # is id non-numeric?
       ? undef                    # ...don't even search
-      : $c->cobrand->problems->find( { id => $id } )
+      : $c->cobrand->problems->find( { id => $id }, $attrs )
           or $c->detach( '/page_error_404_not_found', [ _('Unknown problem ID') ] );
 
     # check that the problem is suitable to show.
diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index 41c42b8a1..c5d20a5da 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -121,7 +121,7 @@ sub process_user : Private {
     if ( $c->user_exists ) { {
         my $user = $c->user->obj;
 
-        if ($c->stash->{contributing_as_another_user} = $user->contributing_as('another_user', $c, $update->problem->bodies_str_ids)) {
+        if ($c->stash->{contributing_as_another_user} = $user->contributing_as('another_user', $c, $c->stash->{problem}->bodies_str_ids)) {
             # Act as if not logged in (and it will be auto-confirmed later on)
             last;
         }
@@ -248,7 +248,7 @@ sub load_problem : Private {
     # Problem ID could come from existing update in token, or from query parameter
     my $problem_id = $update->problem_id || $c->get_param('id');
     $c->forward( '/report/load_problem_or_display_error', [ $problem_id ] );
-    $update->problem($c->stash->{problem});
+    $update->problem_id($c->stash->{problem}->id);
 }
 
 =head2 check_form_submitted
@@ -282,7 +282,8 @@ sub process_update : Private {
 
     my $name = Utils::trim_text( $params{name} );
 
-    $params{reopen} = 0 unless $c->user && $c->user->id == $c->stash->{problem}->user->id;
+    my $problem = $c->stash->{problem};
+    $params{reopen} = 0 unless $c->user && $c->user->id == $problem->user->id;
 
     my $update = $c->stash->{update};
     $update->text($params{update});
@@ -290,11 +291,11 @@ sub process_update : Private {
     $update->mark_fixed($params{fixed} ? 1 : 0);
     $update->mark_open($params{reopen} ? 1 : 0);
 
-    $c->stash->{contributing_as_body} = $c->user_exists && $c->user->contributing_as('body', $c, $update->problem->bodies_str_ids);
-    $c->stash->{contributing_as_anonymous_user} = $c->user_exists && $c->user->contributing_as('anonymous_user', $c, $update->problem->bodies_str_ids);
+    $c->stash->{contributing_as_body} = $c->user_exists && $c->user->contributing_as('body', $c, $problem->bodies_str_ids);
+    $c->stash->{contributing_as_anonymous_user} = $c->user_exists && $c->user->contributing_as('anonymous_user', $c, $problem->bodies_str_ids);
 
     # This is also done in process_user, but is needed here for anonymous() just below
-    my $anon_button = $c->cobrand->allow_anonymous_reports($update->problem->category) eq 'button' && $c->get_param('report_anonymously');
+    my $anon_button = $c->cobrand->allow_anonymous_reports($problem->category) eq 'button' && $c->get_param('report_anonymously');
     if ($anon_button) {
         $c->stash->{contributing_as_anonymous_user} = 1;
         $c->stash->{contributing_as_body} = undef;
@@ -323,7 +324,6 @@ sub process_update : Private {
         # then we are not changing the state of the problem so can use the current
         # problem state
         } else {
-            my $problem = $c->stash->{problem} || $update->problem;
             $update->problem_state( $problem->state );
         }
     }
@@ -332,7 +332,7 @@ sub process_update : Private {
     my @extra; # Next function fills this, but we don't need it here.
     # This is just so that the error checking for these extra fields runs.
     # TODO Use extra here as it is used on reports.
-    my $body = (values %{$update->problem->bodies})[0];
+    my $body = (values %{$problem->bodies})[0];
     $c->cobrand->process_open311_extras( $c, $body, \@extra );
 
     if ( $c->get_param('fms_extra_title') ) {
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index 97976ebe3..53f27eb62 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -620,6 +620,9 @@ sub load_problems_parameters : Private {
     };
     if ($c->user_exists && $body) {
         my $prefetch = [];
+        if ($c->user->from_body || $c->user->is_superuser) {
+            push @$prefetch, 'contact';
+        }
         if ($c->user->has_permission_to('planned_reports', $body->id)) {
             push @$prefetch, 'user_planned_reports';
         }
@@ -646,7 +649,7 @@ sub load_problems_parameters : Private {
     }
 
     if (@$category) {
-        $where->{category} = $category;
+        $where->{'me.category'} = $category;
     }
 
     if ($c->stash->{wards}) {
@@ -687,12 +690,12 @@ sub check_non_public_reports_permission : Private {
         }
 
         if ( $user_has_permission ) {
-            $where->{non_public} = 1 if $c->stash->{only_non_public};
+            $where->{'me.non_public'} = 1 if $c->stash->{only_non_public};
         } else {
-            $where->{non_public} = 0;
+            $where->{'me.non_public'} = 0;
         }
     } else {
-        $where->{non_public} = 0;
+        $where->{'me.non_public'} = 0;
     }
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/Bexley.pm b/perllib/FixMyStreet/Cobrand/Bexley.pm
index 481926e72..f37394794 100644
--- a/perllib/FixMyStreet/Cobrand/Bexley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bexley.pm
@@ -54,7 +54,7 @@ sub open311_munge_update_params {
 
     $params->{service_request_id_ext} = $comment->problem->id;
 
-    my $contact = $comment->problem->category_row;
+    my $contact = $comment->problem->contact;
     $params->{service_code} = $contact->email;
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 8f82817a8..bd229f360 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -344,23 +344,23 @@ sub munge_load_and_group_problems {
     return unless $c->action eq 'dashboard/heatmap';
 
     # Bromley subcategory stuff
-    if (!$where->{category}) {
+    if (!$where->{'me.category'}) {
         my $cats = $c->user->categories;
         my $subcats = $c->user->get_extra_metadata('subcategories') || [];
-        $where->{category} = [ @$cats, @$subcats ] if @$cats || @$subcats;
+        $where->{'me.category'} = [ @$cats, @$subcats ] if @$cats || @$subcats;
     }
 
     my %subcats = $self->subcategories;
     my $subcat;
-    my %chosen = map { $_ => 1 } @{$where->{category} || []};
+    my %chosen = map { $_ => 1 } @{$where->{'me.category'} || []};
     my @subcat = grep { $chosen{$_} } map { $_->{key} } map { @$_ } values %subcats;
     if (@subcat) {
         my %chosen = map { $_ => 1 } @subcat;
         $where->{'-or'} = {
-            category => [ grep { !$chosen{$_} } @{$where->{category}} ],
-            subcategory => \@subcat,
+            'me.category' => [ grep { !$chosen{$_} } @{$where->{'me.category'}} ],
+            'me.subcategory' => \@subcat,
         };
-        delete $where->{category};
+        delete $where->{'me.category'};
     }
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/EastSussex.pm b/perllib/FixMyStreet/Cobrand/EastSussex.pm
index e6c2da6c5..8d95980fe 100644
--- a/perllib/FixMyStreet/Cobrand/EastSussex.pm
+++ b/perllib/FixMyStreet/Cobrand/EastSussex.pm
@@ -11,7 +11,6 @@ sub open311_extra_data {
 
     $h->{es_original_detail} = $row->detail;
 
-    $contact = $row->category_row;
     my $fields = $contact->get_extra_fields;
     my $text = '';
     for my $field ( @$fields ) {
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index dfb511f39..f39558f45 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -139,10 +139,10 @@ sub munge_report_new_contacts {
 sub munge_load_and_group_problems {
     my ($self, $where, $filter) = @_;
 
-    return unless $where->{category} && $self->{c}->stash->{body}->name eq 'Isle of Wight Council';
+    return unless $where->{'me.category'} && $self->{c}->stash->{body}->name eq 'Isle of Wight Council';
 
     my $iow = FixMyStreet::Cobrand->get_class_for_moniker( 'isleofwight' )->new({ c => $self->{c} });
-    $where->{category} = $iow->expand_triage_cat_list($where->{category}, $self->{c}->stash->{body});
+    $where->{'me.category'} = $iow->expand_triage_cat_list($where->{'me.category'}, $self->{c}->stash->{body});
 }
 
 sub title_list {
diff --git a/perllib/FixMyStreet/Cobrand/IsleOfWight.pm b/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
index db0a20b9c..3bcea4d3d 100644
--- a/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
+++ b/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
@@ -140,9 +140,9 @@ sub munge_around_category_where {
 sub munge_load_and_group_problems {
     my ($self, $where, $filter) = @_;
 
-    return unless $where->{category};
+    return unless $where->{'me.category'};
 
-    $where->{category} = $self->_expand_triage_cat_list($where->{category});
+    $where->{'me.category'} = $self->_expand_triage_cat_list($where->{'me.category'});
 }
 
 sub munge_around_filter_category_list {
diff --git a/perllib/FixMyStreet/Cobrand/Peterborough.pm b/perllib/FixMyStreet/Cobrand/Peterborough.pm
index 0ddaeacb6..133767fa7 100644
--- a/perllib/FixMyStreet/Cobrand/Peterborough.pm
+++ b/perllib/FixMyStreet/Cobrand/Peterborough.pm
@@ -85,7 +85,7 @@ sub open311_munge_update_params {
     # Send the FMS problem ID with the update.
     $params->{service_request_id_ext} = $comment->problem->id;
 
-    my $contact = $comment->problem->category_row;
+    my $contact = $comment->problem->contact;
     $params->{service_code} = $contact->email;
 }
 
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 37563d327..42983c9ad 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -193,6 +193,27 @@ __PACKAGE__->might_have(
     cascade_copy => 0, cascade_delete => 1 },
 );
 
+# Add a possible join for the Contact object associated with
+# this report (based on bodies_str and category). If the report
+# was sent to multiple bodies, only returns the first.
+__PACKAGE__->belongs_to(
+  contact => "FixMyStreet::DB::Result::Contact",
+  sub {
+    my $args = shift;
+    return {
+        "$args->{foreign_alias}.category" => { -ident => "$args->{self_alias}.category" },
+        -and => [
+            \[ "CAST($args->{foreign_alias}.body_id AS text) = (regexp_split_to_array($args->{self_alias}.bodies_str, ','))[1]" ],
+        ]
+    };
+  },
+  {
+    join_type => "LEFT",
+    on_delete => "NO ACTION",
+    on_update => "NO ACTION",
+  },
+);
+
 __PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn");
 __PACKAGE__->rabx_column('extra');
 __PACKAGE__->rabx_column('geocode');
@@ -407,30 +428,11 @@ sub confirm {
 
 sub category_display {
     my $self = shift;
-    my $contact = $self->category_row;
+    my $contact = $self->contact;
     return $self->category unless $contact; # Fallback; shouldn't happen, but some tests
     return $contact->category_display;
 }
 
-=head2 category_row
-
-Returns the corresponding Contact object for this problem's category and body.
-If the report was sent to multiple bodies, only returns the first.
-
-=cut
-
-sub category_row {
-    my $self = shift;
-    my $schema = $self->result_source->schema;
-    my $body_id = $self->bodies_str_ids->[0];
-    return unless $body_id && $body_id =~ /^[0-9]+$/;
-    my $contact = $schema->resultset("Contact")->find({
-        body_id => $body_id,
-        category => $self->category,
-    });
-    return $contact;
-}
-
 sub bodies_str_ids {
     my $self = shift;
     return [] unless $self->bodies_str;
diff --git a/perllib/FixMyStreet/DB/ResultSet/Nearby.pm b/perllib/FixMyStreet/DB/ResultSet/Nearby.pm
index 2ebe309e3..af1142c3a 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Nearby.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Nearby.pm
@@ -17,16 +17,16 @@ sub nearby {
     }
 
     my $params = {
-        state => [ keys %{$args{states}} ],
+        'problem.state' => [ keys %{$args{states}} ],
     };
-    $params->{id} = { -not_in => $args{ids} }
+    $params->{problem_id} = { -not_in => $args{ids} }
         if $args{ids};
-    $params->{category} = $args{categories} if $args{categories} && @{$args{categories}};
+    $params->{'problem.category'} = $args{categories} if $args{categories} && @{$args{categories}};
 
     $params->{$c->stash->{report_age_field}} = { '>=', \"current_timestamp-'$args{report_age}'::interval" }
         if $args{report_age};
 
-    FixMyStreet::DB::ResultSet::Problem->non_public_if_possible($params, $c);
+    FixMyStreet::DB::ResultSet::Problem->non_public_if_possible($params, $c, 'problem');
 
     $rs = $c->cobrand->problems_restriction($rs);
 
@@ -34,11 +34,22 @@ sub nearby {
     $params = { %$params, %{$args{extra}} } if $args{extra};
 
     my $attrs = {
-        prefetch => 'problem',
+        prefetch => { problem => [] },
         bind => [ $args{latitude}, $args{longitude}, $args{distance} ],
         order_by => [ 'distance', { -desc => 'created' } ],
         rows => $args{limit},
     };
+    if ($c->user_exists) {
+        if ($c->user->from_body || $c->user->is_superuser) {
+            push @{$attrs->{prefetch}{problem}}, 'contact';
+        }
+        if ($c->user->has_body_permission_to('planned_reports')) {
+            push @{$attrs->{prefetch}{problem}}, 'user_planned_reports';
+        }
+        if ($c->user->has_body_permission_to('report_edit_priority') || $c->user->has_body_permission_to('report_inspect')) {
+            push @{$attrs->{prefetch}{problem}}, 'response_priority';
+        }
+    }
 
     my @problems = mySociety::Locale::in_gb_locale { $rs->search( $params, $attrs )->all };
     return \@problems;
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index e23cf78e1..2ce4c04be 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -26,30 +26,31 @@ sub body_query {
 # Edits PARAMS in place to either hide non_public reports, or show them
 # if user is superuser (all) or inspector (correct body)
 sub non_public_if_possible {
-    my ($rs, $params, $c) = @_;
+    my ($rs, $params, $c, $table) = @_;
+    $table ||= 'me';
     if ($c->user_exists) {
         my $only_non_public = $c->stash->{only_non_public} ? 1 : 0;
         if ($c->user->is_superuser) {
             # See all reports, no restriction
-            $params->{non_public} = 1 if $only_non_public;
+            $params->{"$table.non_public"} = 1 if $only_non_public;
         } elsif ($c->user->has_body_permission_to('report_inspect') ||
                  $c->user->has_body_permission_to('report_mark_private')) {
             if ($only_non_public) {
                 $params->{'-and'} = [
-                    non_public => 1,
+                    "$table.non_public" => 1,
                     $rs->body_query($c->user->from_body->id),
                 ];
             } else {
                 $params->{'-or'} = [
-                    non_public => 0,
+                    "$table.non_public" => 0,
                     $rs->body_query($c->user->from_body->id),
                 ];
             }
         } else {
-            $params->{non_public} = 0;
+            $params->{"$table.non_public"} = 0;
         }
     } else {
-        $params->{non_public} = 0;
+        $params->{"$table.non_public"} = 0;
     }
 }
 
@@ -175,22 +176,33 @@ sub around_map {
     my ( $rs, $c, %p) = @_;
     my $attr = {
         order_by => $p{order},
+        rows => $c->cobrand->reports_per_page,
     };
-    $attr->{rows} = $c->cobrand->reports_per_page;
+    if ($c->user_exists) {
+        if ($c->user->from_body || $c->user->is_superuser) {
+            push @{$attr->{prefetch}}, 'contact';
+        }
+        if ($c->user->has_body_permission_to('planned_reports')) {
+            push @{$attr->{prefetch}}, 'user_planned_reports';
+        }
+        if ($c->user->has_body_permission_to('report_edit_priority') || $c->user->has_body_permission_to('report_inspect')) {
+            push @{$attr->{prefetch}}, 'response_priority';
+        }
+    }
 
     unless ( $p{states} ) {
         $p{states} = FixMyStreet::DB::Result::Problem->visible_states();
     }
 
     my $q = {
-            state => [ keys %{$p{states}} ],
+            'me.state' => [ keys %{$p{states}} ],
             latitude => { '>=', $p{min_lat}, '<', $p{max_lat} },
             longitude => { '>=', $p{min_lon}, '<', $p{max_lon} },
     };
 
     $q->{$c->stash->{report_age_field}} = { '>=', \"current_timestamp-'$p{report_age}'::interval" } if
         $p{report_age};
-    $q->{category} = $p{categories} if $p{categories} && @{$p{categories}};
+    $q->{'me.category'} = $p{categories} if $p{categories} && @{$p{categories}};
 
     $rs->non_public_if_possible($q, $c);
 
diff --git a/t/roles/translatable.t b/t/roles/translatable.t
index 9f8c67394..beddb7182 100644
--- a/t/roles/translatable.t
+++ b/t/roles/translatable.t
@@ -77,8 +77,9 @@ FixMyStreet::override_config {
 subtest 'Check display_name override' => sub {
     $contact->set_extra_metadata( display_name => 'Override name' );
     $contact->update;
-    is $contact->category_display, "Override name";
-    is $problem->category_display, "Override name";
+    is $contact->category_display, "Override name", 'Contact uses display_name';
+    $problem->discard_changes;
+    is $problem->category_display, "Override name", 'Problem uses display_name';
 };
 
 done_testing;
diff --git a/templates/web/isleofwight/report/_item_heading.html b/templates/web/isleofwight/report/_item_heading.html
index 90010a548..40f9c8ad2 100644
--- a/templates/web/isleofwight/report/_item_heading.html
+++ b/templates/web/isleofwight/report/_item_heading.html
@@ -1,7 +1,7 @@
 [%
     SET title = problem.title;
     IF c.req.uri.path == '/';
-        title = problem.category_display;
+        title = problem.category; # Not category_display to prevent unneeded DM lookup
     END;
 %]
 <h3 class="item-list__heading">[% title %]</h3>
-- 
cgit v1.2.3


From 730d25ae7218d731590b322d4f419a7df6d4e4fb Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 30 Apr 2020 13:56:31 +0100
Subject: Add ability to disallow updates in a category.

Add a tickbox to the category admin, and do not allow updates on
reports made in those selected categories.
---
 CHANGELOG.md                                       |  1 +
 docs/_includes/admin-tasks-content.md              |  6 ++--
 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm | 15 ++++------
 perllib/FixMyStreet/Cobrand/Default.pm             |  1 +
 t/app/controller/admin/bodies.t                    | 11 ++++++++
 t/app/controller/report_updates.t                  | 33 ++++++++++++++--------
 templates/web/base/admin/bodies/contact-form.html  |  5 ++++
 7 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad53ca547..e5fbb6ea8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
         - Move stats from main admin index to stats index.
         - Speed up dashboard export and report search.
         - Allow a template to be an initial update on reports. #2973
+        - Interface for disabling updates for certain categories. #2991
     - Bugfixes
         - Application user in Docker container can't install packages. #2914
         - Look at all categories when sending reports.
diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index 7e3d47efe..a846b73cc 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -560,14 +560,14 @@ and staff users — can filter reports when viewing them on the site.
 From the Admin menu, click on ‘Categories’. You’ll see a table of existing categories, and below
 that, a form by which you can create new ones.
 
-
 Input a title for the category, and the email address to which reports in that category should be
 forwarded. When creating a category, these are the only fields required.
 
 You can also choose a variety of options – whether to automatically hide any
 reports made in this category, whether to prevent form submission when this
-category is selected, or what parent category or categories a particular
-category is in. See below for information on <a
+category is selected, whether updates are allowed on reports in this category,
+or what parent category or categories a particular category is in. See below
+for information on <a
 href="#creating-editing-notices">creating/editing extra notices and
 questions</a> for a category.
 
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
index 6ae068cd9..61b486f02 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
@@ -267,15 +267,12 @@ sub update_contact : Private {
     $contact->send_method( $c->get_param('send_method') );
 
     # Set flags in extra to the appropriate values
-    if ( $c->get_param('photo_required') ) {
-        $contact->set_extra_metadata_if_undefined(  photo_required => 1 );
-    } else {
-        $contact->unset_extra_metadata( 'photo_required' );
-    }
-    if ( $c->get_param('open311_protect') ) {
-        $contact->set_extra_metadata( open311_protect => 1 );
-    } else {
-        $contact->unset_extra_metadata( 'open311_protect' );
+    foreach (qw(photo_required open311_protect updates_disallowed)) {
+        if ( $c->get_param($_) ) {
+            $contact->set_extra_metadata( $_ => 1 );
+        } else {
+            $contact->unset_extra_metadata($_);
+        }
     }
     if ( my @group = $c->get_param_list('group') ) {
         @group = grep { $_ } @group;
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 695487268..07e781479 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -530,6 +530,7 @@ or not. Default behaviour is disallowed if "closed_updates" metadata is set.
 sub updates_disallowed {
     my ($self, $problem) = @_;
     return 1 if $problem->get_extra_metadata('closed_updates');
+    return 1 if $problem->contact && $problem->contact->get_extra_metadata('updates_disallowed');
     return 0;
 }
 
diff --git a/t/app/controller/admin/bodies.t b/t/app/controller/admin/bodies.t
index c73a90da1..7ec7aed75 100644
--- a/t/app/controller/admin/bodies.t
+++ b/t/app/controller/admin/bodies.t
@@ -261,6 +261,17 @@ subtest 'open311 protection editing' => sub {
     is $contact->get_extra_metadata('open311_protect'), 1, 'Open311 protect flag set';
 };
 
+subtest 'updates disabling' => sub {
+    $mech->get_ok('/admin/body/' . $body->id . '/test%20category');
+    $mech->submit_form_ok( { with_fields => {
+        updates_disallowed => 1,
+        note => 'Disabling updates',
+    } } );
+    $mech->content_contains('Values updated');
+    my $contact = $body->contacts->find({ category => 'test category' });
+    is $contact->get_extra_metadata('updates_disallowed'), 1, 'Updates disallowed flag set';
+};
+
 
 }; # END of override wrap
 
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 07ee48587..e8ab1cc85 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -22,6 +22,8 @@ my $user2 = $mech->create_user_ok('commenter@example.com', name => 'Commenter');
 
 my $body = $mech->create_body_ok(2504, 'Westminster City Council');
 
+my $contact = $mech->create_contact_ok( body_id => $body->id, category => 'Other', email => 'other' );
+
 my $dt = DateTime->new(
     year   => 2011,
     month  => 04,
@@ -1893,6 +1895,18 @@ for my $test (
     };
 }
 
+$mech->log_in_ok( $report->user->email );
+
+my %standard_fields = (
+    name => $report->user->name,
+    update => 'update text',
+    photo1 => '',
+    photo2 => '',
+    photo3 => '',
+    may_show_name => 1,
+    add_alert => 1,
+);
+
 for my $test (
     {
         desc => 'update confirmed without marking as fixed leaves state unchanged',
@@ -2094,18 +2108,6 @@ for my $test (
     },
 ) {
     subtest $test->{desc} => sub {
-        $mech->log_in_ok( $report->user->email );
-
-        my %standard_fields = (
-            name => $report->user->name,
-            update => 'update text',
-            photo1 => '',
-            photo2 => '',
-            photo3 => '',
-            may_show_name => 1,
-            add_alert => 1,
-        );
-
         my %expected_fields = (
             %standard_fields,
             %{ $test->{expected_form_fields} },
@@ -2178,4 +2180,11 @@ FixMyStreet::override_config {
     };
 };
 
+subtest 'check disabling of updates per category' => sub {
+    $contact->set_extra_metadata( updates_disallowed => 1 );
+    $contact->update;
+    $mech->get_ok("/report/$report_id");
+    $mech->content_lacks('Provide an update');
+};
+
 done_testing();
diff --git a/templates/web/base/admin/bodies/contact-form.html b/templates/web/base/admin/bodies/contact-form.html
index 35fab4541..ddee35020 100644
--- a/templates/web/base/admin/bodies/contact-form.html
+++ b/templates/web/base/admin/bodies/contact-form.html
@@ -63,6 +63,11 @@
         <textarea id="disabled-message" name="disable_message" class="form-control">[% contact.disable_form_field.description %]</textarea>
     </p>
 
+    <p class="form-check">
+        <input type="checkbox" name="updates_disallowed" value="1" id="updates_disallowed" [% ' checked' IF contact.get_extra_metadata('updates_disallowed') %]>
+        <label for="updates_disallowed">[% loc('Disable updates on reports in this category') %]</label>
+    </p>
+
     [% IF body.send_method == 'Open311' %]
       <p class="form-check">
           <input type="checkbox" name="open311_protect" value="1" id="open311_protect"[% ' checked' IF contact.get_extra_metadata('open311_protect') %]>
-- 
cgit v1.2.3


From a2cc36b0d94143d1150a73993541eb829bd9b9fa Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 4 May 2020 16:33:01 +0100
Subject: Include group in CSV export if enabled.

---
 CHANGELOG.md                                    |  1 +
 perllib/FixMyStreet/App/Controller/Dashboard.pm | 29 ++++++++++++++++++++-----
 perllib/FixMyStreet/Cobrand/Bexley.pm           | 27 -----------------------
 perllib/FixMyStreet/Cobrand/TfL.pm              | 12 ----------
 perllib/FixMyStreet/DB/ResultSet/Contact.pm     |  9 --------
 t/cobrand/bexley.t                              | 19 +++++++++-------
 t/cobrand/tfl.t                                 |  1 +
 7 files changed, 37 insertions(+), 61 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7772d93e8..0877dcca0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
         - Speed up dashboard export and report search. #2988
         - Allow a template to be an initial update on reports. #2973
         - Interface for disabling updates for certain categories. #2991
+        - Include group in CSV export if enabled. #2994
     - Bugfixes:
         - Application user in Docker container can't install packages. #2914
         - Look at all categories when sending reports.
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index f3b607ba8..e5a526efc 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -152,14 +152,14 @@ sub index : Path : Args(0) {
 sub construct_rs_filter : Private {
     my ($self, $c, $updates) = @_;
 
+    my $table_name = $updates ? 'problem' : 'me';
+
     my %where;
     $where{areas} = [ map { { 'like', "%,$_,%" } } @{$c->stash->{ward}} ]
         if @{$c->stash->{ward}};
-    $where{category} = $c->stash->{category}
+    $where{"$table_name.category"} = $c->stash->{category}
         if $c->stash->{category};
 
-    my $table_name = $updates ? 'problem' : 'me';
-
     my $state = $c->stash->{q_state};
     if ( FixMyStreet::DB::Result::Problem->fixed_states->{$state} ) { # Probably fixed - council
         $where{"$table_name.state"} = [ FixMyStreet::DB::Result::Problem->fixed_states() ];
@@ -347,10 +347,17 @@ sub export_as_csv_updates : Private {
 sub export_as_csv : Private {
     my ($self, $c) = @_;
 
+    my $groups = $c->cobrand->enable_category_groups ? 1 : 0;
+    my $join = ['comments'];
+    my $columns = ['comments.problem_state', 'comments.state', 'comments.confirmed', 'comments.mark_fixed'];
+    if ($groups) {
+        push @$join, 'contact';
+        push @$columns, 'contact.extra';
+    }
     my $csv = $c->stash->{csv} = {
         objects => $c->stash->{objects_rs}->search_rs({}, {
-            join => 'comments',
-            '+columns' => ['comments.problem_state', 'comments.state', 'comments.confirmed', 'comments.mark_fixed'],
+            join => $join,
+            '+columns' => $columns,
             order_by => ['me.confirmed', 'me.id'],
             cursor_page_size => 1000,
         }),
@@ -360,6 +367,7 @@ sub export_as_csv : Private {
             'Detail',
             'User Name',
             'Category',
+            $groups ? ('Subcategory') : (),
             'Created',
             'Confirmed',
             'Acknowledged',
@@ -381,6 +389,7 @@ sub export_as_csv : Private {
             'detail',
             'user_name_display',
             'category',
+            $groups ? ('subcategory') : (),
             'created',
             'confirmed',
             'acknowledged',
@@ -481,6 +490,16 @@ sub generate_csv : Private {
             ($hashref->{local_coords_x}, $hashref->{local_coords_y}) =
                 $obj->local_coords;
         }
+
+        if ($asked_for{subcategory}) {
+            my $group = $obj->contact && $obj->contact->get_extra_metadata('group') || '';
+            $group = join(',', ref $group ? @$group : $group);
+            if ($group) {
+                $hashref->{subcategory} = $obj->category;
+                $hashref->{category} = $group;
+            }
+        }
+
         if ($obj->can('url')) {
             my $base = $c->cobrand->base_url_for_report($obj->can('problem') ? $obj->problem : $obj);
             $hashref->{url} = join '', $base, $obj->url;
diff --git a/perllib/FixMyStreet/Cobrand/Bexley.pm b/perllib/FixMyStreet/Cobrand/Bexley.pm
index f37394794..ad3036711 100644
--- a/perllib/FixMyStreet/Cobrand/Bexley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bexley.pm
@@ -216,33 +216,6 @@ sub email_list {
     return @to;
 }
 
-sub dashboard_export_problems_add_columns {
-    my $self = shift;
-    my $c = $self->{c};
-
-    my %groups;
-    if ($c->stash->{body}) {
-        %groups = FixMyStreet::DB->resultset('Contact')->search({
-            body_id => $c->stash->{body}->id,
-        })->group_lookup;
-    }
-
-    splice @{$c->stash->{csv}->{headers}}, 5, 0, 'Subcategory';
-    splice @{$c->stash->{csv}->{columns}}, 5, 0, 'subcategory';
-
-    $c->stash->{csv}->{extra_data} = sub {
-        my $report = shift;
-
-        if ($groups{$report->category}) {
-            return {
-                category => $groups{$report->category},
-                subcategory => $report->category,
-            };
-        }
-        return {};
-    };
-}
-
 sub _is_out_of_hours {
     my $time = localtime;
     return 1 if $time->hour > 16 || ($time->hour == 16 && $time->min >= 45);
diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm
index b98ad1d8b..78b7c271a 100644
--- a/perllib/FixMyStreet/Cobrand/TfL.pm
+++ b/perllib/FixMyStreet/Cobrand/TfL.pm
@@ -245,16 +245,6 @@ sub dashboard_export_problems_add_columns {
     my $self = shift;
     my $c = $self->{c};
 
-    my %groups;
-    if ($c->stash->{body}) {
-        %groups = FixMyStreet::DB->resultset('Contact')->search({
-            body_id => $c->stash->{body}->id,
-        })->group_lookup;
-    }
-
-    splice @{$c->stash->{csv}->{headers}}, 5, 0, 'Subcategory';
-    splice @{$c->stash->{csv}->{columns}}, 5, 0, 'subcategory';
-
     $c->stash->{csv}->{headers} = [
         map { $_ eq 'Ward' ? 'Borough' : $_ } @{ $c->stash->{csv}->{headers} },
         "Agent responsible",
@@ -315,8 +305,6 @@ sub dashboard_export_problems_add_columns {
         my $fields = {
             acknowledged => $report->whensent,
             agent_responsible => $agent ? $agent->name : '',
-            category => $groups{$report->category},
-            subcategory => $report->category,
             user_name_display => $user_name_display,
             safety_critical => $safety_critical,
             delivered_to => join(',', @$delivered_to),
diff --git a/perllib/FixMyStreet/DB/ResultSet/Contact.pm b/perllib/FixMyStreet/DB/ResultSet/Contact.pm
index 801d20cc0..3aceee9e7 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Contact.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Contact.pm
@@ -90,13 +90,4 @@ sub summary_count {
     );
 }
 
-sub group_lookup {
-    my $rs = shift;
-    map {
-        my $group = $_->get_extra_metadata('group') || '';
-        $group = join(',', ref $group ? @$group : $group);
-        $_->category => $group
-    } $rs->all;
-}
-
 1;
diff --git a/t/cobrand/bexley.t b/t/cobrand/bexley.t
index 352e61389..91e30ff50 100644
--- a/t/cobrand/bexley.t
+++ b/t/cobrand/bexley.t
@@ -50,14 +50,17 @@ FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ 'bexley' ],
     MAPIT_URL => 'http://mapit.uk/',
     STAGING_FLAGS => { send_reports => 1, skip_checks => 0 },
-    COBRAND_FEATURES => { open311_email => { bexley => {
-        p1 => 'p1@bexley',
-        p1confirm => 'p1confirm@bexley',
-        lighting => 'thirdparty@notbexley.example.com,another@notbexley.example.com',
-        outofhours => 'outofhours@bexley,ooh2@bexley',
-        flooding => 'flooding@bexley',
-        eh => 'eh@bexley',
-    } } },
+    COBRAND_FEATURES => {
+        open311_email => { bexley => {
+            p1 => 'p1@bexley',
+            p1confirm => 'p1confirm@bexley',
+            lighting => 'thirdparty@notbexley.example.com,another@notbexley.example.com',
+            outofhours => 'outofhours@bexley,ooh2@bexley',
+            flooding => 'flooding@bexley',
+            eh => 'eh@bexley',
+        } },
+        category_groups => { bexley => 1 },
+    },
 }, sub {
 
     subtest 'cobrand displays council name' => sub {
diff --git a/t/cobrand/tfl.t b/t/cobrand/tfl.t
index 8ddc3d671..f8e0a11c8 100644
--- a/t/cobrand/tfl.t
+++ b/t/cobrand/tfl.t
@@ -188,6 +188,7 @@ FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ 'tfl', 'bromley', 'fixmystreet'],
     MAPIT_URL => 'http://mapit.uk/',
     COBRAND_FEATURES => {
+        category_groups => { tfl => 1 },
         internal_ips => { tfl => [ '127.0.0.1' ] },
         base_url => {
             tfl => 'https://street.tfl'
-- 
cgit v1.2.3


From f6d807fd5217a19ac488f652d1f0853a7891231f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 1 May 2020 15:42:01 +0100
Subject: Add way to disallow report reopening in a category

Add a tickbox to the category admin, and do not allow reopening on
reports made in the selected categories.
---
 CHANGELOG.md                                            |  2 +-
 docs/_includes/admin-tasks-content.md                   |  1 +
 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm      |  2 +-
 perllib/FixMyStreet/Cobrand/Default.pm                  | 17 ++++++++++++++++-
 t/app/controller/admin/bodies.t                         | 11 +++++++++++
 t/app/controller/report_updates.t                       | 11 +++++++++++
 templates/web/base/admin/bodies/contact-form.html       |  6 ++++++
 .../web/base/report/update/form_state_checkbox.html     |  2 ++
 .../report/update/form_state_checkbox.html              |  2 ++
 9 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7772d93e8..ff8b11a7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
         - Move stats from main admin index to stats index. #2982
         - Speed up dashboard export and report search. #2988
         - Allow a template to be an initial update on reports. #2973
-        - Interface for disabling updates for certain categories. #2991
+        - Interface for disabling updates/reopening for certain categories. #2991 #2992
     - Bugfixes:
         - Application user in Docker container can't install packages. #2914
         - Look at all categories when sending reports.
diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index a846b73cc..765e96370 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -566,6 +566,7 @@ forwarded. When creating a category, these are the only fields required.
 You can also choose a variety of options – whether to automatically hide any
 reports made in this category, whether to prevent form submission when this
 category is selected, whether updates are allowed on reports in this category,
+whether members of the public can reopen fixed/closed reports in this category,
 or what parent category or categories a particular category is in. See below
 for information on <a
 href="#creating-editing-notices">creating/editing extra notices and
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
index 61b486f02..bfa74ad4e 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
@@ -267,7 +267,7 @@ sub update_contact : Private {
     $contact->send_method( $c->get_param('send_method') );
 
     # Set flags in extra to the appropriate values
-    foreach (qw(photo_required open311_protect updates_disallowed)) {
+    foreach (qw(photo_required open311_protect updates_disallowed reopening_disallowed)) {
         if ( $c->get_param($_) ) {
             $contact->set_extra_metadata( $_ => 1 );
         } else {
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 07e781479..df7e333fb 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -523,7 +523,8 @@ sub allow_update_reporting { return 0; }
 =item updates_disallowed
 
 Returns a boolean indicating whether updates on a particular report are allowed
-or not. Default behaviour is disallowed if "closed_updates" metadata is set.
+or not. Default behaviour is disallowed if "closed_updates" metadata is set, or
+if the report's category has its "updates_disallowed" flag set.
 
 =cut
 
@@ -534,6 +535,20 @@ sub updates_disallowed {
     return 0;
 }
 
+=item reopening_disallowed
+
+Returns a boolean indicating whether reopening of a particular report is
+allowed or not. Default behaviour is allowed unless the report's category
+has its reopening_disallowed flag set.
+
+=cut
+
+sub reopening_disallowed {
+    my ($self, $problem) = @_;
+    return 1 if $problem->contact && $problem->contact->get_extra_metadata('reopening_disallowed');
+    return 0;
+}
+
 =item geocode_postcode
 
 Given a QUERY, return LAT/LON and/or ERROR.
diff --git a/t/app/controller/admin/bodies.t b/t/app/controller/admin/bodies.t
index 7ec7aed75..d3e4074f9 100644
--- a/t/app/controller/admin/bodies.t
+++ b/t/app/controller/admin/bodies.t
@@ -272,6 +272,17 @@ subtest 'updates disabling' => sub {
     is $contact->get_extra_metadata('updates_disallowed'), 1, 'Updates disallowed flag set';
 };
 
+subtest 'reopen disabling' => sub {
+    $mech->get_ok('/admin/body/' . $body->id . '/test%20category');
+    $mech->submit_form_ok( { with_fields => {
+        reopening_disallowed => 1,
+        note => 'Disabling reopening',
+    } } );
+    $mech->content_contains('Values updated');
+    my $contact = $body->contacts->find({ category => 'test category' });
+    is $contact->get_extra_metadata('reopening_disallowed'), 1, 'Reopening disallowed flag set';
+};
+
 
 }; # END of override wrap
 
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index e8ab1cc85..e97b04f12 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -2145,6 +2145,17 @@ for my $test (
     };
 }
 
+subtest 'check disabling of reopening' => sub {
+    $report->state('fixed - council');
+    $report->update;
+    $mech->get_ok("/report/$report_id");
+    $mech->content_contains('This problem has not been fixed');
+    $contact->set_extra_metadata( reopening_disallowed => 1 );
+    $contact->update;
+    $mech->get_ok("/report/$report_id");
+    $mech->content_lacks('This problem has not been fixed');
+};
+
 subtest 'check have to be logged in for creator fixed questionnaire' => sub {
     $mech->log_out_ok();
 
diff --git a/templates/web/base/admin/bodies/contact-form.html b/templates/web/base/admin/bodies/contact-form.html
index ddee35020..0224946cf 100644
--- a/templates/web/base/admin/bodies/contact-form.html
+++ b/templates/web/base/admin/bodies/contact-form.html
@@ -68,6 +68,12 @@
         <label for="updates_disallowed">[% loc('Disable updates on reports in this category') %]</label>
     </p>
 
+    <p class="form-check">
+        <input type="checkbox" name="reopening_disallowed" value="1" id="reopening_disallowed" [% ' checked' IF contact.get_extra_metadata('reopening_disallowed') %]>
+        <label for="reopening_disallowed">[% loc('Disable reopening of reports in this category') %]</label>
+        <span class='form-hint'>[% loc('Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update.') %]</span>
+    </p>
+
     [% IF body.send_method == 'Open311' %]
       <p class="form-check">
           <input type="checkbox" name="open311_protect" value="1" id="open311_protect"[% ' checked' IF contact.get_extra_metadata('open311_protect') %]>
diff --git a/templates/web/base/report/update/form_state_checkbox.html b/templates/web/base/report/update/form_state_checkbox.html
index 5316affb9..b65df72b7 100644
--- a/templates/web/base/report/update/form_state_checkbox.html
+++ b/templates/web/base/report/update/form_state_checkbox.html
@@ -1,5 +1,7 @@
 [% IF (problem.is_fixed OR problem.is_closed) AND ((c.user_exists AND c.user.id == problem.user_id) OR alert_to_reporter) %]
 
+    [% RETURN IF c.cobrand.reopening_disallowed(problem) ~%]
+
     <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF (update.mark_open || c.req.params.reopen) %]>
     [% IF problem.is_closed %]
       <label class="inline" for="form_reopen">[% loc('This problem is still ongoing') %]</label>
diff --git a/templates/web/fixmystreet.com/report/update/form_state_checkbox.html b/templates/web/fixmystreet.com/report/update/form_state_checkbox.html
index 16ae59bc8..41b8c4897 100644
--- a/templates/web/fixmystreet.com/report/update/form_state_checkbox.html
+++ b/templates/web/fixmystreet.com/report/update/form_state_checkbox.html
@@ -2,6 +2,8 @@
 
 [% IF (problem.is_fixed OR problem.is_closed) AND ((c.user_exists AND c.user.id == problem.user_id) OR alert_to_reporter) %]
 
+    [% RETURN IF c.cobrand.reopening_disallowed(problem) ~%]
+
     <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF (update.mark_open || c.req.params.reopen) %]>
     [% IF problem.is_closed %]
       <label class="inline" for="form_reopen">[% loc('This problem is still ongoing') %]</label>
-- 
cgit v1.2.3


From 5ce552af2b66613272dc9cfe2d46532e057f44f7 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 7 May 2020 12:44:23 +0100
Subject: Fix dashboard report CSV export.

The change to join in e16054150 did not include a collapse that the
previous prefetch was doing, so multiple rows per result were being
returned.
---
 CHANGELOG.md                                    | 2 ++
 perllib/FixMyStreet/App/Controller/Dashboard.pm | 5 +++--
 t/app/controller/dashboard.t                    | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b62915428..61a56ebdd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## Releases
 
 * Unreleased
+    - Bugfixes:
+        - Fix issue with dashboard report CSV export. #3026
 
 * v3.0.1 (6th May 2020)
     - New features:
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index e5a526efc..833d6d6b2 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -349,14 +349,15 @@ sub export_as_csv : Private {
 
     my $groups = $c->cobrand->enable_category_groups ? 1 : 0;
     my $join = ['comments'];
-    my $columns = ['comments.problem_state', 'comments.state', 'comments.confirmed', 'comments.mark_fixed'];
+    my $columns = ['comments.id', 'comments.problem_state', 'comments.state', 'comments.confirmed', 'comments.mark_fixed'];
     if ($groups) {
         push @$join, 'contact';
-        push @$columns, 'contact.extra';
+        push @$columns, 'contact.id', 'contact.extra';
     }
     my $csv = $c->stash->{csv} = {
         objects => $c->stash->{objects_rs}->search_rs({}, {
             join => $join,
+            collapse => 1,
             '+columns' => $columns,
             order_by => ['me.confirmed', 'me.id'],
             cursor_page_size => 1000,
diff --git a/t/app/controller/dashboard.t b/t/app/controller/dashboard.t
index 72fc00128..c62ada89a 100644
--- a/t/app/controller/dashboard.t
+++ b/t/app/controller/dashboard.t
@@ -70,6 +70,7 @@ foreach my $problem (@fixed_problems) {
 
 foreach my $problem (@closed_problems) {
     $problem->update({ state => 'closed' });
+    $mech->create_comment_for_problem($problem, $counciluser, 'Name', 'in progress text', 0, 'confirmed', 'in progress');
     $mech->create_comment_for_problem($problem, $counciluser, 'Title', 'text', 0, 'confirmed', 'closed');
 }
 
@@ -214,7 +215,7 @@ FixMyStreet::override_config {
     subtest 'export updates as csv' => sub {
         $mech->get_ok('/dashboard?updates=1&export=1');
         my @rows = $mech->content_as_csv;
-        is scalar @rows, 15, '1 (header) + 14 (updates) = 15 lines';
+        is scalar @rows, 18, '1 (header) + 17 (updates) = 18 lines';
         is scalar @{$rows[0]}, 8, '8 columns present';
 
         is_deeply $rows[0],
-- 
cgit v1.2.3


From 7cd75c95b5b910b44687b3b478bd0eadbf6f0549 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 7 May 2020 13:52:59 +0100
Subject: [TfL] Add new pavement overcrowding category TLRN-only.

For https://github.com/mysociety/fixmystreet-commercial/issues/1883
---
 perllib/FixMyStreet/Cobrand/TfL.pm | 1 +
 web/cobrands/tfl/assets.js         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm
index 78b7c271a..da762e386 100644
--- a/perllib/FixMyStreet/Cobrand/TfL.pm
+++ b/perllib/FixMyStreet/Cobrand/TfL.pm
@@ -486,6 +486,7 @@ sub _tlrn_categories { [
     "Mobile Crane Operation",
     "Other (TfL)",
     "Pavement Defect (uneven surface / cracked paving slab)",
+    "Pavement Overcrowding",
     "Pothole",
     "Pothole (minor)",
     "Roadworks",
diff --git a/web/cobrands/tfl/assets.js b/web/cobrands/tfl/assets.js
index ad58c5c8a..b47769b6f 100644
--- a/web/cobrands/tfl/assets.js
+++ b/web/cobrands/tfl/assets.js
@@ -64,6 +64,7 @@ var tlrn_categories = [
     "Mobile Crane Operation",
     "Other (TfL)",
     "Pavement Defect (uneven surface / cracked paving slab)",
+    "Pavement Overcrowding",
     "Pothole",
     "Pothole (minor)",
     "Roadworks",
-- 
cgit v1.2.3


From 725d7ccf1874e3404c6fa05b8269cb57bb2b2ea1 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 7 May 2020 17:08:49 +0100
Subject: [Buckinghamshire] Stop hiding staging banner.

---
 web/cobrands/buckinghamshire/base.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/web/cobrands/buckinghamshire/base.scss b/web/cobrands/buckinghamshire/base.scss
index 0c7bb4bc2..8df2cab7b 100644
--- a/web/cobrands/buckinghamshire/base.scss
+++ b/web/cobrands/buckinghamshire/base.scss
@@ -5,10 +5,6 @@
 
 @import "../sass/base";
 
-.dev-site-notice {
-  display: none;
-}
-
 .container {
   padding: 0 20px;
 }
-- 
cgit v1.2.3


From dc1507989b865999a96b448aad46a65ccb468244 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 15 Apr 2020 17:02:44 +0100
Subject: In category admin, group already shown elsewhere.

Groups have their own special admin section above, so no need to show it
in the extra data list (especially as if it is in more than one group it
only shows a reference).
---
 CHANGELOG.md                                      | 1 +
 templates/web/base/admin/bodies/contact-form.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61a56ebdd..c19e2ffa3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
         - Allow a template to be an initial update on reports. #2973
         - Interface for disabling updates/reopening for certain categories. #2991 #2992
         - Include group in CSV export if enabled. #2994
+        - In category admin, group already shown elsewhere.
     - Bugfixes:
         - Application user in Docker container can't install packages. #2914
         - Look at all categories when sending reports.
diff --git a/templates/web/base/admin/bodies/contact-form.html b/templates/web/base/admin/bodies/contact-form.html
index 0224946cf..d989b62aa 100644
--- a/templates/web/base/admin/bodies/contact-form.html
+++ b/templates/web/base/admin/bodies/contact-form.html
@@ -125,6 +125,7 @@
     <h2>[% loc('Extra data:') %] </h2>
     <dl>
       [% FOR pair IN contact.get_extra_metadata %]
+        [% NEXT IF pair.key == 'group' %]
         <dt>[% pair.key %]</dt> <dd>[% pair.value OR '<em>-</em>' %]</dd>
       [% END %]
     </dl>
-- 
cgit v1.2.3


From 7d395d5ca8049a904473e90957115ce675e57db7 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 17 Apr 2020 12:43:57 +0100
Subject: Refactor report page permissions.

Look up user's permissions once at the start, and
use that throughout the report page templates.
---
 perllib/FixMyStreet/App/Controller/Report.pm       | 28 ++++++++++------------
 perllib/FixMyStreet/DB/Result/User.pm              |  2 +-
 templates/web/base/admin/triage/_inspect.html      |  1 -
 templates/web/base/report/_inspect.html            |  1 -
 templates/web/base/report/display.html             |  3 ---
 templates/web/base/report/display_tools.html       |  2 +-
 templates/web/base/report/inspect/information.html |  2 +-
 .../web/base/report/update/form_user_loggedin.html |  6 ++---
 8 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 058edebd8..82e8b107f 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -85,14 +85,14 @@ sub display :PathPart('') :Chained('id') :Args(0) {
     $c->forward( 'load_updates' );
     $c->forward( 'format_problem_for_display' );
 
-    my $permissions = $c->stash->{_permissions} ||= $c->forward( 'check_has_permission_to',
-        [ qw/report_inspect report_edit_category report_edit_priority report_mark_private triage/ ] );
-    if (any { $_ } values %$permissions) {
+    my $permissions = $c->stash->{permissions} ||= $c->forward('fetch_permissions');
+
+    if (grep { $permissions->{$_} } qw/report_inspect report_edit_category report_edit_priority report_mark_private triage/) {
         $c->stash->{template} = 'report/inspect.html';
         $c->forward('inspect');
     }
 
-    if ($c->user_exists && $c->user->has_permission_to(contribute_as_another_user => $c->stash->{problem}->bodies_str_ids)) {
+    if ($permissions->{contribute_as_another_user}) {
         $c->stash->{email} = $c->user->email;
     }
 }
@@ -160,8 +160,7 @@ sub load_problem_or_display_error : Private {
     } elsif ( $problem->non_public ) {
         # Creator, and inspection users can see non_public reports
         $c->stash->{problem} = $problem;
-        my $permissions = $c->stash->{_permissions} = $c->forward( 'check_has_permission_to',
-            [ qw/report_inspect report_edit_category report_edit_priority report_mark_private / ] );
+        my $permissions = $c->stash->{permissions} = $c->forward('fetch_permissions');
 
         # If someone has clicked a unique token link in an email to them
         my $from_email = $c->sessionid && $c->flash->{alert_to_reporter} && $c->flash->{alert_to_reporter} == $problem->id;
@@ -386,7 +385,7 @@ sub delete :Chained('id') :Args(0) {
 sub inspect : Private {
     my ( $self, $c ) = @_;
     my $problem = $c->stash->{problem};
-    my $permissions = $c->stash->{_permissions};
+    my $permissions = $c->stash->{permissions};
 
     $c->forward('/admin/reports/categories_for_point');
     $c->stash->{report_meta} = { map { 'x' . $_->{name} => $_ } @{ $c->stash->{problem}->get_extra_fields() } };
@@ -668,22 +667,19 @@ sub _nearby_json :Private {
 }
 
 
-=head2 check_has_permission_to
+=head2 fetch_permissions
 
-Ensure the currently logged-in user has any of the provided permissions applied
-to the current Problem in $c->stash->{problem}. Shows the 403 page if not.
+Returns a hash of the user's permissions, applied to the problem
+in $c->stash->{problem}.
 
 =cut
 
-sub check_has_permission_to : Private {
-    my ( $self, $c, @permissions ) = @_;
+sub fetch_permissions : Private {
+    my ( $self, $c ) = @_;
     return {} unless $c->user_exists;
-    my $bodies = $c->stash->{problem}->bodies_str_ids;
-    my %permissions = map { $_ => $c->user->has_permission_to($_, $bodies) } @permissions;
-    return \%permissions;
+    return $c->user->permissions($c->stash->{problem});
 };
 
-
 sub stash_category_groups : Private {
     my ( $self, $c, $contacts, $combine_multiple ) = @_;
 
diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm
index b0a05d0b7..49338f245 100644
--- a/perllib/FixMyStreet/DB/Result/User.pm
+++ b/perllib/FixMyStreet/DB/Result/User.pm
@@ -444,7 +444,7 @@ sub permissions {
 
     my $body_id = $problem->bodies_str;
 
-    return unless $self->belongs_to_body($body_id);
+    return {} unless $self->belongs_to_body($body_id);
 
     my @permissions = grep { $_->{body_id} == $self->from_body->id } @{$self->body_permissions};
     return { map { $_->{permission} => 1 } @permissions };
diff --git a/templates/web/base/admin/triage/_inspect.html b/templates/web/base/admin/triage/_inspect.html
index 926197ceb..bd76a47f7 100644
--- a/templates/web/base/admin/triage/_inspect.html
+++ b/templates/web/base/admin/triage/_inspect.html
@@ -24,7 +24,6 @@
 </select>
 [% END %]
 
-[% permissions = c.user.permissions(problem) %]
 [% second_column = BLOCK -%]
   <div id="side-inspect">
 
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 771942b16..a8be342d0 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -1,4 +1,3 @@
-[% permissions = c.user.permissions(problem) %]
 [% second_column = BLOCK -%]
   <div id="side-inspect">
 
diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html
index f08df931d..af2282f66 100644
--- a/templates/web/base/report/display.html
+++ b/templates/web/base/report/display.html
@@ -38,9 +38,6 @@
     [% SET shown_form = 1 %]
 [% END %]
 
-[% IF c.user_exists %]
-    [% DEFAULT permissions = c.user.permissions(problem) %]
-[%- END %]
 [% INCLUDE 'report/_main.html' %]
 
 [% IF problem.duplicate_of %]
diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html
index e16ffcb2c..a09abd73b 100644
--- a/templates/web/base/report/display_tools.html
+++ b/templates/web/base/report/display_tools.html
@@ -46,7 +46,7 @@
         [% loc('Receive email when updates are left on this problem.' ) %]</p>
         <fieldset>
       [% IF c.user_exists %]
-          [% IF c.user.has_permission_to("contribute_as_another_user", problem.bodies_str_ids) %]
+          [% IF permissions.contribute_as_another_user %]
             <label for="alert_rznvy">[% loc('Email') %]</label>
             <div class="form-txt-submit-box">
                 <input type="email" class="form-control" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30">
diff --git a/templates/web/base/report/inspect/information.html b/templates/web/base/report/inspect/information.html
index b81b37543..3abde9a98 100644
--- a/templates/web/base/report/inspect/information.html
+++ b/templates/web/base/report/inspect/information.html
@@ -6,7 +6,7 @@
         <p>
           <strong>[% loc('Report ID:') %]</strong>
           <span class="js-report-id">[% problem.id %]</span>
-          [% IF c.user_exists AND c.cobrand.admin_allow_user(c.user) AND c.user.has_permission_to('report_edit', problem.bodies_str_ids) %]
+          [% IF c.user_exists AND c.cobrand.admin_allow_user(c.user) AND permissions.report_edit %]
             (<a href="[% c.uri_for_action( 'admin/reports/edit', [ problem.id ] ) %]">[% loc('admin') %]</a>)
           [% END %]
         </p>
diff --git a/templates/web/base/report/update/form_user_loggedin.html b/templates/web/base/report/update/form_user_loggedin.html
index bec783bb4..35c9beeff 100644
--- a/templates/web/base/report/update/form_user_loggedin.html
+++ b/templates/web/base/report/update/form_user_loggedin.html
@@ -4,9 +4,9 @@
 
 [% PROCESS 'user/_anonymity.html' anonymous = update.anonymous %]
 
-  [% can_contribute_as_another_user = c.user.has_permission_to("contribute_as_another_user", problem.bodies_str_ids) %]
-  [% can_contribute_as_anonymous_user = c.user.has_permission_to("contribute_as_anonymous_user", problem.bodies_str_ids) %]
-  [% can_contribute_as_body = c.user.from_body AND c.user.has_permission_to("contribute_as_body", problem.bodies_str_ids) %]
+  [% can_contribute_as_another_user = permissions.contribute_as_another_user %]
+  [% can_contribute_as_anonymous_user = permissions.contribute_as_anonymous_user %]
+  [% can_contribute_as_body = c.user.from_body AND permissions.contribute_as_body %]
 
   [% IF can_contribute_as_another_user OR can_contribute_as_body OR can_contribute_as_anonymous_user %]
     <label for="form_as">[% loc('Provide update as') %]</label>
-- 
cgit v1.2.3


From ecc5a7b9ca20418f1bdb45cdc3ce5b41a11f3593 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 15 Apr 2020 19:12:31 +0100
Subject: Add assigned_(users|categories)_only functionality

Users with assigned_categories_only will only see staff features on a
report page in their assigned categories.

Users will only see staff features on a report page in a category with
assigned_users_only if it is in their assigned categories.
---
 CHANGELOG.md                                       |   1 +
 .../img/pro-user-guide/edit-category-page.png      | Bin 65237 -> 42128 bytes
 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm |   2 +-
 perllib/FixMyStreet/App/Controller/Admin/Users.pm  |   5 ++
 perllib/FixMyStreet/App/Controller/Report.pm       |  18 +++++++
 t/app/controller/admin/bodies.t                    |  10 ++++
 t/app/controller/admin/users.t                     |  10 +++-
 t/app/controller/report_inspect.t                  |  52 +++++++++++++++++++--
 templates/web/base/admin/bodies/contact-form.html  |   8 +++-
 templates/web/base/admin/users/form.html           |  15 ++++++
 templates/web/base/report/display_tools.html       |   2 +-
 templates/web/base/report/update/form_update.html  |   4 +-
 12 files changed, 118 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 docs/assets/img/pro-user-guide/edit-category-page.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c19e2ffa3..2b429624e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
         - Interface for disabling updates/reopening for certain categories. #2991 #2992
         - Include group in CSV export if enabled. #2994
         - In category admin, group already shown elsewhere.
+        - Add assigned_(users|categories)_only functionality.
     - Bugfixes:
         - Application user in Docker container can't install packages. #2914
         - Look at all categories when sending reports.
diff --git a/docs/assets/img/pro-user-guide/edit-category-page.png b/docs/assets/img/pro-user-guide/edit-category-page.png
old mode 100644
new mode 100755
index 8b029faa0..db84bbb70
Binary files a/docs/assets/img/pro-user-guide/edit-category-page.png and b/docs/assets/img/pro-user-guide/edit-category-page.png differ
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
index bfa74ad4e..07d058872 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
@@ -267,7 +267,7 @@ sub update_contact : Private {
     $contact->send_method( $c->get_param('send_method') );
 
     # Set flags in extra to the appropriate values
-    foreach (qw(photo_required open311_protect updates_disallowed reopening_disallowed)) {
+    foreach (qw(photo_required open311_protect updates_disallowed reopening_disallowed assigned_users_only)) {
         if ( $c->get_param($_) ) {
             $contact->set_extra_metadata( $_ => 1 );
         } else {
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Users.pm b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
index 046e19126..f4b9bd7dc 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Users.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
@@ -373,6 +373,11 @@ sub edit : Chained('user') : PathPart('') : Args(0) {
             my @live_contact_ids = map { $_->id } @live_contacts;
             my @new_contact_ids = grep { $c->get_param("contacts[$_]") } @live_contact_ids;
             $user->set_extra_metadata('categories', \@new_contact_ids);
+            if ($c->get_param('assigned_categories_only')) {
+                $user->set_extra_metadata(assigned_categories_only => 1);
+            } else {
+                $user->unset_extra_metadata('assigned_categories_only');
+            }
         } else {
             $user->unset_extra_metadata('categories');
         }
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 82e8b107f..3052b1015 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -87,6 +87,24 @@ sub display :PathPart('') :Chained('id') :Args(0) {
 
     my $permissions = $c->stash->{permissions} ||= $c->forward('fetch_permissions');
 
+    my $staff_user = $c->user_exists && ($c->user->is_superuser || $c->user->belongs_to_body($c->stash->{problem}->bodies_str));
+
+    if ($staff_user) {
+        # Check assigned categories feature
+        my $okay = 1;
+        my $contact = $c->stash->{problem}->contact;
+        if ($contact && ($c->user->get_extra_metadata('assigned_categories_only') || $contact->get_extra_metadata('assigned_users_only'))) {
+            my $user_cats = $c->user->get_extra_metadata('categories') || [];
+            $okay = any { $contact->id eq $_ } @$user_cats;
+        }
+        if ($okay) {
+            $c->stash->{relevant_staff_user} = 1;
+        } else {
+            # Remove all staff permissions
+            $permissions = $c->stash->{permissions} = {};
+        }
+    }
+
     if (grep { $permissions->{$_} } qw/report_inspect report_edit_category report_edit_priority report_mark_private triage/) {
         $c->stash->{template} = 'report/inspect.html';
         $c->forward('inspect');
diff --git a/t/app/controller/admin/bodies.t b/t/app/controller/admin/bodies.t
index d3e4074f9..883386380 100644
--- a/t/app/controller/admin/bodies.t
+++ b/t/app/controller/admin/bodies.t
@@ -261,6 +261,16 @@ subtest 'open311 protection editing' => sub {
     is $contact->get_extra_metadata('open311_protect'), 1, 'Open311 protect flag set';
 };
 
+subtest 'test assigned_users_only setting' => sub {
+    $mech->get_ok('/admin/body/' . $body->id . '/test%20category');
+    $mech->submit_form_ok( { with_fields => {
+        assigned_users_only => 1,
+    } } );
+    $mech->content_contains('Values updated');
+    my $contact = $body->contacts->find({ category => 'test category' });
+    is $contact->get_extra_metadata('assigned_users_only'), 1;
+};
+
 subtest 'updates disabling' => sub {
     $mech->get_ok('/admin/body/' . $body->id . '/test%20category');
     $mech->submit_form_ok( { with_fields => {
diff --git a/t/app/controller/admin/users.t b/t/app/controller/admin/users.t
index 4f0298103..bc8d28e2d 100644
--- a/t/app/controller/admin/users.t
+++ b/t/app/controller/admin/users.t
@@ -299,6 +299,7 @@ FixMyStreet::override_config {
                 flagged => undef,
                 is_superuser => undef,
                 area_ids => undef,
+                assigned_categories_only => undef,
                 %default_perms,
                 roles => $role->id,
             },
@@ -320,6 +321,7 @@ FixMyStreet::override_config {
                 flagged => undef,
                 is_superuser => undef,
                 area_ids => undef,
+                assigned_categories_only => undef,
                 %default_perms,
                 roles => $role->id,
             },
@@ -341,6 +343,7 @@ FixMyStreet::override_config {
                 flagged => undef,
                 is_superuser => undef,
                 area_ids => undef,
+                assigned_categories_only => undef,
                 %default_perms,
                 roles => $role->id,
             },
@@ -365,6 +368,7 @@ FixMyStreet::override_config {
                 flagged => undef,
                 is_superuser => undef,
                 area_ids => undef,
+                assigned_categories_only => undef,
                 %default_perms,
             },
             changes => {
@@ -385,6 +389,7 @@ FixMyStreet::override_config {
                 flagged => 'on',
                 is_superuser => undef,
                 area_ids => undef,
+                assigned_categories_only => undef,
                 %default_perms,
             },
             changes => {
@@ -394,7 +399,7 @@ FixMyStreet::override_config {
             log_entries => [qw/edit edit edit edit/],
         },
         {
-            desc => 'edit user add is_superuser',
+            desc => 'edit user add is_superuser and assigned_categories_only',
             fields => {
                 name => 'Changed User',
                 email => 'changed@example.com',
@@ -405,10 +410,12 @@ FixMyStreet::override_config {
                 flagged => undef,
                 is_superuser => undef,
                 area_ids => undef,
+                assigned_categories_only => undef,
                 %default_perms,
             },
             changes => {
                 is_superuser => 'on',
+                assigned_categories_only => 'on',
             },
             removed => [
                 keys %default_perms,
@@ -428,6 +435,7 @@ FixMyStreet::override_config {
                 flagged => undef,
                 is_superuser => 'on',
                 area_ids => undef,
+                assigned_categories_only => 'on',
             },
             changes => {
                 is_superuser => undef,
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index 8deb2667e..2852f8d18 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -822,7 +822,53 @@ FixMyStreet::override_config {
     };
 };
 
+FixMyStreet::override_config {
+    MAPIT_URL => 'http://mapit.uk/',
+    ALLOWED_COBRANDS => 'oxfordshire',
+}, sub {
+    subtest 'test relevant staff user display' => sub {
+        $user->user_body_permissions->create({ body => $oxon, permission_type => 'planned_reports' });
+        $user->user_body_permissions->create({ body => $oxon, permission_type => 'moderate' });
+        $mech->log_in_ok('body@example.com');
 
-END {
-    done_testing();
-}
+        # First, check user can see staff things on reports 2 and 3
+        $mech->get_ok("/report/$report2_id");
+        $mech->content_contains('<select class="form-control" name="state"  id="state">');
+        $mech->content_contains('<div class="inspect-section">');
+        $mech->get_ok("/report/$report3_id");
+        $mech->content_contains('<select class="form-control" name="state"  id="state">');
+        $mech->content_contains('<div class="inspect-section">');
+
+        # User's categories are ["Cows"], which is currently report 2
+        # So should be able to see staff things on 2, but no longer on 3
+        $user->set_extra_metadata(assigned_categories_only => 1);
+        $user->update;
+        $mech->get_ok("/report/$report2_id");
+        $mech->content_contains('<select class="form-control" name="state"  id="state">');
+        $mech->content_contains('<div class="inspect-section">');
+        $mech->get_ok("/report/$report3_id");
+        $mech->content_lacks('<select class="form-control" name="state"  id="state">');
+        $mech->content_lacks('<div class="inspect-section">');
+        $mech->content_lacks('Moderate this report');
+        $mech->content_lacks('shortlist');
+        $user->unset_extra_metadata('assigned_categories_only');
+        $user->update;
+
+        # Contact 2 is "Sheep", which is currently report 3
+        # So again, should be able to see staff things on 2, but no longer on 3
+        $contact2->set_extra_metadata(assigned_users_only => 1);
+        $contact2->update;
+        $mech->get_ok("/report/$report2_id");
+        $mech->content_contains('<select class="form-control" name="state"  id="state">');
+        $mech->content_contains('<div class="inspect-section">');
+        $mech->get_ok("/report/$report3_id");
+        $mech->content_lacks('<select class="form-control" name="state"  id="state">');
+        $mech->content_lacks('<div class="inspect-section">');
+        $mech->content_lacks('Moderate this report');
+        $mech->content_lacks('shortlist');
+        $contact2->unset_extra_metadata('assigned_users_only');
+        $contact2->update;
+    };
+};
+
+done_testing();
diff --git a/templates/web/base/admin/bodies/contact-form.html b/templates/web/base/admin/bodies/contact-form.html
index d989b62aa..85ed48fbf 100644
--- a/templates/web/base/admin/bodies/contact-form.html
+++ b/templates/web/base/admin/bodies/contact-form.html
@@ -81,6 +81,12 @@
       </p>
     [% END %]
 
+    <p class="form-check">
+        <input type="checkbox" name="assigned_users_only" value="1" id="assigned_users_only" [% ' checked' IF contact.extra.assigned_users_only %]>
+        <label for="assigned_users_only">[% loc('Frontend staff access only to users assigned to this category') %]</label>
+        <span class='form-hint'>[% loc('Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end.') %]</span>
+    </p>
+
   [% IF body.can_be_devolved %]
     <div class="admin-hint">
       <p>
@@ -125,7 +131,7 @@
     <h2>[% loc('Extra data:') %] </h2>
     <dl>
       [% FOR pair IN contact.get_extra_metadata %]
-        [% NEXT IF pair.key == 'group' %]
+        [% NEXT IF pair.key == 'group' OR pair.key == 'assigned_users_only' %]
         <dt>[% pair.key %]</dt> <dd>[% pair.value OR '<em>-</em>' %]</dd>
       [% END %]
     </dl>
diff --git a/templates/web/base/admin/users/form.html b/templates/web/base/admin/users/form.html
index 495da8648..efe885908 100644
--- a/templates/web/base/admin/users/form.html
+++ b/templates/web/base/admin/users/form.html
@@ -101,6 +101,21 @@
         [% END %]
 
 
+      [% IF user.from_body AND c.cobrand.moniker != 'zurich' %]
+        <li>
+          <div class="admin-hint">
+            <p>
+              [% loc("This means the user will only see front end staff features (such as the inspector form) in their assigned categories.") %]
+            </p>
+          </div>
+
+          <label>
+            [% loc('Assigned categories only') %]:
+            <input type="checkbox" id="assigned_categories_only" name="assigned_categories_only"[% user.extra.assigned_categories_only ? ' checked' : '' %]>
+          </label>
+        </li>
+      [% END %]
+
       [% IF c.cobrand.moniker != 'zurich' %]
         <li>
           <div class="admin-hint">
diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html
index a09abd73b..4c79e4b71 100644
--- a/templates/web/base/report/display_tools.html
+++ b/templates/web/base/report/display_tools.html
@@ -1,7 +1,7 @@
 <div class="shadow-wrap">
     <ul id="key-tools">
       [% IF c.user_exists OR NOT problem.non_public %]
-        [% IF c.user_exists AND c.cobrand.users_can_hide AND c.user.belongs_to_body( problem.bodies_str ) %]
+        [% IF c.cobrand.users_can_hide AND relevant_staff_user %]
         <li><form method="post" action="/report/[% problem.id %]/delete" id="remove-from-site-form">
             <input type="hidden" name="token" value="[% csrf_token %]">
             <button type="submit" id="key-tool-report-abuse" class="abuse" data-confirm="[% loc('Are you sure?') %]" name="remove_from_site">[% loc('Remove from site') %]</button>
diff --git a/templates/web/base/report/update/form_update.html b/templates/web/base/report/update/form_update.html
index ff4612840..089d63f55 100644
--- a/templates/web/base/report/update/form_update.html
+++ b/templates/web/base/report/update/form_update.html
@@ -29,7 +29,7 @@
 [% TRY %][% PROCESS 'report/update/before_update.html' %][% CATCH file %][% END %]
 
 <label for="form_update">[% loc( 'Update' ) %]</label>
-[% IF c.user AND (c.user.is_superuser OR c.user.belongs_to_body(problem.bodies_str)) %]
+[% IF relevant_staff_user %]
   [% INCLUDE 'admin/response_templates_select.html' for='form_update' %]
 [% END %]
 [% IF field_errors.update %]
@@ -37,7 +37,7 @@
 [% END %]
 <textarea rows="7" cols="30" name="update" class="form-control" id="form_update" required>[% update.text | html %]</textarea>
 
-[% IF c.user AND (c.user.is_superuser OR c.user.belongs_to_body(problem.bodies_str)) %]
+[% IF relevant_staff_user %]
     <label for="state">[% loc( 'State' ) %]</label>
     [% INCLUDE 'report/inspect/state_groups_select.html' %]
 [% ELSE %]
-- 
cgit v1.2.3


From d1622dc20c1623e3f7fb54d72d99370af796c197 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 17 Apr 2020 14:07:32 +0100
Subject: Extend assigned_*_only to report lists.

Shortlist buttons and extended print information
will not appear where not allowed.
---
 perllib/FixMyStreet/App/Controller/Around.pm    |  2 ++
 perllib/FixMyStreet/App/Controller/Dashboard.pm |  3 ++-
 perllib/FixMyStreet/App/Controller/Report.pm    | 13 +++++++++++++
 perllib/FixMyStreet/App/Controller/Reports.pm   | 12 ++++++++++--
 t/app/controller/around.t                       | 25 ++++++++++++++++++++++++-
 templates/web/base/report/_item.html            | 16 +++++++++++++---
 6 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index af50f1883..0e87d1e70 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -262,6 +262,8 @@ sub check_and_stash_category : Private {
     my %valid_categories = map { $_ => 1 } grep { $_ && $categories_mapped{$_} } @$categories;
     $c->stash->{filter_category} = \%valid_categories;
     $c->cobrand->call_hook('munge_around_filter_category_list');
+
+    $c->forward('/report/assigned_users_only', [ \@categories ]);
 }
 
 sub map_features : Private {
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index 833d6d6b2..52af45940 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -564,7 +564,8 @@ sub heatmap : Local : Args(0) {
     $c->stash->{children} = $children;
     $c->stash->{ward_hash} = { map { $_->{id} => 1 } @{$c->stash->{wards}} } if $c->stash->{wards};
 
-    $c->forward('/reports/setup_categories_and_map');
+    $c->forward('/reports/setup_categories');
+    $c->forward('/reports/setup_map');
 }
 
 sub heatmap_filters :Private {
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 3052b1015..8a6047194 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -724,6 +724,19 @@ sub stash_category_groups : Private {
     $c->stash->{category_groups}  = \@category_groups;
 }
 
+sub assigned_users_only : Private {
+    my ($self, $c, $categories) = @_;
+
+    # Assigned only category checking
+    if ($c->user_exists && $c->user->from_body) {
+        my @assigned_users_only = grep { $_->get_extra_metadata('assigned_users_only') } @$categories;
+        $c->stash->{assigned_users_only} = { map { $_->category => 1 } @assigned_users_only };
+        $c->stash->{assigned_categories_only} = $c->user->get_extra_metadata('assigned_categories_only');
+
+        $c->stash->{user_categories} = { map { $_ => 1 } @{$c->user->categories} };
+    }
+}
+
 __PACKAGE__->meta->make_immutable;
 
 1;
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index 53f27eb62..10902eab9 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -154,6 +154,8 @@ sub ward : Path : Args(2) {
     $c->forward('stash_report_sort', [ $c->cobrand->reports_ordering ]);
     $c->forward( 'load_and_group_problems' );
 
+    $c->forward('setup_categories');
+
     if ($c->get_param('ajax')) {
         my $ajax_template = $c->stash->{ajax_template} || 'reports/_problem-list.html';
         $c->detach('ajax', [ $ajax_template ]);
@@ -165,7 +167,7 @@ sub ward : Path : Args(2) {
 
     $c->stash->{stats} = $c->cobrand->get_report_stats();
 
-    $c->forward('setup_categories_and_map');
+    $c->forward('setup_map');
 
     # List of wards
     if ( !$c->stash->{wards} && $c->stash->{body}->id && $c->stash->{body}->body_areas->first ) {
@@ -181,7 +183,7 @@ sub ward : Path : Args(2) {
     }
 }
 
-sub setup_categories_and_map :Private {
+sub setup_categories :Private {
     my ($self, $c) = @_;
 
     my @categories = $c->stash->{body}->contacts->not_deleted->search( undef, {
@@ -191,9 +193,15 @@ sub setup_categories_and_map :Private {
 
     $c->cobrand->call_hook('munge_reports_category_list', \@categories);
 
+    $c->forward('/report/assigned_users_only', [ \@categories ]);
+
     $c->stash->{filter_categories} = \@categories;
     $c->stash->{filter_category} = { map { $_ => 1 } $c->get_param_list('filter_category', 1) };
     $c->forward('/report/stash_category_groups', [ \@categories ]) if $c->cobrand->enable_category_groups;
+}
+
+sub setup_map :Private {
+    my ($self, $c) = @_;
 
     my $pins = $c->stash->{pins} || [];
 
diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index 186b833fd..6e49c6f29 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -150,7 +150,7 @@ subtest 'check missing body message not shown when it does not need to be' => su
 };
 
 for my $permission ( qw/ report_inspect report_mark_private/ ) {
-    subtest 'check non public reports are displayed on around page with $permission permission' => sub {
+    subtest "check non public reports are displayed on around page with $permission permission" => sub {
         my $body = FixMyStreet::DB->resultset('Body')->find( $body_edin_id );
         my $body2 = FixMyStreet::DB->resultset('Body')->find( $body_west_id );
         my $user = $mech->log_in_ok( 'test@example.com' );
@@ -218,6 +218,29 @@ for my $permission ( qw/ report_inspect report_mark_private/ ) {
     };
 }
 
+subtest 'check assigned-only list items do not display shortlist buttons' => sub {
+    my $body = FixMyStreet::DB->resultset('Body')->find( $body_edin_id );
+    my $contact = $mech->create_contact_ok( category => 'Horses', body_id => $body->id, email => "horses\@example.org" );
+    $edinburgh_problems[4]->update({ category => 'Horses' });
+
+    my $user = $mech->log_in_ok( 'test@example.com' );
+    $user->set_extra_metadata(assigned_categories_only => 1);
+    $user->user_body_permissions->delete();
+    $user->set_extra_metadata(categories => [ $contact->id ]);
+    $user->update({ from_body => $body });
+    $user->user_body_permissions->find_or_create({ body => $body, permission_type => 'planned_reports' });
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => 'fixmystreet',
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $mech->get_ok('/around?pc=EH1+1BB');
+    };
+    $mech->content_contains('shortlist-add-' . $edinburgh_problems[4]->id);
+    $mech->content_lacks('shortlist-add-' . $edinburgh_problems[3]->id);
+    $mech->content_lacks('shortlist-add-' . $edinburgh_problems[1]->id);
+};
+
 my $body = $mech->create_body_ok(2237, "Oxfordshire");
 
 subtest 'check category, status and extra filtering works on /around' => sub {
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index 4d74b3be9..baba04d3e 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -2,7 +2,17 @@
 [% PROCESS 'admin/report_blocks.html' ~%]
 [% END ~%]
 
-[% IF c.user.has_permission_to('planned_reports', problem.bodies_str_ids) OR c.user.is_planned_report(problem) ~%]
+[%
+
+SET relevant_staff = 1;
+SET is_user_category = user_categories.${problem.category};
+IF (assigned_users_only.${problem.category} OR assigned_categories_only) AND NOT is_user_category;
+    SET relevant_staff = 0;
+END;
+
+~%]
+
+[% IF relevant_staff AND (c.user.has_permission_to('planned_reports', problem.bodies_str_ids) OR c.user.is_planned_report(problem)) ~%]
     [% item_extra_class = "item-list__item--indented" ~%]
     [% item_action = BLOCK ~%]
       <input type="submit" value="1"
@@ -49,12 +59,12 @@
       [% END %]
   [% END ~%]
 
-    [% IF c.user.has_permission_to('report_inspect', problem.bodies_str_ids) %]
+    [% IF relevant_staff AND c.user.has_permission_to('report_inspect', problem.bodies_str_ids) %]
         <div class="item-list__description">[% problem.detail | html %]</div>
     [% END %]
         <small>[% PROCESS 'report/_item_small.html' %]</small>
 
-    [% IF c.user.has_permission_to('report_inspect', problem.bodies_str_ids) %]
+    [% IF relevant_staff AND c.user.has_permission_to('report_inspect', problem.bodies_str_ids) %]
         <div class="item-list__item__metadata">
             <div>
                 <h4>[% loc('Report ID:') %]</h4>
-- 
cgit v1.2.3


From 37306b9f6f4cb9b58c5e4a7bdc12e90dff879481 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 24 Apr 2020 17:35:50 +0100
Subject: Disable rename on unprotected Open311 categories.

If you rename an Open311 category when it is not protected, it will only
get reinstated/deleted by the Open311 populate script shortly after, and
can cause issues due to the problem category renaming that occurs.
---
 CHANGELOG.md                                        |  1 +
 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm  | 10 +++++++---
 perllib/FixMyStreet/DB/Result/Contact.pm            | 21 +++++++++++++++++++++
 t/app/controller/admin/bodies.t                     |  2 ++
 .../web/base/admin/bodies/_category_field.html      |  5 ++++-
 templates/web/base/admin/bodies/contact-form.html   |  3 ++-
 web/cobrands/fixmystreet/staff.js                   | 15 +++++++++++++++
 7 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61a56ebdd..21b82a8d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
         - Allow a template to be an initial update on reports. #2973
         - Interface for disabling updates/reopening for certain categories. #2991 #2992
         - Include group in CSV export if enabled. #2994
+        - Disable category rename on Open311 categories when unprotected. #2957
     - Bugfixes:
         - Application user in Docker container can't install packages. #2914
         - Look at all categories when sending reports.
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
index bfa74ad4e..3b99d7e0f 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
@@ -241,10 +241,14 @@ sub update_contact : Private {
     if ($current_contact && $contact->id && $contact->id != $current_contact->id) {
         $errors{category} = _('You cannot rename a category to an existing category');
     } elsif ($current_contact && !$contact->id) {
-        # Changed name
         $contact = $current_contact;
-        $c->model('DB::Problem')->to_body($c->stash->{body_id})->search({ category => $current_category })->update({ category => $category });
-        $contact->category($category);
+        # Set the flag here so we can run the editable test on it
+        $contact->set_extra_metadata(open311_protect => $c->get_param('open311_protect'));
+        if (!$contact->category_uneditable) {
+            # Changed name
+            $c->model('DB::Problem')->to_body($c->stash->{body_id})->search({ category => $current_category })->update({ category => $category });
+            $contact->category($category);
+        }
     }
 
     my $email = $c->get_param('email');
diff --git a/perllib/FixMyStreet/DB/Result/Contact.pm b/perllib/FixMyStreet/DB/Result/Contact.pm
index affc6d480..2941683d1 100644
--- a/perllib/FixMyStreet/DB/Result/Contact.pm
+++ b/perllib/FixMyStreet/DB/Result/Contact.pm
@@ -175,4 +175,25 @@ sub disable_form_field {
     return $field;
 }
 
+sub sent_by_open311 {
+    my $self = shift;
+    my $body = $self->body;
+    return 1 if
+        (!$body->can_be_devolved && $body->send_method eq 'Open311')
+        || ($body->can_be_devolved && $body->send_method eq 'Open311' && !$self->send_method)
+        || ($body->can_be_devolved && $self->send_method eq 'Open311');
+    return 0;
+}
+
+# We do not want to allow editing of a category's name
+# if it's Open311, unless it's marked as protected
+sub category_uneditable {
+    my $self = shift;
+    return 1 if
+        $self->in_storage
+        && !$self->get_extra_metadata('open311_protect')
+        && $self->sent_by_open311;
+    return 0;
+}
+
 1;
diff --git a/t/app/controller/admin/bodies.t b/t/app/controller/admin/bodies.t
index d3e4074f9..74084afbf 100644
--- a/t/app/controller/admin/bodies.t
+++ b/t/app/controller/admin/bodies.t
@@ -210,6 +210,7 @@ subtest 'check open311 configuring' => sub {
 
 subtest 'check open311 devolved editing' => sub {
     $mech->get_ok('/admin/body/' . $body->id . '/test%20category');
+    $mech->content_contains("name=\"category\"\n    size=\"30\" value=\"test category\"\n    readonly>", 'Cannot edit Open311 category name');
     $mech->submit_form_ok( { with_fields => {
         send_method => 'Email',
         email => 'testing@example.org',
@@ -217,6 +218,7 @@ subtest 'check open311 devolved editing' => sub {
     } } );
     $mech->content_contains('Values updated');
     $mech->get_ok('/admin/body/' . $body->id . '/test%20category');
+    $mech->content_contains("name=\"category\"\n    size=\"30\" value=\"test category\"\n    required>", 'Can edit as now devolved');
     $mech->submit_form_ok( { with_fields => {
         send_method => '',
         email => 'open311-code',
diff --git a/templates/web/base/admin/bodies/_category_field.html b/templates/web/base/admin/bodies/_category_field.html
index 8c5a1c352..c45cc5524 100644
--- a/templates/web/base/admin/bodies/_category_field.html
+++ b/templates/web/base/admin/bodies/_category_field.html
@@ -9,7 +9,10 @@
 </div>
 
 <p>
-  <strong>[% loc('Category') %] </strong><input type="text" class="form-control" name="category" size="30" value="[% contact.category | html %]" required>
+  <label for="category">[% loc('Category') %]</label>
+  <input type="text" class="form-control" id="category" name="category"
+    size="30" value="[% contact.category %]"
+    [% contact.category_uneditable ? 'readonly' : 'required' %]>
 </p>
 
 [% IF contact.in_storage %]
diff --git a/templates/web/base/admin/bodies/contact-form.html b/templates/web/base/admin/bodies/contact-form.html
index 0224946cf..77c85bfbf 100644
--- a/templates/web/base/admin/bodies/contact-form.html
+++ b/templates/web/base/admin/bodies/contact-form.html
@@ -74,7 +74,8 @@
         <span class='form-hint'>[% loc('Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update.') %]</span>
     </p>
 
-    [% IF body.send_method == 'Open311' %]
+    [% IF contact.sent_by_open311 %]
+
       <p class="form-check">
           <input type="checkbox" name="open311_protect" value="1" id="open311_protect"[% ' checked' IF contact.get_extra_metadata('open311_protect') %]>
           <label for="open311_protect">[% loc("Protect this category's name and group(s) from Open311 changes") %]</label>
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index a504f641e..89d7cab39 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -335,6 +335,21 @@ fixmystreet.staff_set_up = {
     });
   },
 
+  open311_category_edit: function() {
+    var protect_input = document.getElementById('open311_protect');
+    if (!protect_input) {
+        return;
+    }
+    protect_input.addEventListener('change', function() {
+        var cat = document.getElementById('category');
+        cat.readOnly = !this.checked;
+        cat.required = this.checked;
+        if (!this.checked) {
+            cat.value = cat.getAttribute('value');
+        }
+    });
+  },
+
   shortlist_listener: function() {
     $('#fms_shortlist_all').on('click', function() {
       var features = [];
-- 
cgit v1.2.3


From 538a26498c3516b5bc24636414911b955333f934 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Wed, 6 May 2020 17:14:10 +0100
Subject: display user detail for contributed_by in report_edit

Include name, email and body rather than just user id.
---
 CHANGELOG.md                                        |  2 ++
 perllib/FixMyStreet/App/Controller/Admin/Reports.pm | 20 ++++++++++++++++++++
 t/app/controller/admin/report_edit.t                | 17 +++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e55461ce..4b53ca270 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 * Unreleased
     - Bugfixes:
         - Fix issue with dashboard report CSV export. #3026
+    - Admin improvements:
+        - Display user name/email for contributed as reports. #2990
 
 * v3.0.1 (6th May 2020)
     - New features:
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
index 88c4380fc..4866a657e 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
@@ -234,6 +234,26 @@ sub edit : Path('/admin/report_edit') : Args(1) {
             push @fields, { name => 'Duplicates', val => join( ',', @{ $problem->get_extra_metadata('duplicates') } ) };
             delete $extra->{duplicates};
         }
+
+        if ( $extra->{contributed_by} ) {
+            my $u = $c->cobrand->users->find({id => $extra->{contributed_by}});
+            if ( $u ) {
+                my $uri = $c->uri_for_action('admin/users/index', { search => $u->email } );
+                push @fields, {
+                    name => _('Created By'),
+                    val => FixMyStreet::Template::SafeString->new( "<a href=\"$uri\">@{[$u->name]} (@{[$u->email]})</a>" )
+                };
+                if ( $u->from_body ) {
+                    push @fields, { name => _('Created Body'), val => $u->from_body->name };
+                } elsif ( $u->is_superuser ) {
+                    push @fields, { name => _('Created Body'), val => _('Superuser') };
+                }
+            } else {
+                push @fields, { name => 'contributed_by', val => $extra->{contributed_by} };
+            }
+            delete $extra->{contributed_by};
+        }
+
         for my $key ( keys %$extra ) {
             push @fields, { name => $key, val => $extra->{$key} };
         }
diff --git a/t/app/controller/admin/report_edit.t b/t/app/controller/admin/report_edit.t
index 438bcc241..01f091412 100644
--- a/t/app/controller/admin/report_edit.t
+++ b/t/app/controller/admin/report_edit.t
@@ -9,6 +9,7 @@ my $user2 = $mech->create_user_ok('test2@example.com', name => 'Test User 2');
 my $superuser = $mech->create_user_ok('superuser@example.com', name => 'Super User', is_superuser => 1);
 
 my $oxfordshire = $mech->create_body_ok(2237, 'Oxfordshire County Council');
+my $user3 = $mech->create_user_ok('body_user@example.com', name => 'Body User', from_body => $oxfordshire);
 my $oxfordshirecontact = $mech->create_contact_ok( body_id => $oxfordshire->id, category => 'Potholes', email => 'potholes@example.com' );
 $mech->create_contact_ok( body_id => $oxfordshire->id, category => 'Traffic lights', email => 'lights@example.com' );
 
@@ -707,4 +708,20 @@ subtest "Test display of fields extra data" => sub {
     $mech->content_contains('Report URL (report_url)</strong>: http://example.com');
 };
 
+subtest "Test display of contributed_as data" => sub {
+    $report->update( { extra => undef } );
+    $mech->get_ok("/admin/report_edit/$report_id");
+    $mech->content_contains('Extra data: No');
+
+    $report->set_extra_metadata( contributed_as => 'another_user' );
+    $report->set_extra_metadata( contributed_by => $user3->id );
+    $report->update;
+
+    $report->discard_changes;
+
+    $mech->get_ok("/admin/report_edit/$report_id");
+    $mech->content_like(qr!Created By</strong>: <a[^>]*>Body User \(@{[ $user3->email ]}!);
+    $mech->content_contains('Created Body</strong>: Oxfordshire County Council');
+};
+
 done_testing();
-- 
cgit v1.2.3


From ab4666c2a5b62f62784a6bbd47f6a4885b161d50 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 11 May 2020 20:23:28 +0100
Subject: Add contact handling to export-import-data script

For https://github.com/mysociety/fixmystreet-commercial/issues/1856
---
 bin/export-import-data | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/bin/export-import-data b/bin/export-import-data
index b73b4097e..5d7a0eaa7 100755
--- a/bin/export-import-data
+++ b/bin/export-import-data
@@ -20,6 +20,7 @@ my ($opt, $usage) = describe_options(
     [ 'name=s', "Name of body" ],
     [ 'import=s', "File to import" ],
     [ 'commit', "Actually commit changes to the database" ],
+    [ 'categories=s', "pipe-separated list of categories to export contacts for and filter templates by" ],
     [ 'help', "print usage message and exit", { shortcircuit => 1 } ],
 );
 print($usage->text), exit if $opt->help;
@@ -28,6 +29,7 @@ die "Please specify a file to import\n" if $opt->import && (! -e $opt->import ||
 
 my $J = JSON::MaybeXS->new(utf8 => 1, pretty => 1, canonical => 1);
 my $body = FixMyStreet::DB->resultset("Body")->find({ name => $opt->name }) or die "Cannot find body " . $opt->name . "\n";
+my @categories = split(/\|/, ($opt->{categories} || ''));
 
 if ($opt->import) {
     import($opt->import);
@@ -38,7 +40,31 @@ if ($opt->import) {
 sub export {
     my %out;
 
-    for ($body->response_templates->all) {
+    if (@categories) {
+        my @contacts = $body->contacts->search({
+            category => { -in => \@categories },
+        })->all;
+        die "Categories mismatch" unless scalar @categories == scalar @contacts;
+        for (@contacts) {
+            push @{$out{contacts}}, {
+                category => $_->category,
+                email => $_->email,
+                state => $_->state,
+                non_public => $_->non_public ? JSON->true : JSON->false,
+                extra => $_->extra,
+            };
+        }
+    }
+
+    my $templates = $body->response_templates;
+    if (@categories) {
+        $templates = $templates->search({
+            'contact.category' => { -in => \@categories }
+        }, {
+            join => { 'contact_response_templates' => 'contact' }
+        });
+    }
+    for ($templates->all) {
         push @{$out{templates}}, {
             title => $_->title,
             text => $_->text,
@@ -81,6 +107,25 @@ sub import {
     my $db = FixMyStreet::DB->schema->storage;
     $db->txn_begin;
 
+    foreach (@{$out->{contacts}}) {
+        my $existing = $body->contacts->search({ category => $_->{category} })->single;
+        if ($existing) {
+            warn "Category $_->{category} already exists, skipping";
+            next;
+        }
+        my $contact = $body->contacts->new({
+            note => "Imported from $file",
+            editor => 'export-import-data',
+            whenedited => \'current_timestamp',
+            category => $_->{category},
+            email => $_->{email},
+            state => $_->{state},
+            non_public => $_->{non_public},
+            extra => $_->{extra},
+        });
+        $contact->insert;
+    }
+
     foreach (@{$out->{templates}}) {
         my $existing = $body->response_templates->search({ title => $_->{title} })->single;
         if ($existing) {
-- 
cgit v1.2.3


From 29fa3d4becbcd881a1b28649cfad930babd35046 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 31 Mar 2020 16:37:12 +0100
Subject: [UK] Factor all labelled select code together.

---
 web/cobrands/bexley/assets.js          | 25 +++--------------------
 web/cobrands/buckinghamshire/assets.js | 32 +++++++++---------------------
 web/cobrands/cheshireeast/assets.js    | 26 ++++--------------------
 web/cobrands/fixmystreet/assets.js     | 31 +++++++++++++++++++++++++++++
 web/cobrands/hounslow/assets.js        | 32 ++++++++++--------------------
 web/cobrands/isleofwight/assets.js     | 36 ++--------------------------------
 6 files changed, 59 insertions(+), 123 deletions(-)

diff --git a/web/cobrands/bexley/assets.js b/web/cobrands/bexley/assets.js
index 541d47ea4..caf0e296d 100644
--- a/web/cobrands/bexley/assets.js
+++ b/web/cobrands/bexley/assets.js
@@ -21,18 +21,9 @@ var defaults = {
     strategy_class: OpenLayers.Strategy.FixMyStreet
 };
 
-var streetlight_select = $.extend({
-    label: "${Unit_No}",
-    labelOutlineColor: "white",
-    labelOutlineWidth: 3,
-    labelYOffset: 65,
-    fontSize: '15px',
-    fontWeight: 'bold'
-}, fixmystreet.assets.style_default_select.defaultStyle);
-
 var streetlight_stylemap = new OpenLayers.StyleMap({
   'default': fixmystreet.assets.style_default,
-  'select': new OpenLayers.Style(streetlight_select)
+  'select': fixmystreet.assets.construct_named_select_style("${Unit_No}")
 });
 
 var labeled_defaults = $.extend(true, {}, defaults, {
@@ -45,18 +36,8 @@ var labeled_defaults = $.extend(true, {}, defaults, {
         UnitID: 'Unit_ID'
     },
     actions: {
-        asset_found: function(asset) {
-          var id = asset.attributes[this.fixmystreet.feature_code] || '';
-          if (id !== '') {
-              var asset_name = this.fixmystreet.asset_item;
-              $('.category_meta_message').html('You have selected ' + asset_name + ' <b>' + id + '</b>');
-          } else {
-              $('.category_meta_message').html(this.fixmystreet.asset_item_message);
-          }
-        },
-        asset_not_found: function() {
-           $('.category_meta_message').html(this.fixmystreet.asset_item_message);
-        }
+        asset_found: fixmystreet.assets.named_select_action_found,
+        asset_not_found: fixmystreet.assets.named_select_action_not_found
     }
 });
 
diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js
index e11bf1a28..1030d11db 100644
--- a/web/cobrands/buckinghamshire/assets.js
+++ b/web/cobrands/buckinghamshire/assets.js
@@ -40,18 +40,9 @@ fixmystreet.assets.add(defaults, {
     asset_item: 'grit bin'
 });
 
-var streetlight_select = $.extend({
-    label: "${feature_id}",
-    labelOutlineColor: "white",
-    labelOutlineWidth: 3,
-    labelYOffset: 65,
-    fontSize: '15px',
-    fontWeight: 'bold'
-}, fixmystreet.assets.style_default_select.defaultStyle);
-
 var streetlight_stylemap = new OpenLayers.StyleMap({
   'default': fixmystreet.assets.style_default,
-  'select': new OpenLayers.Style(streetlight_select)
+  'select': fixmystreet.assets.construct_named_select_style("${feature_id}")
 });
 
 var streetlight_code_to_type = {
@@ -68,21 +59,16 @@ var streetlight_code_to_type = {
 
 var labeled_defaults = $.extend(true, {}, defaults, {
     select_action: true,
+    feature_code: 'feature_id',
     stylemap: streetlight_stylemap,
+    asset_item_message: 'You can pick a <b class="asset-spot">ITEM</b> from the map &raquo;',
+    construct_asset_name: function(id) {
+        var code = id.replace(/[0-9]/g, '');
+        return {id: id, name: streetlight_code_to_type[code]};
+    },
     actions: {
-        asset_found: function(asset) {
-          var id = asset.attributes.feature_id || '';
-          if (id !== '') {
-              var code = id.replace(/[0-9]/g, '');
-              var asset_name = streetlight_code_to_type[code] || this.fixmystreet.asset_item;
-              $('.category_meta_message').html('You have selected ' + asset_name + ' <b>' + id + '</b>');
-          } else {
-              $('.category_meta_message').html('You can pick a <b class="asset-spot">' + this.fixmystreet.asset_item + '</b> from the map &raquo;');
-          }
-        },
-        asset_not_found: function() {
-           $('.category_meta_message').html('You can pick a <b class="asset-spot">' + this.fixmystreet.asset_item + '</b> from the map &raquo;');
-        }
+        asset_found: fixmystreet.assets.named_select_action_found,
+        asset_not_found: fixmystreet.assets.named_select_action_not_found
     }
 });
 
diff --git a/web/cobrands/cheshireeast/assets.js b/web/cobrands/cheshireeast/assets.js
index bca654af7..d9eb25821 100644
--- a/web/cobrands/cheshireeast/assets.js
+++ b/web/cobrands/cheshireeast/assets.js
@@ -20,18 +20,9 @@ var defaults = {
     strategy_class: OpenLayers.Strategy.FixMyStreet
 };
 
-var streetlight_select = $.extend({
-    label: "${feature_id}",
-    labelOutlineColor: "white",
-    labelOutlineWidth: 3,
-    labelYOffset: 65,
-    fontSize: '15px',
-    fontWeight: 'bold'
-}, fixmystreet.assets.style_default_select.defaultStyle);
-
 var streetlight_stylemap = new OpenLayers.StyleMap({
   'default': fixmystreet.assets.style_default,
-  'select': new OpenLayers.Style(streetlight_select)
+  'select': fixmystreet.assets.construct_named_select_style("${feature_id}")
 });
 
 var labeled_defaults = $.extend(true, {}, defaults, {
@@ -39,19 +30,10 @@ var labeled_defaults = $.extend(true, {}, defaults, {
     stylemap: streetlight_stylemap,
     asset_type: 'spot',
     asset_id_field: 'central_as',
+    feature_code: 'feature_id',
     actions: {
-        asset_found: function(asset) {
-          var id = asset.attributes.feature_id || '';
-          if (id !== '') {
-              var asset_name = this.fixmystreet.asset_item;
-              $('.category_meta_message').html('You have selected ' + asset_name + ' <b>' + id + '</b>');
-          } else {
-              $('.category_meta_message').html(this.fixmystreet.asset_item_message);
-          }
-        },
-        asset_not_found: function() {
-           $('.category_meta_message').html(this.fixmystreet.asset_item_message);
-        }
+        asset_found: fixmystreet.assets.named_select_action_found,
+        asset_not_found: fixmystreet.assets.named_select_action_not_found
     }
 });
 
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index 204ceb85d..88a098398 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -805,6 +805,37 @@ fixmystreet.assets = {
         graphicOpacity: 1.0
     }),
 
+    construct_named_select_style: function(label) {
+        var f = $.extend({
+            label: label,
+            labelOutlineColor: "white",
+            labelOutlineWidth: 3,
+            labelYOffset: 65,
+            fontSize: '15px',
+            fontWeight: 'bold'
+        }, fixmystreet.assets.style_default_select.defaultStyle);
+        return new OpenLayers.Style(f);
+    },
+    named_select_action_found: function(asset) {
+        var id = asset.attributes[this.fixmystreet.feature_code] || '';
+        if (id !== '') {
+            var data = { id: id, name: this.fixmystreet.asset_item };
+            if (this.fixmystreet.construct_asset_name) {
+                data = this.fixmystreet.construct_asset_name(id) || data;
+            }
+            $('.category_meta_message').html('You have selected ' + data.name + ' <b>' + data.id + '</b>');
+        } else {
+            var message = this.fixmystreet.asset_item_message;
+            message = message.replace('ITEM', this.fixmystreet.asset_item);
+            $('.category_meta_message').html(message);
+        }
+    },
+    named_select_action_not_found: function() {
+        var message = this.fixmystreet.asset_item_message;
+        message = message.replace('ITEM', this.fixmystreet.asset_item);
+        $('.category_meta_message').html(message);
+    },
+
     selectedFeature: function() {
         return selected_feature;
     },
diff --git a/web/cobrands/hounslow/assets.js b/web/cobrands/hounslow/assets.js
index 603a56e85..375a74e3f 100644
--- a/web/cobrands/hounslow/assets.js
+++ b/web/cobrands/hounslow/assets.js
@@ -114,20 +114,11 @@ fixmystreet.assets.add($.extend(true, {}, defaults, {
 //     asset_item: 'gulley'
 // }));
 
-var streetlight_select = $.extend({
-    label: "${FeatureId}",
-    labelOutlineColor: "white",
-    labelOutlineWidth: 3,
-    labelYOffset: 65,
-    fontSize: '15px',
-    fontWeight: 'bold'
-}, fixmystreet.assets.style_default_select.defaultStyle);
-
 // The label for street light markers should be everything after the final
 // '/' in the feature's FeatureId attribute.
 // This seems to be the easiest way to perform custom processing
 // on style attributes in OpenLayers...
-var select_style = new OpenLayers.Style(streetlight_select);
+var select_style = fixmystreet.assets.construct_named_select_style("${FeatureId}");
 select_style.createLiterals = function() {
     var literals = Object.getPrototypeOf(this).createLiterals.apply(this, arguments);
     if (literals.label && literals.label.split) {
@@ -145,19 +136,16 @@ var labeled_defaults = $.extend(true, {}, defaults, {
     select_action: true,
     stylemap: streetlight_stylemap,
     feature_code: 'FeatureId',
-    actions: {
-        asset_found: function(asset) {
-          var id = asset.attributes[this.fixmystreet.feature_code] || '';
-          if (id !== '' && id.split) {
-              var code = id.split("/").slice(-1)[0];
-              $('.category_meta_message').html('You have selected column <b>' + code + '</b>');
-          } else {
-              $('.category_meta_message').html('You can pick a <b class="asset-spot">' + this.fixmystreet.asset_item + '</b> from the map &raquo;');
-          }
-        },
-        asset_not_found: function() {
-           $('.category_meta_message').html('You can pick a <b class="asset-spot">' + this.fixmystreet.asset_item + '</b> from the map &raquo;');
+    asset_item_message: 'You can pick a <b class="asset-spot">ITEM</b> from the map &raquo;',
+    construct_asset_name: function(id) {
+        if (id.split) {
+            var code = id.split("/").slice(-1)[0];
+            return {id: code, name: 'column'};
         }
+    },
+    actions: {
+        asset_found: fixmystreet.assets.named_select_action_found,
+        asset_not_found: fixmystreet.assets.named_select_action_not_found
     }
 });
 
diff --git a/web/cobrands/isleofwight/assets.js b/web/cobrands/isleofwight/assets.js
index 2710a9de7..7b7fb7f00 100644
--- a/web/cobrands/isleofwight/assets.js
+++ b/web/cobrands/isleofwight/assets.js
@@ -31,41 +31,9 @@ var defaults = {
 
 var pin_prefix = fixmystreet.pin_prefix || document.getElementById('js-map-data').getAttribute('data-pin_prefix');
 
-var labeled_default = {
-    fillColor: "#FFFF00",
-    fillOpacity: 0.6,
-    strokeColor: "#000000",
-    strokeOpacity: 0.8,
-    strokeWidth: 2,
-    pointRadius: 6
-};
-
-var labeled_select = {
-    externalGraphic: pin_prefix + "pin-spot.png",
-    fillColor: "#55BB00",
-    graphicWidth: 48,
-    graphicHeight: 64,
-    graphicXOffset: -24,
-    graphicYOffset: -56,
-    backgroundGraphic: pin_prefix + "pin-shadow.png",
-    backgroundWidth: 60,
-    backgroundHeight: 30,
-    backgroundXOffset: -7,
-    backgroundYOffset: -22,
-    popupYOffset: -40,
-    graphicOpacity: 1.0,
-
-    label: "${asset_id}",
-    labelOutlineColor: "white",
-    labelOutlineWidth: 3,
-    labelYOffset: 65,
-    fontSize: '15px',
-    fontWeight: 'bold'
-};
-
 var labeled_stylemap = new OpenLayers.StyleMap({
-  'default': new OpenLayers.Style(labeled_default),
-  'select': new OpenLayers.Style(labeled_select)
+  'default': fixmystreet.assets.style_default,
+  'select': fixmystreet.assets.construct_named_select_style("${asset_id}")
 });
 
 fixmystreet.assets.add($.extend(true, {}, defaults, {
-- 
cgit v1.2.3


From 08f4e0171579f77165ce074e88086d1caeb7a243 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 31 Mar 2020 17:19:48 +0100
Subject: [Peterborough] Add street lights asset layer.

Enforce asset selection, except for light-not-on-map category.
---
 web/cobrands/peterborough/assets.js | 54 +++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/web/cobrands/peterborough/assets.js b/web/cobrands/peterborough/assets.js
index b3cac5f6c..58ec4e5a1 100644
--- a/web/cobrands/peterborough/assets.js
+++ b/web/cobrands/peterborough/assets.js
@@ -51,6 +51,7 @@ OpenLayers.Layer.PeterboroughVectorAsset = OpenLayers.Class(OpenLayers.Layer.Vec
 });
 
 var NEW_TREE_CATEGORY_NAME = 'Request for tree to be planted';
+var UNKNOWN_LIGHT_CATEGORY_NAME = 'Problem with a light not shown on map';
 
 var trees_defaults = $.extend(true, {}, defaults, {
     class: OpenLayers.Layer.PeterboroughVectorAsset,
@@ -106,4 +107,57 @@ fixmystreet.assets.add(defaults, {
     asset_item_message: ''
 });
 
+var streetlight_stylemap = new OpenLayers.StyleMap({
+  'default': fixmystreet.assets.style_default,
+  'select': fixmystreet.assets.construct_named_select_style("${UNITNO}")
+});
+
+var light_defaults = $.extend(true, {}, defaults, {
+    http_options: {
+        params: {
+            TYPENAME: "StreetLights"
+        }
+    },
+    asset_id_field: 'UNITID',
+    asset_type: 'spot',
+    asset_item: 'light'
+});
+
+fixmystreet.assets.add(light_defaults, {
+    class: OpenLayers.Layer.PeterboroughVectorAsset,
+    stylemap: streetlight_stylemap,
+    feature_code: 'UNITNO',
+    attributes: {
+        asset_details: function() {
+            var a = this.attributes;
+            return "street: " + a.FULLSTREET + "\n" +
+                "locality: " + a.LOCALITY + "\n" +
+                "unitno: " + a.UNITNO + "\n" +
+                "unitid: " + a.UNITID;
+        }
+    },
+    asset_group: 'Street lighting',
+    relevant: function(options) {
+        return options.group === 'Street lighting' && options.category !== UNKNOWN_LIGHT_CATEGORY_NAME;
+    },
+    asset_item_message: 'You can pick a <b class="asset-spot">street light</b> from the map &raquo;',
+    select_action: true,
+    actions: {
+        asset_found: function(asset) {
+            fixmystreet.message_controller.asset_found.call(this, asset);
+            fixmystreet.assets.named_select_action_found.call(this, asset);
+        },
+        asset_not_found: function() {
+            fixmystreet.message_controller.asset_not_found.call(this);
+            fixmystreet.assets.named_select_action_not_found.call(this);
+        }
+    }
+});
+
+fixmystreet.assets.add(light_defaults, {
+    asset_category: UNKNOWN_LIGHT_CATEGORY_NAME,
+    disable_pin_snapping: true,
+    asset_item_message: ''
+});
+
 })();
-- 
cgit v1.2.3


From 92bc41ffea83a39ce582f7c445d03c092125dcf5 Mon Sep 17 00:00:00 2001
From: Chris Mytton <chrism@mysociety.org>
Date: Tue, 12 May 2020 14:19:15 +0100
Subject: Make year in map copyright notices dynamic

---
 web/js/map-fms.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/js/map-fms.js b/web/js/map-fms.js
index ac27cfbce..925fe1fa2 100644
--- a/web/js/map-fms.js
+++ b/web/js/map-fms.js
@@ -38,14 +38,15 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, {
         var logo = '';
         var c = this.map.getCenter();
         var in_uk = c ? this.in_uk(c) : true;
+        var year = (new Date()).getFullYear();
         if (z >= 16 && in_uk) {
-            copyrights = 'Contains Highways England and Ordnance Survey data &copy; Crown copyright and database right 2016';
+            copyrights = 'Contains Highways England and Ordnance Survey data &copy; Crown copyright and database right ' + year;
         } else {
             logo = '<a href="https://www.bing.com/maps/"><img border=0 src="//dev.virtualearth.net/Branding/logo_powered_by.png"></a>';
             if (in_uk) {
-                copyrights = '&copy; 2016 <a href="https://www.bing.com/maps/">Microsoft</a>. &copy; AND, Navteq, Highways England, Ordnance Survey';
+                copyrights = '&copy; ' + year + ' <a href="https://www.bing.com/maps/">Microsoft</a>. &copy; AND, Navteq, Highways England, Ordnance Survey';
             } else {
-                copyrights = '&copy; 2016 <a href="https://www.bing.com/maps/">Microsoft</a>. &copy; AND, Navteq, Ordnance Survey';
+                copyrights = '&copy; ' + year + ' <a href="https://www.bing.com/maps/">Microsoft</a>. &copy; AND, Navteq, Ordnance Survey';
             }
         }
         this._updateAttribution(copyrights, logo);
-- 
cgit v1.2.3


From c80f13eeac448e99873b690411d7f6e83b07dd06 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 7 May 2020 15:10:46 +0100
Subject: admin interface for per category anonymous reporting

Add an interface to enable a category to accept anonymous reports, plus
the code to handle permitting this.

It's only available on single body cobrand sites in the default
configuration.
---
 CHANGELOG.md                                       |  1 +
 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm |  2 +-
 perllib/FixMyStreet/Cobrand/Default.pm             | 17 ++++-
 t/app/controller/admin/bodies.t                    | 34 ++++++++++
 t/app/controller/report_new_anon.t                 | 75 ++++++++++++++++++++++
 templates/web/base/admin/bodies/contact-form.html  |  8 ++-
 6 files changed, 134 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b53ca270..c576808d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
         - Fix issue with dashboard report CSV export. #3026
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
+        - Interface for enabling anonymous reports for certain categories. #2989
 
 * v3.0.1 (6th May 2020)
     - New features:
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
index 7b060f2ca..52306af24 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
@@ -271,7 +271,7 @@ sub update_contact : Private {
     $contact->send_method( $c->get_param('send_method') );
 
     # Set flags in extra to the appropriate values
-    foreach (qw(photo_required open311_protect updates_disallowed reopening_disallowed assigned_users_only)) {
+    foreach (qw(photo_required open311_protect updates_disallowed reopening_disallowed assigned_users_only anonymous_allowed)) {
         if ( $c->get_param($_) ) {
             $contact->set_extra_metadata( $_ => 1 );
         } else {
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index df7e333fb..c8e11f93d 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -1123,7 +1123,22 @@ pressed in the front end, rather than whenever a username is not provided.
 
 =cut
 
-sub allow_anonymous_reports { 0; }
+sub allow_anonymous_reports {
+    my ($self, $category_name) = @_;
+
+    $category_name ||= $self->{c}->stash->{category};
+    if ( $category_name && $self->can('body') and $self->body ) {
+        my $category_rs = FixMyStreet::DB->resultset("Contact")->search({
+            body_id => $self->body->id,
+            category => $category_name
+        });
+        if ( my $category = $category_rs->first ) {
+            return 'button' if $category->get_extra_metadata('anonymous_allowed');
+        }
+    }
+
+    return 0;
+}
 
 =item anonymous_account
 
diff --git a/t/app/controller/admin/bodies.t b/t/app/controller/admin/bodies.t
index 9f7b18cde..80ee22630 100644
--- a/t/app/controller/admin/bodies.t
+++ b/t/app/controller/admin/bodies.t
@@ -1,3 +1,13 @@
+package FixMyStreet::Cobrand::AnonAllowedByCategory;
+use parent 'FixMyStreet::Cobrand::UKCouncils';
+sub council_url { 'anonbycategory' }
+sub council_name { 'Aberdeen City Council' }
+sub council_area { 'Aberdeen' }
+sub council_area_id { 2650 }
+sub anonymous_account { { email => 'anoncategory@example.org', name => 'Anonymous Category' } }
+
+package main;
+
 use FixMyStreet::TestMech;
 
 my $mech = FixMyStreet::TestMech->new;
@@ -295,8 +305,32 @@ subtest 'reopen disabling' => sub {
     is $contact->get_extra_metadata('reopening_disallowed'), 1, 'Reopening disallowed flag set';
 };
 
+subtest 'allow anonymous reporting' => sub {
+    $mech->get_ok('/admin/body/' . $body->id . '/test%20category');
+    $mech->content_lacks('Allow anonymous reports');
+};
 
 }; # END of override wrap
+FixMyStreet::override_config {
+    MAPIT_URL => 'http://mapit.uk/',
+    MAPIT_TYPES => [ 'UTA' ],
+    BASE_URL => 'http://www.example.org',
+    ALLOWED_COBRANDS => [ "fixmystreet", "anonallowedbycategory" ],
+}, sub {
+
+subtest 'allow anonymous reporting' => sub {
+    $mech->get_ok('/admin/body/' . $body->id . '/test%20category');
+    $mech->submit_form_ok( { with_fields => {
+        anonymous_allowed => 1,
+        note => 'Anonymous Allowed',
+    } } );
+    $mech->content_contains('Values updated');
+    my $contact = $body->contacts->find({ category => 'test category' });
+    is $contact->get_extra_metadata('anonymous_allowed'), 1, 'Anonymous reports allowed flag set';
+};
+
+};
+
 
 FixMyStreet::override_config {
     MAPIT_URL => 'http://mapit.uk/',
diff --git a/t/app/controller/report_new_anon.t b/t/app/controller/report_new_anon.t
index d86bc8134..cba360f05 100644
--- a/t/app/controller/report_new_anon.t
+++ b/t/app/controller/report_new_anon.t
@@ -17,6 +17,14 @@ sub allow_anonymous_reports {
 }
 sub anonymous_account { { email => 'anoncategory@example.org', name => 'Anonymous Category' } }
 
+package FixMyStreet::Cobrand::AnonAllowedByCategory;
+use parent 'FixMyStreet::Cobrand::UKCouncils';
+sub council_url { 'anonbycategory' }
+sub council_name { 'Edinburgh City Council' }
+sub council_area { 'Edinburgh' }
+sub council_area_id { 2651 }
+sub anonymous_account { { email => 'anoncategory@example.org', name => 'Anonymous Category' } }
+
 package main;
 
 use FixMyStreet::TestMech;
@@ -269,4 +277,71 @@ subtest "test report creation anonymously by button, per category" => sub {
 
 };
 
+$contact2->set_extra_metadata( anonymous_allowed => 1 );
+$contact2->update;
+
+FixMyStreet::override_config {
+    ALLOWED_COBRANDS => 'anonallowedbycategory',
+    MAPIT_URL => 'http://mapit.uk/',
+}, sub {
+
+subtest "test report creation anonymously by button, per category from metadata" => sub {
+    $mech->get_ok('/around');
+    $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } }, "submit location" );
+    $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
+    $mech->submit_form_ok({
+        button => 'submit_category_part_only',
+        with_fields => {
+            category => 'Street lighting',
+        }
+    }, "submit category with no anonymous reporting");
+    $mech->content_lacks('<button name="report_anonymously" value="yes" class="btn btn--block">'); # non-JS button, JS button always there
+    $mech->submit_form_ok({
+        button => 'submit_register',
+        with_fields => {
+            category => 'Trees',
+        }
+    }, "submit category with anonymous reporting");
+
+    $mech->submit_form_ok({
+        button => 'report_anonymously',
+        with_fields => {
+            title => 'Test Report',
+            detail => 'Test report details.',
+        }
+    }, "submit good details");
+    $mech->content_contains('Your issue is on its way to the council');
+
+    my $report = FixMyStreet::DB->resultset("Problem")->search({}, { order_by => { -desc => 'id' } })->first;
+    ok $report, "Found the report";
+
+    is $report->state, 'confirmed', "report confirmed";
+    is $report->bodies_str, $body->id;
+    is $report->name, 'Anonymous Category';
+    is $report->anonymous, 1; # Doesn't change behaviour here, but uses anon account's name always
+    is $report->get_extra_metadata('contributed_as'), 'anonymous_user';
+};
+
+};
+
+FixMyStreet::override_config {
+    ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+    BASE_URL => 'https://www.fixmystreet.com',
+    MAPIT_URL => 'http://mapit.uk/',
+}, sub {
+subtest "test anonymously by button, per category from metadata limited to cobrand" => sub {
+    $mech->get_ok('/around');
+    $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } }, "submit location" );
+    $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
+    $mech->submit_form_ok({
+        button => 'submit_category_part_only',
+        with_fields => {
+            category => 'Trees',
+        }
+    }, "submit category with no anonymous reporting");
+    $mech->content_lacks('<button name="report_anonymously" value="yes" class="btn btn--block">'); # non-JS button, JS button always there
+};
+
+};
+
 done_testing();
diff --git a/templates/web/base/admin/bodies/contact-form.html b/templates/web/base/admin/bodies/contact-form.html
index 65000942b..21b69fdcd 100644
--- a/templates/web/base/admin/bodies/contact-form.html
+++ b/templates/web/base/admin/bodies/contact-form.html
@@ -74,8 +74,14 @@
         <span class='form-hint'>[% loc('Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update.') %]</span>
     </p>
 
-    [% IF contact.sent_by_open311 %]
+    [% IF body.get_cobrand_handler.anonymous_account %]
+    <p class="form-check">
+        <input type="checkbox" name="anonymous_allowed" value="1" id="anonymous_allowed" [% ' checked' IF contact.get_extra_metadata('anonymous_allowed') %]>
+        <label for="anonymous_allowed">[% loc('Allow anonymous reports on this category') %]</label>
+    </p>
+    [% END %]
 
+    [% IF contact.sent_by_open311 %]
       <p class="form-check">
           <input type="checkbox" name="open311_protect" value="1" id="open311_protect"[% ' checked' IF contact.get_extra_metadata('open311_protect') %]>
           <label for="open311_protect">[% loc("Protect this category's name and group(s) from Open311 changes") %]</label>
-- 
cgit v1.2.3


From 0bc94341afa4909f56e94ced03f282a158a0341c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 6 May 2020 16:26:37 +0100
Subject: [Docs] Heatmap, tidy stats section.

---
 docs/_includes/admin-tasks-content.md | 23 +++++++++++++++++------
 docs/_layouts/pro.html                |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index 765e96370..5b570aa27 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -770,12 +770,13 @@ above, ‘Creating a template’. Additionally you can delete the template from
 
 <span class="admin-task__permissions">Permissions required: User must be marked as staff</span>
 
-When you first log in to the Admin area, you’ll see some top-level stats at the foot of the page,
-including the number of reports published on the site, the number of updates, the number of
-alerts set up and the number of user questionnaires sent out. This can be useful for a quick
-snapshot of activity.
+When you log in to the Admin area and click Stats in the admin navigation,
+you’ll see some top-level statistics, including the number of reports published
+on the site, the number of updates, and the number of alerts set up. This can
+be useful for a quick snapshot of activity.
 
-For a more detailed breakdown, visit the stats dashboard. This can be accessed by typing
+For a more detailed breakdown, visit the stats dashboard. This can be accessed
+by going to "Summary statistics" from the admin stats page, or by typing
 ‘/dashboard’ on the end of your FixMyStreet url.
 
 From here, you can access statistics on:
@@ -797,6 +798,16 @@ You can also group the results by:
 Android device or via an iOS device).
 
 These statistics can be downloaded as a CSV document, suitable for use in a spreadsheet program
-such as Excel.
+such as Excel or your own reporting tools.
+
+#### Heatmap
+
+Also accessible from the admin stats page is our heatmap. This can provide an
+overview of reporting in your area, filtered by state, category, or ward, for a
+particular date range:
+
+<img alt="Screenshot of Bromley heatmap showing clusters in the north and north west."
+    src="https://user-images.githubusercontent.com/4776/72752804-0eb6b700-3bbb-11ea-915b-5afde5235014.png">
+
 
 </div>
diff --git a/docs/_layouts/pro.html b/docs/_layouts/pro.html
index d79163989..085c1ce44 100644
--- a/docs/_layouts/pro.html
+++ b/docs/_layouts/pro.html
@@ -110,7 +110,7 @@
                       <li><a href="/pro-manual/admin-tasks/#creating-editing-notices">Creating and editing category notices/questions</a></li>
                       <li><a href="/pro-manual/admin-tasks/#creating-editing-priorities">Creating and editing priorities</a></li>
                       <li><a href="/pro-manual/admin-tasks/#creating-editing-response-templates">Creating and editing response templates</a></li>
-                      <li><a href="/pro-manual/admin-tasks/#view-statistics">Viewing statistics</a></li>
+                      <li><a href="/pro-manual/admin-tasks/#view-statistics">Viewing statistics/heatmap</a></li>
                     </ul>
                   </li>
               </ul>
-- 
cgit v1.2.3


From 8c6e3d87d94a34f741c02483f758e7f9d145b7f2 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 6 May 2020 16:27:28 +0100
Subject: [Docs] Document HTTPS dev server.

---
 docs/install/manual-install.md | 7 +++++++
 docs/install/vagrant.md        | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/docs/install/manual-install.md b/docs/install/manual-install.md
index 5ddf8a30f..408b419cb 100644
--- a/docs/install/manual-install.md
+++ b/docs/install/manual-install.md
@@ -177,6 +177,13 @@ $ script/server
 The server will be accessible as <http://localhost:3000/>, and will
 automatically restart if you update the code or `general.yml`.
 
+If you need to run the server under HTTPS, to e.g. develop the service worker
+or geolocation, then you can run `script/server --listen :3000:ssl
+--ssl-cert=my.crt --ssl-key=my.key --Reload perllib,conf` where my.crt and
+my.key point to a key and self-signed certificate you have generated using
+something like `openssl req -x509 -newkey rsa:4096 -sha256 -nodes -keyout
+my.key -out my.crt -subj "/CN=My local CA" -days 3650`.
+
 ### Post-install: Things you might want to change
 
 #### Next Steps
diff --git a/docs/install/vagrant.md b/docs/install/vagrant.md
index 55b7802ac..1c335ab5d 100644
--- a/docs/install/vagrant.md
+++ b/docs/install/vagrant.md
@@ -69,6 +69,13 @@ The username and password to access the admin (at address
 `http://fixmystreet.127.0.0.1.xip.io:3000/admin/`) will have been shown at the
 end of the `vagrant up` output.
 
+If you need to run the server under HTTPS, to e.g. develop the service worker
+or geolocation, then you can run `script/server --listen :3000:ssl
+--ssl-cert=my.crt --ssl-key=my.key --Reload perllib,conf` where my.crt and
+my.key point to a key and self-signed certificate you have generated using
+something like `openssl req -x509 -newkey rsa:4096 -sha256 -nodes -keyout
+my.key -out my.crt -subj "/CN=My local CA" -days 3650`.
+
 ## Editing a cobrand
 
 If you're working on a cobrand in an external repository, you will want that
-- 
cgit v1.2.3


From 60b0ccde85228080b81387292f6c98c3293a0f57 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 6 May 2020 16:29:22 +0100
Subject: [Docs] Clarify a few different sections of manual.

---
 docs/_includes/admin-tasks-content.md | 23 ++++++++++++++---------
 docs/pro-manual/admin-tasks.md        |  6 ++----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index 5b570aa27..91ba8f3d8 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -4,9 +4,11 @@
 
 <img alt="When you're logged in as an administrator the 'admin' button is in the navigation menu" src="/assets/img/pro-user-guide/navigating-as-pro-staff.png" class="admin-screenshot" />
 
-If your Administrator has already given you staff permissions, you’ll see additional admin button
-on the top menu when you’re logged in. If not, your Administrator can add these permissions at
-any time: see ‘[Creating a Staff Account](#adminstrating-staff-accounts)’.
+If your Administrator has already given you staff permissions, you may see
+additional admin button on the top menu when you’re logged in. If not, your
+access may be only in the frontend (e.g. moderation does not require any
+backend admin access), or your Administrator can add these permissions at any
+time: see ‘[Creating a Staff Account](#adminstrating-staff-accounts)’.
 </div>
 
 <div class="admin-task" markdown="1" id="viewing-reports-your-area">
@@ -18,14 +20,15 @@ any time: see ‘[Creating a Staff Account](#adminstrating-staff-accounts)’.
 If you want to view everything that’s been reported within the council area, here’s the quickest
 way.
 
-Click on ‘all reports’ in the top menu. You’ll see the boundaries of your council area on the map,
-and a list of all reports listed, with the most recent reports at the top, on the left hand panel.
+Click on ‘all reports’ in the top menu. You’ll see the boundaries of your
+council area on the map, and a list of all reports listed, with the most
+recently updated reports at the top, in the left hand panel.
 
 <img alt="Click all reports in the top menu to view all reports in an area" src="/assets/img/pro-user-guide/viewing-reports-your-area.png" class="admin-screenshot" />
 
 Note that staff members can be allocated one or more category (e.g. potholes, streetlights, etc) by
 the Administrator — see ‘[Creating a Staff Account](#adminstrating-staff-accounts)’ for more details. When logged in, these staff
-members will see reports within these categories by default.
+members will only see reports within those categories by default.
 
 </div>
 
@@ -538,9 +541,11 @@ mySociety.
 
 #### Note
 
-If your FixMyStreet Pro installation has been integrated with a CRM system, this
-section does not apply. In such cases, categories are managed from within the CRM, and
-FixMyStreet will be set up to work with these.
+If your FixMyStreet Pro installation has been integrated with a CRM system,
+this section might not fully apply; it is possible categories are managed from
+within the CRM, and FixMyStreet will be set up to work with these. Some
+installations only integrate on some categories, and some sections such as form
+disabling can still be used on top of an integration.
 
 </div>
 
diff --git a/docs/pro-manual/admin-tasks.md b/docs/pro-manual/admin-tasks.md
index d4f48a5eb..7beefab31 100644
--- a/docs/pro-manual/admin-tasks.md
+++ b/docs/pro-manual/admin-tasks.md
@@ -22,7 +22,5 @@ via a role) for you to be able to perform this task.
 
 - If you’re a member of council staff using FixMyStreet Pro, questions should be addressed
 to your Administrator.
-- For technical problems and queries, Administrators may contact the FixMyStreet team on
-[bettercities@mysociety.org](mailto:bettercities@mysociety.org).
-- Is something not quite right, or missing from this documentation? Let us know on
-[bettercities@mysociety.org](mailto:bettercities@mysociety.org).
+- For any technical problems and queries, Administrators may contact the
+  FixMyStreet team by raising a ticket through their helpdesk system.
-- 
cgit v1.2.3


From 8898170c9ac6127329a1f17d855dae8ea7472f86 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 6 May 2020 16:52:30 +0100
Subject: [Docs] Add info about user timeline.

---
 docs/_includes/admin-tasks-content.md | 21 ++++++---------------
 docs/_layouts/pro.html                |  3 +--
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index 91ba8f3d8..16329e7e8 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -114,25 +114,16 @@ to access the full report admin editing page.
 
 <div class="admin-task" markdown="1" id="search-user">
 
-### Searching for a user
+### User admin
 
 <span class="admin-task__permissions">Permissions required: User must be marked
 as staff; “Edit users' details/search for their reports” must be ticked</span>
 
-Click on ‘admin’ in the top menu bar.
-
-Enter any part of the user’s name or email address in the ‘Search users’ box.
-
-</div>
-
-<div class="admin-task" markdown="1" id="editing-users-information">
-
-### Editing a user’s information
-
-<span class="admin-task__permissions">Permissions required: User must be marked as staff; "Edit users' details/search for their reports" must be ticked.</span>
-
-Click on ‘Edit’ beside any user to view or change their account details.
-Or, click the user’s email address to view a list of all reports and updates made by that user.
+In the admin, enter any part of the user’s name or email address in the ‘Search
+users’ box. You may click on ‘Edit’ beside any user to view or change their
+account details, click the user’s email address to view a list of all reports
+and updates made by that user, or click ‘Timeline’ to see a timeline of that
+user’s activities on the site.
 
 </div>
 
diff --git a/docs/_layouts/pro.html b/docs/_layouts/pro.html
index 085c1ce44..d04446a6e 100644
--- a/docs/_layouts/pro.html
+++ b/docs/_layouts/pro.html
@@ -95,8 +95,7 @@
                       <li><a href="/pro-manual/admin-tasks/#filtering-sorting-reports">Filtering and sorting reports</a></li>
                       <li><a href="/pro-manual/admin-tasks/#view-single-report">Viewing a single report</a></li>
                       <li><a href="/pro-manual/admin-tasks/#search-report">Searching for a report</a></li>
-                      <li><a href="/pro-manual/admin-tasks/#search-user">Searching for a user</a></li>
-                      <li><a href="/pro-manual/admin-tasks/#editing-users-information">Editing a user’s information</a></li>
+                      <li><a href="/pro-manual/admin-tasks/#search-user">User search/edit</a></li>
                       <li><a href="/pro-manual/admin-tasks/#view-reports-non-staff-user">Viewing reports as a non-staff user</a></li>
                       <li><a href="/pro-manual/admin-tasks/#create-reports-behalf-user">Creating reports on behalf of another user</a></li>
                       <li><a href="/pro-manual/admin-tasks/#deal-undesirable-content">Dealing with undesirable content</a></li>
-- 
cgit v1.2.3


From 97e52222eccc441e4fcb2a444d04eb411c3a1eee Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 6 May 2020 16:52:40 +0100
Subject: [Docs] Add info about two-factor auth.

---
 docs/_includes/admin-tasks-content.md  | 11 +++++++++++
 docs/pro-manual/staff-user-accounts.md | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index 16329e7e8..98a2780bc 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -522,6 +522,17 @@ staff user only deals with reports of a specific type.
 To remove an account, the Administrator-level member of staff should make contact with
 mySociety.
 
+#### Two-factor authentication
+
+Any staff user can choose to set up two-factor authentication on their account.
+To do this, they will need an app on their phone that can generate time-based
+authentication keys, such as Google Authenticator or a password manager. Then.
+they can visit their account page on the site and select ‘Activate two-factor
+authentication’ to receive a QR code to scan with the app.
+
+If you wish your organisation to have mandated two-factor authentication,
+please get in touch.
+
 </div>
 
 <div class="admin-task" markdown="1" id="creating-editing-categories">
diff --git a/docs/pro-manual/staff-user-accounts.md b/docs/pro-manual/staff-user-accounts.md
index 37997ada2..3efa4f41f 100644
--- a/docs/pro-manual/staff-user-accounts.md
+++ b/docs/pro-manual/staff-user-accounts.md
@@ -35,6 +35,17 @@ Your password must contain 6 or more characters, and must not be one of the most
 used combinations (such as ‘Password’ or ‘123456’). Your council may also have password policies
 which you are expected to abide by.
 
+### Two-factor authentication
+
+Any staff user can choose to set up two-factor authentication on their account.
+To do this, they will need an app on their phone that can generate time-based
+authentication keys, such as Google Authenticator or a password manager. Then.
+they can visit their account page on the site and select ‘Activate two-factor
+authentication’ to receive a QR code to scan with the app.
+
+If you wish your organisation to have mandated two-factor authentication,
+please get in touch.
+
 ### How to log out
 
 Click on ‘Your account’ in the top menu, then click ‘Sign out’.
-- 
cgit v1.2.3


From 54c089dce3f02edbafba02161307fbe32f571cce Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 6 May 2020 16:54:31 +0100
Subject: [Docs] Bit on staff-only categories.

---
 docs/_includes/admin-tasks-content.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index 98a2780bc..b68a09d81 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -579,6 +579,11 @@ for information on <a
 href="#creating-editing-notices">creating/editing extra notices and
 questions</a> for a category.
 
+Categories can be made ‘staff only’, where they are only available to logged-in
+members of staff, not members of the public. This could be used for e.g.
+contact centre staff to leave reports in categories that you still want to be
+phoned in.
+
 You can set up as many or as few categories as you like, and each category can have its own email
 address attached to it, so for example, reports about potholes may go to one council email
 address, while reports about road signs go to another. More than one category may share the
-- 
cgit v1.2.3


From b818109a546d48033f4a108d7070d77d1901b7f1 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 6 May 2020 17:05:37 +0100
Subject: [Docs] Tiny bit on web app.

---
 docs/pro-manual/citizens-experience.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/pro-manual/citizens-experience.md b/docs/pro-manual/citizens-experience.md
index f47c2a124..5e7bfd0f7 100644
--- a/docs/pro-manual/citizens-experience.md
+++ b/docs/pro-manual/citizens-experience.md
@@ -22,13 +22,17 @@ When a citizen sees a problem and wishes to report it, they can do so in one of
 <img alt="Make a report on a council website, fixmystreet.com, or via the FixMyStreet app" src="/assets/img/pro-user-guide/all-the-sites.png" />
 
 - Through the council website, on the council’s branded FixMyStreet instance
-- On FixMyStreet.com, the UK-wide site
-- Via the FixMystreet app
-
+- On [FixMyStreet.com](https://www.fixmystreet.com), the UK-wide site
+- Via the FixMyStreet app
 
 No matter which of these channels they use, the report will be visible in all three places. All
 FixMyStreet instances draw from the same database of reports.
 
+The FixMyStreet website, and the council’s branded version, can also be
+installed as a ‘web app’ – providing a logo on their homescreen that users can
+treat like a native app without the hassle of app stores. If that’s something
+that would be of interest for your installation, please get in touch.
+
 <div class="boxout" markdown="1">
 
 <h4 class="boxout__title">What if a user makes a report on the council site, but it’s the responsibility of a different authority?</h4>
@@ -101,4 +105,4 @@ and you’ll be offered a range of options: you can subscribe to every report ma
 council area; every report made within a particular ward; or within an area roughly covering a
 population of 200,000 people (the size of this area varies with population density).
 Staff need not normally do this, as they will be working in the reports interface daily, and will be
-aware of issues as they arise.
\ No newline at end of file
+aware of issues as they arise.
-- 
cgit v1.2.3


From bf179ad7dc57b371d45742c3df675bd1bc285a8d Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Wed, 13 May 2020 09:45:22 +0100
Subject: [Docs] document per category anonymous reporting

Also update the category page screenshot to include the new options
---
 docs/_includes/admin-tasks-content.md              |   4 ++++
 .../img/pro-user-guide/edit-category-page.png      | Bin 42128 -> 180703 bytes
 2 files changed, 4 insertions(+)

diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index b68a09d81..ac9e81f9e 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -579,6 +579,10 @@ for information on <a
 href="#creating-editing-notices">creating/editing extra notices and
 questions</a> for a category.
 
+You may also be able to configure categories to allow anonymous
+reporting if you have this option available. If this is not available then
+contact us to discuss it.
+
 Categories can be made ‘staff only’, where they are only available to logged-in
 members of staff, not members of the public. This could be used for e.g.
 contact centre staff to leave reports in categories that you still want to be
diff --git a/docs/assets/img/pro-user-guide/edit-category-page.png b/docs/assets/img/pro-user-guide/edit-category-page.png
index db84bbb70..f78b00a1c 100755
Binary files a/docs/assets/img/pro-user-guide/edit-category-page.png and b/docs/assets/img/pro-user-guide/edit-category-page.png differ
-- 
cgit v1.2.3


From c2b32091198d3ca3d8dc0da7302f96de9ce0acc9 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 14 May 2020 16:48:30 +0100
Subject: =?UTF-8?q?[Peterborough]=20Show=20lighting=20layer=20on=20?=
 =?UTF-8?q?=E2=80=98Lighting=20enquiry=E2=80=99=20category=20in=20all=20gr?=
 =?UTF-8?q?oups?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/cobrands/peterborough/assets.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/cobrands/peterborough/assets.js b/web/cobrands/peterborough/assets.js
index 58ec4e5a1..3d718116e 100644
--- a/web/cobrands/peterborough/assets.js
+++ b/web/cobrands/peterborough/assets.js
@@ -137,8 +137,11 @@ fixmystreet.assets.add(light_defaults, {
         }
     },
     asset_group: 'Street lighting',
+    asset_category: 'Lighting enquiry',
     relevant: function(options) {
-        return options.group === 'Street lighting' && options.category !== UNKNOWN_LIGHT_CATEGORY_NAME;
+        return  ( options.group === 'Street lighting' &&
+                  options.category !== UNKNOWN_LIGHT_CATEGORY_NAME
+                ) || options.category === "Lighting enquiry";
     },
     asset_item_message: 'You can pick a <b class="asset-spot">street light</b> from the map &raquo;',
     select_action: true,
-- 
cgit v1.2.3


From 66bcc3b0fde04b9c5d8360bd4113e6247538076a Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Tue, 28 Apr 2020 18:42:53 +0100
Subject: [Hart] Update front page suggested report types

For https://github.com/mysociety/fixmystreet-commercial/issues/1875
---
 templates/web/hart/around/intro.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/web/hart/around/intro.html b/templates/web/hart/around/intro.html
index 7cc971041..fc5e2a844 100644
--- a/templates/web/hart/around/intro.html
+++ b/templates/web/hart/around/intro.html
@@ -1,4 +1,4 @@
             <div id="postcode-intro">
                 <h1> Report something in Hart that needs to be fixed </h1>
-                <h2> (like graffiti, fly tipping, broken paving slabs, or street lighting) </h2>
+                <h2> (like graffiti, fly tipping, broken paving slabs, dog fouling, or street lighting) </h2>
             </div>
-- 
cgit v1.2.3


From 4b5c27c8aeb904c3f89dc375d418a1e07d381e38 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Fri, 1 May 2020 12:41:32 +0100
Subject: Simplify #geolocate_link styling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Much less opinionated styling for #geolocate_link in core, which
means the link should look better, by default, for most cobrands.

(In particular, the link looks much better on cobrands with the more
modern style of white / off-white #front-main background, such as
highwaysengland, which was the cobrand that started off this work
to begin with.)

I’ve also reduced the specificity of the #geolocate_link rulesets
in both core and all the cobrands.

While this commit means that fewer cobrands need to override styles
on #geolocate_link, there are still 8 cobrands that have to define a
custom text colour for their #geolocate_link, because they both:
A) have a light coloured background for #front-main, and
B) want their #geolocate_link to be coloured like a normal link,
rather than inheriting the text colour of the parent element.

We might want to revisit this handling of #geolocate_link colouring and
the `#front-main a { color: inherit }` rule in _layout.scss at some
point in the future.

Fixes mysociety/fixmystreet-commercial#1835.
---
 templates/web/buckinghamshire/front/pre-steps.html |  2 +-
 web/cobrands/bexley/base.scss                      |  2 +-
 web/cobrands/bristol/base.scss                     |  4 ---
 web/cobrands/bristol/layout.scss                   |  8 +++---
 web/cobrands/buckinghamshire/base.scss             | 25 +++++++----------
 web/cobrands/buckinghamshire/layout.scss           |  7 +----
 web/cobrands/cheshireeast/base.scss                | 11 +++-----
 web/cobrands/cheshireeast/layout.scss              |  7 +++--
 web/cobrands/eastherts/layout.scss                 |  8 +++---
 web/cobrands/fixamingata/layout.scss               | 27 ++++++++----------
 web/cobrands/fixmystreet.com/layout.scss           | 31 +++++++++++----------
 web/cobrands/greenwich/base.scss                   |  4 +++
 web/cobrands/oxfordshire/base.scss                 | 28 +++++--------------
 web/cobrands/oxfordshire/layout.scss               | 15 ++++------
 web/cobrands/peterborough/base.scss                | 12 +-------
 web/cobrands/peterborough/layout.scss              | 15 +++++-----
 web/cobrands/sass/_base.scss                       | 25 ++++-------------
 web/cobrands/sass/_layout.scss                     | 18 ++++--------
 web/cobrands/tfl/base.scss                         | 17 ++++--------
 web/cobrands/tfl/layout.scss                       | 11 ++++----
 web/cobrands/warwickshire/base.scss                | 32 ++++++++--------------
 web/cobrands/warwickshire/layout.scss              | 14 ++++------
 web/cobrands/westminster/base.scss                 | 21 ++++----------
 web/cobrands/westminster/layout.scss               |  4 +--
 24 files changed, 129 insertions(+), 219 deletions(-)

diff --git a/templates/web/buckinghamshire/front/pre-steps.html b/templates/web/buckinghamshire/front/pre-steps.html
index 4728bff2f..ee7f83ec9 100644
--- a/templates/web/buckinghamshire/front/pre-steps.html
+++ b/templates/web/buckinghamshire/front/pre-steps.html
@@ -1,4 +1,4 @@
-<p style="margin: -1em -1em 1em; padding: 20px 30px; background-color: #f79f73; color: #000;">
+<p style="margin: 1em -20px; padding: 20px; background-color: #f79f73; color: #000;">
 In light of the ongoing COVID 19 crisis an element of TfB workforce has reduced
 by the need for self-isolation. This regrettably means that for the immediate
 future some work will have to be delayed. We apologise for any possible delay
diff --git a/web/cobrands/bexley/base.scss b/web/cobrands/bexley/base.scss
index 7132f33ab..0f72a2e34 100644
--- a/web/cobrands/bexley/base.scss
+++ b/web/cobrands/bexley/base.scss
@@ -39,7 +39,7 @@ small {
 .mobile-map-banner {
     font-size: 0.89em;
 }
-#front-main a#geolocate_link {
+a#geolocate_link {
     font-size: 0.89em;
 }
 #front_stats div {
diff --git a/web/cobrands/bristol/base.scss b/web/cobrands/bristol/base.scss
index 836b27009..cbd5ee081 100644
--- a/web/cobrands/bristol/base.scss
+++ b/web/cobrands/bristol/base.scss
@@ -109,10 +109,6 @@ dl dt {
   }
 }
 
-a#geolocate_link {
-  color: $b3;
-}
-
 label {
   @extend %bold-font;
 }
diff --git a/web/cobrands/bristol/layout.scss b/web/cobrands/bristol/layout.scss
index 07b39b08b..22fdcf60c 100644
--- a/web/cobrands/bristol/layout.scss
+++ b/web/cobrands/bristol/layout.scss
@@ -54,10 +54,6 @@ body.frontpage, body.twothirdswidthpage, body.fullwidthpage, body.authpage {
       }
     }
 
-    a#geolocate_link {
-      color: $b3;
-    }
-
     h1 {
       font-size: 3em;
     }
@@ -99,6 +95,10 @@ body.frontpage, body.twothirdswidthpage, body.fullwidthpage, body.authpage {
   }
 }
 
+a#geolocate_link {
+  color: $b3; // override default `#front-main a`
+}
+
 body.mappage {
   // Add a red border-bottom *inside* the header
   #site-header {
diff --git a/web/cobrands/buckinghamshire/base.scss b/web/cobrands/buckinghamshire/base.scss
index 8df2cab7b..aefe76945 100644
--- a/web/cobrands/buckinghamshire/base.scss
+++ b/web/cobrands/buckinghamshire/base.scss
@@ -102,26 +102,15 @@ dl dt {
   }
 
   #postcodeForm {
-    margin-top: 1em;
+    margin: 1em 0 0 0;
+    padding: 0;
     background: #fff;
+
     div input#sub {
       @include bucks-button();
       box-shadow: 0;
     }
   }
-  a#geolocate_link {
-    background: transparent;
-    color: $bucks_links;
-    padding: 0;
-    font-size: 1em;
-    &:hover,
-    &:active,
-    &:focus { 
-      background: transparent;
-      color: $link-hover-color;
-      text-decoration: underline;
-    }
-  }
 }
 
 .btn-primary, .green-btn, .btn--primary {
@@ -137,7 +126,13 @@ dl dt {
 }
 
 a#geolocate_link {
-  color: $b3;
+  color: $bucks_links;
+
+  &:hover,
+  &:active,
+  &:focus {
+    color: $link-hover-color;
+  }
 }
 
 label {
diff --git a/web/cobrands/buckinghamshire/layout.scss b/web/cobrands/buckinghamshire/layout.scss
index 5df31f9e2..bea2fadc0 100644
--- a/web/cobrands/buckinghamshire/layout.scss
+++ b/web/cobrands/buckinghamshire/layout.scss
@@ -90,19 +90,14 @@ body.twothirdswidthpage .content .sticky-sidebar aside {
     background-color: white;
     text-align: left;
     padding-top: 40px;
+    padding-bottom: 0;
 
     #postcodeForm {
-      margin-top: 0;
-
       div {
         margin: 0;
       }
     }
 
-    a#geolocate_link {
-      color: $b3;
-    }
-
     h1 {
       font-size: 2.5em;
     }
diff --git a/web/cobrands/cheshireeast/base.scss b/web/cobrands/cheshireeast/base.scss
index 8e771f0ad..c0d798c3a 100644
--- a/web/cobrands/cheshireeast/base.scss
+++ b/web/cobrands/cheshireeast/base.scss
@@ -90,15 +90,12 @@ a,
     background-color: #ecf3ec;
 }
 
-#front-main a#geolocate_link {
-    color: #2e3191;
-    background: transparent;
+a#geolocate_link {
     border-bottom: 1px solid #a6a7da;
-    padding: 0;
-    margin-top: 0.5em;
-    font-size: inherit;
+    padding: 0; // remove padding so that border-bottom looks like an underline
+    margin: 0 0 1em 0;
+
     &:hover {
-        background: transparent;
         border-bottom: 1px solid #2e3191;
         transition: border-color 0.5s;
     }
diff --git a/web/cobrands/cheshireeast/layout.scss b/web/cobrands/cheshireeast/layout.scss
index 71861e13f..4505b3a26 100644
--- a/web/cobrands/cheshireeast/layout.scss
+++ b/web/cobrands/cheshireeast/layout.scss
@@ -29,8 +29,11 @@ body.frontpage .content {
     margin: 0;
     width: 30em;
 }
-#front-main a#geolocate_link {
-    color: #2e3191;
+
+a#geolocate_link {
+    color: #2e3191; // override default `#front-main a`
+    margin-top: 1em;
+
     &:hover {
         text-decoration: none;
     }
diff --git a/web/cobrands/eastherts/layout.scss b/web/cobrands/eastherts/layout.scss
index 964feb5ca..dbb33a3d2 100644
--- a/web/cobrands/eastherts/layout.scss
+++ b/web/cobrands/eastherts/layout.scss
@@ -116,10 +116,6 @@
         }
     }
 
-    a#geolocate_link {
-        color: $eh_green;
-    }
-
     h1 {
         font-size: 2.5em;
     }
@@ -131,6 +127,10 @@
     }
 }
 
+a#geolocate_link {
+    color: $eh_green; // override default `#front-main a`
+}
+
 body.mappage {
     .eh-footer {
         display: none;
diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
index 6cf0dd47e..25e5b260f 100644
--- a/web/cobrands/fixamingata/layout.scss
+++ b/web/cobrands/fixamingata/layout.scss
@@ -122,26 +122,23 @@ body.mappage {
 
 .content footer .tablewrapper { background: #fff; }
 
-#front-main {
-    a#geolocate_link {
+a#geolocate_link {
+    background: url(images/locate-me.png) $left 0 no-repeat;
+    height: 34px;
+    padding-#{$left}: 24px;
+    margin-top: 0.25em;
+    @media ($high-dpi-screen) {
+        background-image: url(images/locate-me@2.png);
+        background-size: 22px 34px;
+    }
+    &:hover {
+        text-decoration:underline;
         background: url(images/locate-me.png) $left 0 no-repeat;
-        height: 34px;
-        padding-#{$left}: 24px;
-        margin-top: 0.25em;
-        font-size: 1em;
+
         @media ($high-dpi-screen) {
             background-image: url(images/locate-me@2.png);
             background-size: 22px 34px;
         }
-        &:hover {
-            text-decoration:underline;
-            background: url(images/locate-me.png) $left 0 no-repeat;
-
-            @media ($high-dpi-screen) {
-                background-image: url(images/locate-me@2.png);
-                background-size: 22px 34px;
-            }
-        }
     }
 }
 
diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss
index f6d7c9096..e6a862f73 100644
--- a/web/cobrands/fixmystreet.com/layout.scss
+++ b/web/cobrands/fixmystreet.com/layout.scss
@@ -152,20 +152,23 @@ body.fullwidthpage {
                 }
             }
         }
-        a#geolocate_link {
-            font-family: $body-font;
-            background: url(images/locate-me.png) $left 0 no-repeat;
-            height: 34px;
-            padding-#{$left}: 24px;
-            margin-top: 0.25em;
-            @media ($high-dpi-screen) {
-                background-image: url(images/locate-me@2.png);
-                background-size: 22px 34px;
-            }
-        }
-        a#geolocate_link.loading {
-            background: url("/cobrands/fixmystreet/images/spinner-yellow.gif") 100% 33% no-repeat
-        }
+    }
+}
+
+a#geolocate_link {
+    font-family: $body-font;
+    background: url(images/locate-me.png) $left 0 no-repeat;
+    height: 34px;
+    padding-#{$left}: 24px;
+    margin-top: 0.25em;
+
+    @media ($high-dpi-screen) {
+        background-image: url(images/locate-me@2.png);
+        background-size: 22px 34px;
+    }
+
+    &.loading {
+        background: url("/cobrands/fixmystreet/images/spinner-yellow.gif") 100% 33% no-repeat
     }
 }
 
diff --git a/web/cobrands/greenwich/base.scss b/web/cobrands/greenwich/base.scss
index 0f990c865..bfbb0a62a 100644
--- a/web/cobrands/greenwich/base.scss
+++ b/web/cobrands/greenwich/base.scss
@@ -28,6 +28,10 @@
     background-color: $greenwich_light_grey;
 }
 
+#front-main #postcodeForm {
+    margin-top: 1em;
+}
+
 label[for=pc] {
     color: $greenwich_dark_red;
 }
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index 999321a7e..9fd4bc2ad 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -99,29 +99,15 @@ a:not([class]):focus {
             }
         }
     }
+}
 
-    a#geolocate_link {
-        padding: 0;
-        background: transparent;
-        font-size: inherit;
-        color: $link-color;
-        margin-top: 0.5em;
-
-        &:hover {
-            background-color: transparent;
-            color: $link-hover-color;
-        }
-
-        &:focus {
-            background-color: $color-oxfordshire-bright-yellow;
-            outline: 2px solid $color-oxfordshire-bright-yellow;
-        }
+a#geolocate_link {
+    padding: 0;
+    margin-top: 0.5em;
 
-        &.loading {
-            background: transparent url("/cobrands/fixmystreet/images/spinner-white.gif") 100% 50% no-repeat;
-            padding: 0 1.5em 0 0;
-            border: none;
-        }
+    &.loading {
+        background: transparent url("/cobrands/fixmystreet/images/spinner-white.gif") 100% 50% no-repeat;
+        padding: 0 1.5em 0 0;
     }
 }
 
diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss
index 1b415903a..e482b1eaf 100644
--- a/web/cobrands/oxfordshire/layout.scss
+++ b/web/cobrands/oxfordshire/layout.scss
@@ -130,18 +130,13 @@ $mappage-header-height: 10em;
             }
         }
     }
+}
 
-    a#geolocate_link {
-        color: $color-oxfordshire-link-blue;
-
-        &:hover {
-            color: $color-oxfordshire-bright-yellow;
-        }
+a#geolocate_link {
+    color: $color-oxfordshire-link-blue; // override default `#front-main a`
 
-        &:focus {
-            background-color: $color-oxfordshire-bright-yellow;
-            outline: 2px solid $color-oxfordshire-bright-yellow;
-        }
+    &:hover {
+        color: $color-oxfordshire-bright-yellow; // override default `#front-main a`
     }
 }
 
diff --git a/web/cobrands/peterborough/base.scss b/web/cobrands/peterborough/base.scss
index 67e199cca..32d883132 100644
--- a/web/cobrands/peterborough/base.scss
+++ b/web/cobrands/peterborough/base.scss
@@ -45,6 +45,7 @@ h1, h2 {
     }
     #postcodeForm {
         background-color: #fff;
+        padding-bottom: 0;
         div input#sub {
             background-color: $link-color;
         }
@@ -53,17 +54,6 @@ h1, h2 {
     .form-hint {
         color: $primary_b;
     }
-    a#geolocate_link {
-        background-color: transparent;
-        padding: 0;
-        color: $link-color;
-        &:hover,
-        &:active,
-        &:focus {
-            background-color: transparent;
-            text-decoration: underline
-        }
-    }
 }
 
 .btn-primary,
diff --git a/web/cobrands/peterborough/layout.scss b/web/cobrands/peterborough/layout.scss
index 62486ab35..cd209f530 100644
--- a/web/cobrands/peterborough/layout.scss
+++ b/web/cobrands/peterborough/layout.scss
@@ -29,13 +29,14 @@ body.frontpage #front-main {
         font-weight: normal;
         font-size: 1.5em;
     }
-    a#geolocate_link {
-        color: $link-color;
-        &:hover,
-        &:active,
-        &:focus {
-            color: $link-hover-color;
-        }
+}
+
+a#geolocate_link {
+    color: $link-color; // override default `#front-main a`
+    &:hover,
+    &:active,
+    &:focus {
+        color: $link-hover-color; // override default `#front-main a`
     }
 }
 
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index b52b75f43..29b000fbc 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -2373,26 +2373,13 @@ label .muted {
       }
     }
   }
-  a#geolocate_link {
-    @include inline-block;
-    vertical-align:top;
-    background:#1a1a1a;
-    color:#C8C8C8;
-    padding:0.5em;
-    font-family: $meta-font;
-    font-size: 0.8125em;
-    @include border-radius(0 0 0.25em 0.25em);
-    &:hover {
-      text-decoration:none;
-      background:#2a2a2a;
-    }
-  }
-  a#geolocate_link.loading {
-      background: #1a1a1a url("/cobrands/fixmystreet/images/spinner-black.gif") flip(100%,0) 50% no-repeat;
-      border-#{$right}: solid 0.5em #1a1a1a;
-      padding-#{$right}: 1.5em;
-  }
 }
+
+a#geolocate_link {
+  display: inline-block;
+  padding: 0.5em;
+}
+
 .no-js #geolocate_link {
     display: none !important;
 }
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 02ded6fc1..e02da2bcc 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -860,18 +860,12 @@ textarea.form-error {
       text-decoration: none;
     }
   }
-  a#geolocate_link {
-    color: inherit;
-    background:none;
-    text-decoration: none;
-    padding-bottom: 0;
-    &:hover {
-      text-decoration:underline;
-      background:none;
-    }
-  }
-  a#geolocate_link.loading {
-      border-#{$right}: none;
+}
+
+a#geolocate_link {
+  text-decoration: none; // override `#front-main a`
+  &:hover {
+    text-decoration: underline;
   }
 }
 
diff --git a/web/cobrands/tfl/base.scss b/web/cobrands/tfl/base.scss
index 9c573f331..43ac90612 100644
--- a/web/cobrands/tfl/base.scss
+++ b/web/cobrands/tfl/base.scss
@@ -138,18 +138,6 @@ input.form-error, textarea.form-error {
             }
         } 
     }
-    a#geolocate_link {
-        color: $beck-blue;
-        font-family: $heading-font;
-        text-decoration: underline;
-        font-size: 1.125em;
-        background: transparent;
-        &:hover,
-        &:active,
-        &:focus {
-            background: transparent;
-        }
-    }
     h2 {
         font-style: normal;
         font-family: $body-font;
@@ -158,6 +146,11 @@ input.form-error, textarea.form-error {
     }
 }
 
+a#geolocate_link {
+    font-family: $heading-font;
+    font-size: 1.125em;
+}
+
 .item-list__heading {
     font-family: $body-font;
 }
diff --git a/web/cobrands/tfl/layout.scss b/web/cobrands/tfl/layout.scss
index 8e3c6b5d8..6f63fa06d 100644
--- a/web/cobrands/tfl/layout.scss
+++ b/web/cobrands/tfl/layout.scss
@@ -66,12 +66,11 @@ h1 {
   #postcodeForm div {
     margin: 0;
   }
-  a#geolocate_link {
-    color: $beck-blue;
-    font-family: $heading-font;
-    text-decoration: underline;
-    font-size: 1.125em;
-  }
+}
+
+a#geolocate_link {
+  color: $beck-blue; // override default `#front-main a`
+  text-decoration: underline;
 }
 
 .frontpage .content {
diff --git a/web/cobrands/warwickshire/base.scss b/web/cobrands/warwickshire/base.scss
index 224346195..53bae8431 100644
--- a/web/cobrands/warwickshire/base.scss
+++ b/web/cobrands/warwickshire/base.scss
@@ -79,31 +79,21 @@
             }
         }
     }
+}
 
-    a#geolocate_link {
-        padding: 0;
-        background: transparent;
-        font-size: 1em;
-        color: $link-color;
-        margin-top: 0.5em;
-
-        &:hover {
-            background-color: transparent;
-            color: $link-hover-color;
-        }
-
-        &:focus {
-            outline: 3px solid $warwickshire-yellow;
-        }
+a#geolocate_link {
+    padding: 0;
+    margin-top: 0.5em;
 
-        &.loading,
-        &.loading:hover {
-            background: transparent url("/cobrands/warwickshire/images/spinner-f6f6f6-333333.gif") 100% 50% no-repeat;
-            padding: 0 1.5em 0 0;
-            border: none;
-        }
+    &:focus {
+        outline: 3px solid $warwickshire-yellow;
     }
 
+    &.loading,
+    &.loading:hover {
+        background: transparent url("/cobrands/warwickshire/images/spinner-f6f6f6-333333.gif") 100% 50% no-repeat;
+        padding: 0 1.5em 0 0;
+    }
 }
 
 .box-warning {
diff --git a/web/cobrands/warwickshire/layout.scss b/web/cobrands/warwickshire/layout.scss
index ac360f16d..37cd88b4e 100644
--- a/web/cobrands/warwickshire/layout.scss
+++ b/web/cobrands/warwickshire/layout.scss
@@ -43,17 +43,13 @@
             margin: 1.5em 0 0.5em 0;
         }
     }
+}
 
-    a#geolocate_link {
-        color: $link-color;
-
-        &:hover {
-            color: $link-hover-color;
-        }
+a#geolocate_link {
+    color: $link-color; // override default `#front-main a`
 
-        &:focus {
-            outline: 3px solid $warwickshire-yellow;
-        }
+    &:hover {
+        color: $link-hover-color; // override default `#front-main a`
     }
 }
 
diff --git a/web/cobrands/westminster/base.scss b/web/cobrands/westminster/base.scss
index c67a67f6d..01b7760e8 100644
--- a/web/cobrands/westminster/base.scss
+++ b/web/cobrands/westminster/base.scss
@@ -82,27 +82,16 @@ body.frontpage {
         }
     }
 
-    a#geolocate_link {
-        background: transparent;
-        display: block;
-        padding: 0;
-        margin-top: 0.5em;
-        font-family: inherit;
-        font-size: 1em;
-        border-radius: 0;
-        color: $westminster_blue;
-
-        &:hover {
-            background: transparent;
-            text-decoration: underline;
-        }
-    }
-
     .form-hint {
         color: inherit;
     }
 }
 
+a#geolocate_link {
+    padding: 0;
+    margin-top: 0.5em;
+}
+
 #front-howto h2,
 #front-recently h2 {
     font-weight: bold;
diff --git a/web/cobrands/westminster/layout.scss b/web/cobrands/westminster/layout.scss
index 94483a523..eac7a8432 100644
--- a/web/cobrands/westminster/layout.scss
+++ b/web/cobrands/westminster/layout.scss
@@ -36,8 +36,8 @@
     }
 }
 
-#front-main a#geolocate_link {
-    color: $westminster-blue;
+a#geolocate_link {
+    color: $westminster-blue; // override default `#front-main a`
 }
 
 body.mappage {
-- 
cgit v1.2.3


From 5bf3d1b8784a025c3fa19a66f7d85d0fe0202c75 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Wed, 13 May 2020 12:19:06 +0100
Subject: Sass variables for customising links in #front-main
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The colour and text decoration of links inside `#front-main` can now
be customised via `$primary_link_*` Sass variables.

Text decoration is set in _base.scss (like global link text decoration)
while colour is handled in _layout.scss (which is where `#front-main` is
given its background colour, so likely also the time you’ll want to set
a contrasting colour for links inside it).

The colour variables are set to `null` by default, meaning that no
colour or rules for those links will be compiled, enabling the links to
inherit the global link colour style, which previously wasn’t possible.

The decoration variables are set to `underline` by default, because most
cobrands set their #front-main links to be the same colour as the
surrounding text, so adding an underline is a sensible default. You can
disable the underlines by setting `$primary_link_decoration: none` in
your cobrand’s _colours.scss file, as cheshireeast and oxfordshire do.

Fixes #3007.
---
 CHANGELOG.md                               |  3 +++
 web/cobrands/bathnes/_colours.scss         |  6 ++++--
 web/cobrands/bristol/layout.scss           |  4 ----
 web/cobrands/bromley/_colours.scss         |  2 ++
 web/cobrands/cheshireeast/_colours.scss    |  1 +
 web/cobrands/cheshireeast/layout.scss      |  5 -----
 web/cobrands/eastherts/layout.scss         |  4 ----
 web/cobrands/fiksgatami/_colours.scss      |  2 ++
 web/cobrands/fixamingata/_colours.scss     |  2 ++
 web/cobrands/fixmystreet.com/_colours.scss |  2 ++
 web/cobrands/hart/_colours.scss            |  2 ++
 web/cobrands/hounslow/_colours.scss        |  2 ++
 web/cobrands/isleofwight/_colours.scss     |  4 +++-
 web/cobrands/oxfordshire/_colours.scss     |  1 +
 web/cobrands/oxfordshire/layout.scss       |  8 --------
 web/cobrands/peterborough/layout.scss      |  9 ---------
 web/cobrands/rutland/_colours.scss         |  2 ++
 web/cobrands/sass/_base.scss               |  9 +++++++++
 web/cobrands/sass/_layout.scss             | 15 +++++----------
 web/cobrands/tfl/layout.scss               |  5 -----
 web/cobrands/warwickshire/layout.scss      |  8 --------
 web/cobrands/westminster/layout.scss       |  4 ----
 22 files changed, 40 insertions(+), 60 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c576808d0..19429b6cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
+    - Development improvements:
+        - `#geolocate_link` is now easier to re-style. #3006
+        - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
 
 * v3.0.1 (6th May 2020)
     - New features:
diff --git a/web/cobrands/bathnes/_colours.scss b/web/cobrands/bathnes/_colours.scss
index 0340b3eda..c9503ae04 100644
--- a/web/cobrands/bathnes/_colours.scss
+++ b/web/cobrands/bathnes/_colours.scss
@@ -18,9 +18,11 @@ $site-width: 60em;
 
 @import "pattern-lib/colours";
 
-$primary: #00728F;
+$primary: $bathnes-primary;
 $primary_b: #0b0b0c;
-$primary_text: #0b0c0c;
+$primary_text: #fff;
+$primary_link_color: $primary_text;
+$primary_link_hover_color: rgba($primary_text, 0.8);
 
 $base_bg: white;
 $base_fg: #0b0c0c;
diff --git a/web/cobrands/bristol/layout.scss b/web/cobrands/bristol/layout.scss
index 22fdcf60c..c2ba57afe 100644
--- a/web/cobrands/bristol/layout.scss
+++ b/web/cobrands/bristol/layout.scss
@@ -95,10 +95,6 @@ body.frontpage, body.twothirdswidthpage, body.fullwidthpage, body.authpage {
   }
 }
 
-a#geolocate_link {
-  color: $b3; // override default `#front-main a`
-}
-
 body.mappage {
   // Add a red border-bottom *inside* the header
   #site-header {
diff --git a/web/cobrands/bromley/_colours.scss b/web/cobrands/bromley/_colours.scss
index 9528f5403..53f6bc2c6 100644
--- a/web/cobrands/bromley/_colours.scss
+++ b/web/cobrands/bromley/_colours.scss
@@ -9,6 +9,8 @@ $bromley_dark_green: #505050;
 $primary: $bromley_blue;
 $primary_b: #ffffff;
 $primary_text: #ffffff;
+$primary_link_color: $primary_text;
+$primary_link_hover_color: rgba($primary_text, 0.8);
 
 $link-color: $bromley_green;
 $link-hover-color: $bromley_green;
diff --git a/web/cobrands/cheshireeast/_colours.scss b/web/cobrands/cheshireeast/_colours.scss
index 363214bd0..e0bc13b08 100644
--- a/web/cobrands/cheshireeast/_colours.scss
+++ b/web/cobrands/cheshireeast/_colours.scss
@@ -27,6 +27,7 @@ $col_button_hover: $green;
 $primary: $white;
 $primary_b: $green;
 $primary_text: $text_black;
+$primary_link_decoration: none;
 
 $base_bg: $white;
 $base_fg: $text_black;
diff --git a/web/cobrands/cheshireeast/layout.scss b/web/cobrands/cheshireeast/layout.scss
index 4505b3a26..ad5c6580b 100644
--- a/web/cobrands/cheshireeast/layout.scss
+++ b/web/cobrands/cheshireeast/layout.scss
@@ -31,12 +31,7 @@ body.frontpage .content {
 }
 
 a#geolocate_link {
-    color: #2e3191; // override default `#front-main a`
     margin-top: 1em;
-
-    &:hover {
-        text-decoration: none;
-    }
 }
 
 .ce-footer {
diff --git a/web/cobrands/eastherts/layout.scss b/web/cobrands/eastherts/layout.scss
index dbb33a3d2..d5fb3fc0d 100644
--- a/web/cobrands/eastherts/layout.scss
+++ b/web/cobrands/eastherts/layout.scss
@@ -127,10 +127,6 @@
     }
 }
 
-a#geolocate_link {
-    color: $eh_green; // override default `#front-main a`
-}
-
 body.mappage {
     .eh-footer {
         display: none;
diff --git a/web/cobrands/fiksgatami/_colours.scss b/web/cobrands/fiksgatami/_colours.scss
index 907065d36..cd5ed0c47 100644
--- a/web/cobrands/fiksgatami/_colours.scss
+++ b/web/cobrands/fiksgatami/_colours.scss
@@ -7,6 +7,8 @@ $bg: #1a4f7f;
 $primary: #99bfe1;
 $primary_b: #000000;
 $primary_text: #222222;
+$primary_link_color: $primary_text;
+$primary_link_hover_color: rgba($primary_text, 0.8);
 
 $base_bg: $bg;
 $base_fg: #fff;
diff --git a/web/cobrands/fixamingata/_colours.scss b/web/cobrands/fixamingata/_colours.scss
index dbdd92e5b..c718a102b 100644
--- a/web/cobrands/fixamingata/_colours.scss
+++ b/web/cobrands/fixamingata/_colours.scss
@@ -5,6 +5,8 @@ $menu-image: 'menu-black';
 $primary: #00b1da;
 $primary_b: #0087a6;
 $primary_text: #222;
+$primary_link_color: $primary_text;
+$primary_link_hover_color: rgba($primary_text, 0.8);
 
 $base_bg: #eee url(images/tile.jpg) 0 0 repeat;
 $base_fg: $primary_text;
diff --git a/web/cobrands/fixmystreet.com/_colours.scss b/web/cobrands/fixmystreet.com/_colours.scss
index d28cf11e2..b0de8eacb 100644
--- a/web/cobrands/fixmystreet.com/_colours.scss
+++ b/web/cobrands/fixmystreet.com/_colours.scss
@@ -3,6 +3,8 @@
 $primary: #FFD000;
 $primary_b: #F3B11E; // For the box around the front page postcode form only
 $primary_text: #222;
+$primary_link_color: $primary_text;
+$primary_link_hover_color: rgba($primary_text, 0.8);
 
 // Tiled main body background
 $base_bg: #272727 url(images/tile.jpg) 0 0 repeat;
diff --git a/web/cobrands/hart/_colours.scss b/web/cobrands/hart/_colours.scss
index d79126bae..321b893ad 100644
--- a/web/cobrands/hart/_colours.scss
+++ b/web/cobrands/hart/_colours.scss
@@ -8,6 +8,8 @@ $col_fixed_label: $hart_primary;
 
 $primary_b: #000000;
 $primary_text: #ffffff;
+$primary_link_color: $primary_text;
+$primary_link_hover_color: rgba($primary_text, 0.8);
 
 $link-color: #369;
 $link-hover-color: #369;
diff --git a/web/cobrands/hounslow/_colours.scss b/web/cobrands/hounslow/_colours.scss
index 0a4476720..622055e82 100644
--- a/web/cobrands/hounslow/_colours.scss
+++ b/web/cobrands/hounslow/_colours.scss
@@ -21,6 +21,8 @@ $primary: $purple;
 //$primary: #dce6f2; // From bexley.gov.uk/services
 $primary_b: #222;
 $primary_text: $white;
+$primary_link_color: $primary_text;
+$primary_link_hover_color: rgba($primary_text, 0.8);
 
 $base_bg: $white;
 $base_fg: #222;
diff --git a/web/cobrands/isleofwight/_colours.scss b/web/cobrands/isleofwight/_colours.scss
index 688eb66e0..511fcef02 100644
--- a/web/cobrands/isleofwight/_colours.scss
+++ b/web/cobrands/isleofwight/_colours.scss
@@ -11,9 +11,11 @@ $green: #75c044;
 
 //Any 20% tint of the above
 
-$primary_text: #fff;
 $primary: $cyan;
 $primary_b: #222;
+$primary_text: #fff;
+$primary_link_color: $primary_text;
+$primary_link_hover_color: rgba($primary_text, 0.8);
 
 $base_bg: #fff;
 $base_fg: #222;
diff --git a/web/cobrands/oxfordshire/_colours.scss b/web/cobrands/oxfordshire/_colours.scss
index 7ef941660..d52571721 100644
--- a/web/cobrands/oxfordshire/_colours.scss
+++ b/web/cobrands/oxfordshire/_colours.scss
@@ -14,6 +14,7 @@ $color-oxfordshire-link-blue: #0a549d;
 $primary: $color-oxfordshire-bright-green;
 $primary_b: $color-oxfordshire-dark-green;
 $primary_text: #fff;
+$primary_link_decoration: none;
 
 $link-color: $color-oxfordshire-link-blue;
 $link-hover-color: $color-oxfordshire-bright-yellow;
diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss
index e482b1eaf..91ea8c4d1 100644
--- a/web/cobrands/oxfordshire/layout.scss
+++ b/web/cobrands/oxfordshire/layout.scss
@@ -132,14 +132,6 @@ $mappage-header-height: 10em;
     }
 }
 
-a#geolocate_link {
-    color: $color-oxfordshire-link-blue; // override default `#front-main a`
-
-    &:hover {
-        color: $color-oxfordshire-bright-yellow; // override default `#front-main a`
-    }
-}
-
 .frontpage {
     .content h2 {
         font-size: 2em;
diff --git a/web/cobrands/peterborough/layout.scss b/web/cobrands/peterborough/layout.scss
index cd209f530..de5c5f9a9 100644
--- a/web/cobrands/peterborough/layout.scss
+++ b/web/cobrands/peterborough/layout.scss
@@ -31,15 +31,6 @@ body.frontpage #front-main {
     }
 }
 
-a#geolocate_link {
-    color: $link-color; // override default `#front-main a`
-    &:hover,
-    &:active,
-    &:focus {
-        color: $link-hover-color; // override default `#front-main a`
-    }
-}
-
 #postcodeForm .form-hint {
     color: $grey;
 }
diff --git a/web/cobrands/rutland/_colours.scss b/web/cobrands/rutland/_colours.scss
index aabedb0f1..e81ce2554 100755
--- a/web/cobrands/rutland/_colours.scss
+++ b/web/cobrands/rutland/_colours.scss
@@ -14,6 +14,8 @@ $RCCbg: #F1F1F1;
 $primary: $RCCGreen;
 $primary_b: #000000;
 $primary_text: #222222;
+$primary_link_color: $primary_text;
+$primary_link_hover_color: rgba($primary_text, 0.8);
 
 $base_bg: $RCCbg;
 $base_fg: #000;
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 29b000fbc..f86af2386 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -11,6 +11,9 @@ $link-visited-color: $link-color !default;
 $link-text-decoration: none !default;
 $link-hover-text-decoration: underline !default;
 
+$primary_link_decoration: underline !default;
+$primary_link_hover_decoration: $primary_link_decoration !default;
+
 $itemlist_item_background: #f6f6f6 !default;
 $itemlist_item_background_hover: #e6e6e6 !default;
 $col_big_numbers: #666 !default;
@@ -2373,6 +2376,12 @@ label .muted {
       }
     }
   }
+  a {
+    text-decoration: $primary_link_decoration;
+    &:hover {
+      text-decoration: $primary_link_hover_decoration;
+    }
+  }
 }
 
 a#geolocate_link {
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index e02da2bcc..8b3406d9d 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -13,6 +13,9 @@ $header-top-border: $header-top-border-width solid $primary !default;
 
 $container-max-width: 60em !default;
 
+$primary_link_color: null !default;
+$primary_link_hover_color: null !default;
+
 .internal-link-fixed-header {
     display: block;
     position: relative;
@@ -854,21 +857,13 @@ textarea.form-error {
     }
   }
   a {
-    color: inherit;
-    text-decoration: underline;
+    color: $primary_link_color;
     &:hover {
-      text-decoration: none;
+      color: $primary_link_hover_color;
     }
   }
 }
 
-a#geolocate_link {
-  text-decoration: none; // override `#front-main a`
-  &:hover {
-    text-decoration: underline;
-  }
-}
-
 #front-howto {
   border-#{$right}: 1em solid transparent;
 }
diff --git a/web/cobrands/tfl/layout.scss b/web/cobrands/tfl/layout.scss
index 6f63fa06d..751a71672 100644
--- a/web/cobrands/tfl/layout.scss
+++ b/web/cobrands/tfl/layout.scss
@@ -68,11 +68,6 @@ h1 {
   }
 }
 
-a#geolocate_link {
-  color: $beck-blue; // override default `#front-main a`
-  text-decoration: underline;
-}
-
 .frontpage .content {
   padding: 2em 0;
 }
diff --git a/web/cobrands/warwickshire/layout.scss b/web/cobrands/warwickshire/layout.scss
index 37cd88b4e..fdf3524cd 100644
--- a/web/cobrands/warwickshire/layout.scss
+++ b/web/cobrands/warwickshire/layout.scss
@@ -45,14 +45,6 @@
     }
 }
 
-a#geolocate_link {
-    color: $link-color; // override default `#front-main a`
-
-    &:hover {
-        color: $link-hover-color; // override default `#front-main a`
-    }
-}
-
 .site-footer__section {
     @include box-sizing(border-box);
     float: left;
diff --git a/web/cobrands/westminster/layout.scss b/web/cobrands/westminster/layout.scss
index eac7a8432..6e5c30ced 100644
--- a/web/cobrands/westminster/layout.scss
+++ b/web/cobrands/westminster/layout.scss
@@ -36,10 +36,6 @@
     }
 }
 
-a#geolocate_link {
-    color: $westminster-blue; // override default `#front-main a`
-}
-
 body.mappage {
     #site-header {
         box-sizing: border-box; // count padding as part of height, so border-bottom is visible
-- 
cgit v1.2.3


From 151197042f368b9c7f3b0267e0fc9bcb1fee04d3 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 14 May 2020 12:09:51 +0100
Subject: reset asset select message by id when asset unselected

Resetting using the class could cause an incorrect "you can pick an
$item from the map" message to be display when asset_groups were being
used. This was happening when the unselect event was firing after the
category change event and then updating the new message using the
message from the unselected layer.

Fixes mysociety/fixmystreet-commercial#1888
---
 .cypress/cypress/integration/peterborough.js |  7 +++++++
 bin/fixmystreet.com/fixture                  | 20 +++++++++++++++++++-
 web/cobrands/fixmystreet/assets.js           | 14 +++++++++++++-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/.cypress/cypress/integration/peterborough.js b/.cypress/cypress/integration/peterborough.js
index 67c468be8..be1515028 100644
--- a/.cypress/cypress/integration/peterborough.js
+++ b/.cypress/cypress/integration/peterborough.js
@@ -31,4 +31,11 @@ describe('new report form', function() {
     cy.get('.js-hide-if-invalid-category').should('be.visible');
   });
 
+  it('correctly changes the asset select message', function() {
+    cy.get('select:eq(4)').select('Street lighting');
+    cy.get('.category_meta_message').should('contain', 'You can pick a street light from the map');
+    cy.get('select:eq(4)').select('Trees');
+    cy.get('.category_meta_message').should('contain', 'You can pick a tree from the map');
+  });
+
 });
diff --git a/bin/fixmystreet.com/fixture b/bin/fixmystreet.com/fixture
index 1062eb16b..082fc6309 100755
--- a/bin/fixmystreet.com/fixture
+++ b/bin/fixmystreet.com/fixture
@@ -100,7 +100,7 @@ if ($opt->test_fixtures) {
         { area_id => 2397, categories => [ 'Graffiti' ], name => 'Northampton Borough Council' },
         { area_id => 2483, categories => [ 'Potholes', 'Other' ], name => 'Hounslow Borough Council' },
         { area_id => 2636, categories => [ 'Potholes', 'Private', 'Extra' ], name => 'Isle of Wight Council' },
-        { area_id => 2566, categories => [ 'Fallen branch' ], name => 'Peterborough City Council' },
+        { area_id => 2566, categories => [ 'Fallen branch', 'Light Out', 'Light Dim', 'Fallen Tree', 'Damaged Tree' ], name => 'Peterborough City Council' },
         { area_id => 2498, categories => [ 'Incorrect timetable', 'Glass broken', 'Mobile Crane Operation' ], name => 'TfL' },
     ) {
         $bodies->{$_->{area_id}} = FixMyStreet::DB::Factory::Body->find_or_create($_);
@@ -108,6 +108,24 @@ if ($opt->test_fixtures) {
         say "Created body $_->{name} for MapIt area ID $_->{area_id}, categories $cats";
     }
 
+    for my $cat_name ('Fallen Tree', 'Damaged Tree') {
+        my $cat = FixMyStreet::DB->resultset('Contact')->find({
+            body => $bodies->{2566},
+            category => $cat_name,
+        });
+        $cat->set_extra_metadata( group => 'Trees' );
+        $cat->update;
+    }
+
+    for my $cat_name ('Light Out', 'Light Dim') {
+        my $cat = FixMyStreet::DB->resultset('Contact')->find({
+            body => $bodies->{2566},
+            category => $cat_name,
+        });
+        $cat->set_extra_metadata( group => 'Street lighting' );
+        $cat->update;
+    }
+
     my $child_cat = FixMyStreet::DB->resultset("Contact")->find({
         body => $bodies->{2234},
         category => 'Very Urgent',
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index 88a098398..e816fb4e5 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -833,7 +833,19 @@ fixmystreet.assets = {
     named_select_action_not_found: function() {
         var message = this.fixmystreet.asset_item_message;
         message = message.replace('ITEM', this.fixmystreet.asset_item);
-        $('.category_meta_message').html(message);
+        if (this.fixmystreet.asset_group) {
+            var prefix = this.fixmystreet.asset_group.replace(/[^a-z]/gi, '');
+            var id = "category_meta_message_" + prefix;
+            var $p = $('#' + id);
+            $p.html(message);
+        } else {
+            $.each(this.fixmystreet.asset_category, function(i, c) {
+                var prefix = c.replace(/[^a-z]/gi, ''),
+                    id = "category_meta_message_" + prefix,
+                    $p = $('#' + id);
+                $p.html(message);
+            });
+        }
     },
 
     selectedFeature: function() {
-- 
cgit v1.2.3


From 1b988948aee3f4decff3252669c672149ebb1aef Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 18 May 2020 12:44:19 +0100
Subject: Add --coverage option to browser-tests.

You need to install the @cypress/code-coverage package alongside cypress.
---
 .cypress/cypress/plugins/index.js         |  6 +++++
 .cypress/cypress/support/index.js         |  2 ++
 .gitignore                                |  4 +++
 CHANGELOG.md                              |  1 +
 bin/browser-tests                         | 44 +++++++++++++++++++++++++++++--
 web/vendor/accessible-autocomplete.min.js |  1 -
 web/vendor/html5sortable.min.js           |  1 -
 7 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 .cypress/cypress/plugins/index.js
 create mode 100644 .cypress/cypress/support/index.js

diff --git a/.cypress/cypress/plugins/index.js b/.cypress/cypress/plugins/index.js
new file mode 100644
index 000000000..218e6bfde
--- /dev/null
+++ b/.cypress/cypress/plugins/index.js
@@ -0,0 +1,6 @@
+// jshint esversion: 6
+
+module.exports = (on, config) => {
+      require('@cypress/code-coverage/task')(on, config);
+      return config;
+};
diff --git a/.cypress/cypress/support/index.js b/.cypress/cypress/support/index.js
new file mode 100644
index 000000000..227dd57f0
--- /dev/null
+++ b/.cypress/cypress/support/index.js
@@ -0,0 +1,2 @@
+// jshint esversion: 6
+import '@cypress/code-coverage/support';
diff --git a/.gitignore b/.gitignore
index 7611c256a..a3a1a1b3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,10 @@ _Inline/
 *.pyc
 docker-compose.override.yml
 
+# JS coverage
+/.nyc_output
+/coverage
+
 # International
 /fixmystreet-international
 *[Mm]ake[Mm]y[Ii]sland*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19429b6cb..ba34d428c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
+        - Add option to show front end testing code coverage. #3036
 
 * v3.0.1 (6th May 2020)
     - New features:
diff --git a/bin/browser-tests b/bin/browser-tests
index c7e5df27c..32b844127 100755
--- a/bin/browser-tests
+++ b/bin/browser-tests
@@ -7,7 +7,7 @@ use lib '.'; # For the mock MapIt module
 use Getopt::Long ':config' => qw(pass_through auto_help);
 
 my ($run_server, $run_cypress, $vagrant, $wsl, $node, $config_file);
-my ($cobrand, $coords, $area_id, $name, $mapit_url);
+my ($cobrand, $coords, $area_id, $name, $mapit_url, $coverage);
 
 BEGIN {
     $config_file = 'conf/general.yml-example';
@@ -19,6 +19,7 @@ BEGIN {
     $node = 'C:\Program Files\nodejs\node.exe';
 
     GetOptions(
+        'coverage' => \$coverage,
         'config=s' => \$config_file,
         'server' => \$run_server,
         'cypress' => \$run_cypress,
@@ -38,6 +39,11 @@ BEGIN {
         exit 1;
     }
 
+    if ($coverage && (system('git', 'diff', '--quiet', 'web') >> 8)) {
+        print 'Do not run coverage with changes in web, they will be lost';
+        exit 1;
+    }
+
     if (!$run_server && !$run_cypress) {
         # If asked for neither, run both
         $run_server = $run_cypress = 1;
@@ -75,6 +81,35 @@ if ($vagrant) {
     exit;
 }
 
+BEGIN {
+    # setenv.pl above unloads File:: modules but we need them
+    use File::Path qw(remove_tree);
+}
+
+sub coverage_setup {
+    # Add instrumentation to all JS files under web/
+    if (system('nyc', 'instrument', '--exclude', 'vendor', '--compact', 'false', 'web', 'webO') >> 8) {
+        print 'Could not instrument JS files - are @cypress/code-coverage and nyc installed?';
+        exit 1;
+    }
+
+    # Move the instrumented files on top of the originals
+    while (glob("webO/js/*.js webO/cobrands/*/*.js")) {
+        (my $new = $_) =~ s/webO/web/;
+        rename $_, $new;
+    }
+
+    remove_tree('webO', { safe => 1 }); # Remove anything else left
+}
+
+sub coverage_teardown {
+    remove_tree('.nyc_output', '.cypress/coverage', { safe => 1 }); # Remove old data and incorrect report
+    rename '.cypress/.nyc_output', './.nyc_output'; # Move to top level so nyc can find JS files
+    system('git', 'checkout', 'web'); # Remove instrumented JS files
+    system('nyc', 'report', '--reporter=lcov'); # Generate correct report
+    print "The JS coverage report is at coverage/lcov-report/index.html\n";
+}
+
 sub run {
     my $cmd = shift @ARGV;
     die "Must specify a cypress command\n" unless $cmd || !$run_cypress;
@@ -113,8 +148,12 @@ sub run {
         if ($wsl) {
             @cypress = ('cmd.exe', '/c', $node, $wsl);
         }
-        my $exit = system(@cypress, $cmd, '--config', 'pluginsFile=false,supportFile=false', '--project', '.cypress', @ARGV);
+        my @config = $coverage ? () : ('--config', 'pluginsFile=false,supportFile=false');
+        my $exit = system(@cypress, $cmd, @config, '--project', '.cypress', @ARGV);
         kill 'TERM', $pid if $pid;
+
+        coverage_teardown() if $coverage;
+
         exit $exit >> 8;
     } else {
         # Child, run the server on port 3001
@@ -128,6 +167,7 @@ sub run {
     }
 }
 
+coverage_setup() if $coverage;
 run();
 
 
diff --git a/web/vendor/accessible-autocomplete.min.js b/web/vendor/accessible-autocomplete.min.js
index 9eafe639f..d0780cb77 100644
--- a/web/vendor/accessible-autocomplete.min.js
+++ b/web/vendor/accessible-autocomplete.min.js
@@ -1,2 +1 @@
 !function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.accessibleAutocomplete=t():e.accessibleAutocomplete=t()}(this,function(){return function(e){function t(o){if(n[o])return n[o].exports;var r=n[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,t),r.l=!0,r.exports}var n={};return t.m=e,t.c=n,t.d=function(e,n,o){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:o})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="/",t(t.s=1)}([function(e,t,n){!function(){"use strict";function t(){}function n(e,n){var o,r,l,i,u=T;for(i=arguments.length;i-- >2;)D.push(arguments[i]);for(n&&null!=n.children&&(D.length||D.push(n.children),delete n.children);D.length;)if((r=D.pop())&&void 0!==r.pop)for(i=r.length;i--;)D.push(r[i]);else!0!==r&&!1!==r||(r=null),(l="function"!=typeof e)&&(null==r?r="":"number"==typeof r?r=String(r):"string"!=typeof r&&(l=!1)),l&&o?u[u.length-1]+=r:u===T?u=[r]:u.push(r),o=l;var s=new t;return s.nodeName=e,s.children=u,s.attributes=null==n?void 0:n,s.key=null==n?void 0:n.key,void 0!==A.vnode&&A.vnode(s),s}function o(e,t){for(var n in t)e[n]=t[n];return e}function r(e,t){return n(e.nodeName,o(o({},e.attributes),t),arguments.length>2?[].slice.call(arguments,2):e.children)}function l(e){!e.__d&&(e.__d=!0)&&1==V.push(e)&&(A.debounceRendering||setTimeout)(i)}function i(){var e,t=V;for(V=[];e=t.pop();)e.__d&&N(e)}function u(e,t,n){return"string"==typeof t||"number"==typeof t?void 0!==e.splitText:"string"==typeof t.nodeName?!e._componentConstructor&&s(e,t.nodeName):n||e._componentConstructor===t.nodeName}function s(e,t){return e.__n===t||e.nodeName.toLowerCase()===t.toLowerCase()}function a(e){var t=o({},e.attributes);t.children=e.children;var n=e.nodeName.defaultProps;if(void 0!==n)for(var r in n)void 0===t[r]&&(t[r]=n[r]);return t}function p(e,t){var n=t?document.createElementNS("http://www.w3.org/2000/svg",e):document.createElement(e);return n.__n=e,n}function c(e){e.parentNode&&e.parentNode.removeChild(e)}function d(e,t,n,o,r){if("className"===t&&(t="class"),"key"===t);else if("ref"===t)n&&n(null),o&&o(e);else if("class"!==t||r)if("style"===t){if(o&&"string"!=typeof o&&"string"!=typeof n||(e.style.cssText=o||""),o&&"object"==typeof o){if("string"!=typeof n)for(var l in n)l in o||(e.style[l]="");for(var l in o)e.style[l]="number"==typeof o[l]&&!1===L.test(l)?o[l]+"px":o[l]}}else if("dangerouslySetInnerHTML"===t)o&&(e.innerHTML=o.__html||"");else if("o"==t[0]&&"n"==t[1]){var i=t!==(t=t.replace(/Capture$/,""));t=t.toLowerCase().substring(2),o?n||e.addEventListener(t,h,i):e.removeEventListener(t,h,i),(e.__l||(e.__l={}))[t]=o}else if("list"!==t&&"type"!==t&&!r&&t in e)f(e,t,null==o?"":o),null!=o&&!1!==o||e.removeAttribute(t);else{var u=r&&t!==(t=t.replace(/^xlink\:?/,""));null==o||!1===o?u?e.removeAttributeNS("http://www.w3.org/1999/xlink",t.toLowerCase()):e.removeAttribute(t):"function"!=typeof o&&(u?e.setAttributeNS("http://www.w3.org/1999/xlink",t.toLowerCase(),o):e.setAttribute(t,o))}else e.className=o||""}function f(e,t,n){try{e[t]=n}catch(e){}}function h(e){return this.__l[e.type](A.event&&A.event(e)||e)}function m(){for(var e;e=j.pop();)A.afterMount&&A.afterMount(e),e.componentDidMount&&e.componentDidMount()}function _(e,t,n,o,r,l){P++||(q=null!=r&&void 0!==r.ownerSVGElement,B=null!=e&&!("__preactattr_"in e));var i=v(e,t,n,o,l);return r&&i.parentNode!==r&&r.appendChild(i),--P||(B=!1,l||m()),i}function v(e,t,n,o,r){var l=e,i=q;if(null==t&&(t=""),"string"==typeof t)return e&&void 0!==e.splitText&&e.parentNode&&(!e._component||r)?e.nodeValue!=t&&(e.nodeValue=t):(l=document.createTextNode(t),e&&(e.parentNode&&e.parentNode.replaceChild(l,e),b(e,!0))),l.__preactattr_=!0,l;if("function"==typeof t.nodeName)return I(e,t,n,o);if(q="svg"===t.nodeName||"foreignObject"!==t.nodeName&&q,(!e||!s(e,String(t.nodeName)))&&(l=p(String(t.nodeName),q),e)){for(;e.firstChild;)l.appendChild(e.firstChild);e.parentNode&&e.parentNode.replaceChild(l,e),b(e,!0)}var u=l.firstChild,a=l.__preactattr_||(l.__preactattr_={}),c=t.children;return!B&&c&&1===c.length&&"string"==typeof c[0]&&null!=u&&void 0!==u.splitText&&null==u.nextSibling?u.nodeValue!=c[0]&&(u.nodeValue=c[0]):(c&&c.length||null!=u)&&y(l,c,n,o,B||null!=a.dangerouslySetInnerHTML),O(l,t.attributes,a),q=i,l}function y(e,t,n,o,r){var l,i,s,a,p=e.childNodes,d=[],f={},h=0,m=0,_=p.length,y=0,g=t?t.length:0;if(0!==_)for(var O=0;O<_;O++){var w=p[O],C=w.__preactattr_,E=g&&C?w._component?w._component.__k:C.key:null;null!=E?(h++,f[E]=w):(C||(void 0!==w.splitText?!r||w.nodeValue.trim():r))&&(d[y++]=w)}if(0!==g)for(var O=0;O<g;O++){s=t[O],a=null;var E=s.key;if(null!=E)h&&void 0!==f[E]&&(a=f[E],f[E]=void 0,h--);else if(!a&&m<y)for(l=m;l<y;l++)if(void 0!==d[l]&&u(i=d[l],s,r)){a=i,d[l]=void 0,l===y-1&&y--,l===m&&m++;break}(a=v(a,s,n,o))&&a!==e&&(O>=_?e.appendChild(a):a!==p[O]&&(a===p[O+1]?c(p[O]):e.insertBefore(a,p[O]||null)))}if(h)for(var O in f)void 0!==f[O]&&b(f[O],!1);for(;m<=y;)void 0!==(a=d[y--])&&b(a,!1)}function b(e,t){var n=e._component;n?k(n):(null!=e.__preactattr_&&e.__preactattr_.ref&&e.__preactattr_.ref(null),!1!==t&&null!=e.__preactattr_||c(e),g(e))}function g(e){for(e=e.lastChild;e;){var t=e.previousSibling;b(e,!0),e=t}}function O(e,t,n){var o;for(o in n)t&&null!=t[o]||null==n[o]||d(e,o,n[o],n[o]=void 0,q);for(o in t)"children"===o||"innerHTML"===o||o in n&&t[o]===("value"===o||"checked"===o?e[o]:n[o])||d(e,o,n[o],n[o]=t[o],q)}function w(e){var t=e.constructor.name;(U[t]||(U[t]=[])).push(e)}function C(e,t,n){var o,r=U[e.name];if(e.prototype&&e.prototype.render?(o=new e(t,n),M.call(o,t,n)):(o=new M(t,n),o.constructor=e,o.render=E),r)for(var l=r.length;l--;)if(r[l].constructor===e){o.__b=r[l].__b,r.splice(l,1);break}return o}function E(e,t,n){return this.constructor(e,n)}function x(e,t,n,o,r){e.__x||(e.__x=!0,(e.__r=t.ref)&&delete t.ref,(e.__k=t.key)&&delete t.key,!e.base||r?e.componentWillMount&&e.componentWillMount():e.componentWillReceiveProps&&e.componentWillReceiveProps(t,o),o&&o!==e.context&&(e.__c||(e.__c=e.context),e.context=o),e.__p||(e.__p=e.props),e.props=t,e.__x=!1,0!==n&&(1!==n&&!1===A.syncComponentUpdates&&e.base?l(e):N(e,1,r)),e.__r&&e.__r(e))}function N(e,t,n,r){if(!e.__x){var l,i,u,s=e.props,p=e.state,c=e.context,d=e.__p||s,f=e.__s||p,h=e.__c||c,v=e.base,y=e.__b,g=v||y,O=e._component,w=!1;if(v&&(e.props=d,e.state=f,e.context=h,2!==t&&e.shouldComponentUpdate&&!1===e.shouldComponentUpdate(s,p,c)?w=!0:e.componentWillUpdate&&e.componentWillUpdate(s,p,c),e.props=s,e.state=p,e.context=c),e.__p=e.__s=e.__c=e.__b=null,e.__d=!1,!w){l=e.render(s,p,c),e.getChildContext&&(c=o(o({},c),e.getChildContext()));var E,I,M=l&&l.nodeName;if("function"==typeof M){var S=a(l);i=O,i&&i.constructor===M&&S.key==i.__k?x(i,S,1,c,!1):(E=i,e._component=i=C(M,S,c),i.__b=i.__b||y,i.__u=e,x(i,S,0,c,!1),N(i,1,n,!0)),I=i.base}else u=g,E=O,E&&(u=e._component=null),(g||1===t)&&(u&&(u._component=null),I=_(u,l,c,n||!v,g&&g.parentNode,!0));if(g&&I!==g&&i!==O){var D=g.parentNode;D&&I!==D&&(D.replaceChild(I,g),E||(g._component=null,b(g,!1)))}if(E&&k(E),e.base=I,I&&!r){for(var T=e,L=e;L=L.__u;)(T=L).base=I;I._component=T,I._componentConstructor=T.constructor}}if(!v||n?j.unshift(e):w||(m(),e.componentDidUpdate&&e.componentDidUpdate(d,f,h),A.afterUpdate&&A.afterUpdate(e)),null!=e.__h)for(;e.__h.length;)e.__h.pop().call(e);P||r||m()}}function I(e,t,n,o){for(var r=e&&e._component,l=r,i=e,u=r&&e._componentConstructor===t.nodeName,s=u,p=a(t);r&&!s&&(r=r.__u);)s=r.constructor===t.nodeName;return r&&s&&(!o||r._component)?(x(r,p,3,n,o),e=r.base):(l&&!u&&(k(l),e=i=null),r=C(t.nodeName,p,n),e&&!r.__b&&(r.__b=e,i=null),x(r,p,1,n,o),e=r.base,i&&e!==i&&(i._component=null,b(i,!1))),e}function k(e){A.beforeUnmount&&A.beforeUnmount(e);var t=e.base;e.__x=!0,e.componentWillUnmount&&e.componentWillUnmount(),e.base=null;var n=e._component;n?k(n):t&&(t.__preactattr_&&t.__preactattr_.ref&&t.__preactattr_.ref(null),e.__b=t,c(t),w(e),g(t)),e.__r&&e.__r(null)}function M(e,t){this.__d=!0,this.context=t,this.props=e,this.state=this.state||{}}function S(e,t,n){return _(n,e,{},!1,t,!1)}var A={},D=[],T=[],L=/acit|ex(?:s|g|n|p|$)|rph|ows|mnc|ntw|ine[ch]|zoo|^ord/i,V=[],j=[],P=0,q=!1,B=!1,U={};o(M.prototype,{setState:function(e,t){var n=this.state;this.__s||(this.__s=o({},n)),o(n,"function"==typeof e?e(n,this.props):e),t&&(this.__h=this.__h||[]).push(t),l(this)},forceUpdate:function(e){e&&(this.__h=this.__h||[]).push(e),N(this,2)},render:function(){}});var R={h:n,createElement:n,cloneElement:r,Component:M,render:S,rerender:i,options:A};e.exports=R}()},function(e,t,n){e.exports=n(2)},function(e,t,n){"use strict";function o(e){if(!e.element)throw new Error("element is not defined");if(!e.id)throw new Error("id is not defined");if(!e.source)throw new Error("source is not defined");Array.isArray(e.source)&&(e.source=s(e.source)),(0,l.render)((0,l.createElement)(u.default,e),e.element)}var r=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},l=n(0),i=n(3),u=function(e){return e&&e.__esModule?e:{default:e}}(i),s=function(e){return function(t,n){n(e.filter(function(e){return-1!==e.toLowerCase().indexOf(t.toLowerCase())}))}};o.enhanceSelectElement=function(e){if(!e.selectElement)throw new Error("selectElement is not defined");if(!e.source){var t=[].filter.call(e.selectElement.options,function(t){return t.value||e.preserveNullOptions});e.source=t.map(function(e){return e.textContent||e.innerText})}if(e.onConfirm=e.onConfirm||function(t){var n=[].filter.call(e.selectElement.options,function(e){return(e.textContent||e.innerText)===t})[0];n&&(n.selected=!0)},e.selectElement.value||void 0===e.defaultValue){var n=e.selectElement.options[e.selectElement.options.selectedIndex];e.defaultValue=n.textContent||n.innerText}void 0===e.name&&(e.name=""),void 0===e.id&&(void 0===e.selectElement.id?e.id="":e.id=e.selectElement.id),void 0===e.autoselect&&(e.autoselect=!0);var l=document.createElement("span");e.selectElement.parentNode.insertBefore(l,e.selectElement),o(r({},e,{element:l})),e.selectElement.style.display="none",e.selectElement.id=e.selectElement.id+"-select"},e.exports=o},function(e,t,n){"use strict";function o(e){return e&&e.__esModule?e:{default:e}}function r(e,t){}function l(e,t){if(e)return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){"function"!=typeof t&&null!==t||(e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t))}function u(){return!(!navigator.userAgent.match(/(iPod|iPhone|iPad)/g)||!navigator.userAgent.match(/AppleWebKit/g))}function s(e){return e>47&&e<58||32===e||8===e||e>64&&e<91||e>95&&e<112||e>185&&e<193||e>218&&e<223}function a(e){return y?{onInput:e}:b?{onChange:e}:void 0}t.__esModule=!0,t.default=void 0;var p,c,d=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},f=n(0),h=n(4),m=o(h),_=n(5),v=o(_),y=!0,b=!1,g={13:"enter",27:"escape",32:"space",38:"up",40:"down"},O=function(){var e=document.createElement("x");return e.style.cssText="pointer-events:auto","auto"===e.style.pointerEvents}(),w=(c=p=function(e){function t(n){r(this,t);var o=l(this,e.call(this,n));return o.elementReferences={},o.state={focused:null,hovered:null,menuOpen:!1,options:n.defaultValue?[n.defaultValue]:[],query:n.defaultValue,selected:null},o.handleComponentBlur=o.handleComponentBlur.bind(o),o.handleKeyDown=o.handleKeyDown.bind(o),o.handleUpArrow=o.handleUpArrow.bind(o),o.handleDownArrow=o.handleDownArrow.bind(o),o.handleEnter=o.handleEnter.bind(o),o.handlePrintableKey=o.handlePrintableKey.bind(o),o.handleOptionBlur=o.handleOptionBlur.bind(o),o.handleOptionClick=o.handleOptionClick.bind(o),o.handleOptionFocus=o.handleOptionFocus.bind(o),o.handleOptionMouseDown=o.handleOptionMouseDown.bind(o),o.handleOptionMouseEnter=o.handleOptionMouseEnter.bind(o),o.handleOptionMouseOut=o.handleOptionMouseOut.bind(o),o.handleOptionTouchEnd=o.handleOptionTouchEnd.bind(o),o.handleInputBlur=o.handleInputBlur.bind(o),o.handleInputChange=o.handleInputChange.bind(o),o.handleInputFocus=o.handleInputFocus.bind(o),o.pollInputElement=o.pollInputElement.bind(o),o.getDirectInputChanges=o.getDirectInputChanges.bind(o),o}return i(t,e),t.prototype.componentDidMount=function(){this.pollInputElement()},t.prototype.componentWillUnmount=function(){clearTimeout(this.$pollInput)},t.prototype.pollInputElement=function(){var e=this;this.getDirectInputChanges(),this.$pollInput=setTimeout(function(){e.pollInputElement()},100)},t.prototype.getDirectInputChanges=function(){var e=this.elementReferences[-1];e.value!==this.state.query&&this.handleInputChange({target:{value:e.value}})},t.prototype.componentDidUpdate=function(e,t){var n=this.state.focused,o=null===n,r=t.focused!==n;r&&!o&&this.elementReferences[n].focus();var l=-1===n,i=r&&null===t.focused;if(l&&i){var u=this.elementReferences[n];u.setSelectionRange(0,u.value.length)}},t.prototype.hasAutoselect=function(){return!u()&&this.props.autoselect},t.prototype.templateInputValue=function(e){var t=this.props.templates&&this.props.templates.inputValue;return t?t(e):e},t.prototype.templateSuggestion=function(e){var t=this.props.templates&&this.props.templates.suggestion;return t?t(e):e},t.prototype.handleComponentBlur=function(e){var t=this.state,n=t.options,o=t.query,r=t.selected,l=void 0;this.props.confirmOnBlur?(l=e.query||o,this.props.onConfirm(n[r])):l=o,this.setState({focused:null,menuOpen:e.menuOpen||!1,query:l,selected:null})},t.prototype.handleOptionBlur=function(e,t){var n=this.state,o=n.focused,r=n.menuOpen,l=n.options,i=n.selected,s=null===e.relatedTarget,a=e.relatedTarget===this.elementReferences[-1],p=o!==t&&-1!==o;if(s||!p&&!a){var c=r&&u();this.handleComponentBlur({menuOpen:c,query:this.templateInputValue(l[i])})}},t.prototype.handleInputBlur=function(e){var t=this.state,n=t.focused,o=t.menuOpen,r=t.options,l=t.query,i=t.selected;if(-1===n){var s=o&&u(),a=u()?l:this.templateInputValue(r[i]);this.handleComponentBlur({menuOpen:s,query:a})}},t.prototype.handleInputChange=function(e){var t=this,n=this.props,o=n.minLength,r=n.source,l=n.showAllValues,i=this.hasAutoselect(),u=e.target.value,s=0===u.length,a=this.state.query.length!==u.length,p=u.length>=o;this.setState({query:u}),l||!s&&a&&p?r(u,function(e){var n=e.length>0;t.setState({menuOpen:n,options:e,selected:i&&n?0:-1})}):!s&&p||this.setState({menuOpen:!1,options:[]})},t.prototype.handleInputClick=function(e){this.handleInputChange(e)},t.prototype.handleInputFocus=function(e){this.setState({focused:-1})},t.prototype.handleOptionFocus=function(e){this.setState({focused:e,hovered:null,selected:e})},t.prototype.handleOptionMouseEnter=function(e,t){this.setState({hovered:t})},t.prototype.handleOptionMouseOut=function(e,t){this.setState({hovered:null})},t.prototype.handleOptionTouchEnd=function(e,t){this.handleOptionClick(e,t)},t.prototype.handleOptionClick=function(e,t){var n=this.state.options[t],o=this.templateInputValue(n);this.props.onConfirm(n),this.setState({focused:-1,menuOpen:!1,query:o,selected:-1})},t.prototype.handleOptionMouseDown=function(e){e.preventDefault()},t.prototype.handleUpArrow=function(e){e.preventDefault();var t=this.state,n=t.menuOpen,o=t.selected;-1!==o&&n&&this.handleOptionFocus(o-1)},t.prototype.handleDownArrow=function(e){var t=this;if(e.preventDefault(),this.props.showAllValues&&!1===this.state.menuOpen)e.preventDefault(),this.props.source("",function(e){t.setState({menuOpen:!0,options:e,selected:0,focused:0,hovered:null})});else if(!0===this.state.menuOpen){var n=this.state,o=n.menuOpen,r=n.options,l=n.selected,i=l!==r.length-1,u=i&&o;u&&this.handleOptionFocus(l+1)}},t.prototype.handleSpace=function(e){var t=this;this.props.showAllValues&&!1===this.state.menuOpen&&(e.preventDefault(),this.props.source("",function(e){t.setState({menuOpen:!0,options:e})}))},t.prototype.handleEnter=function(e){this.state.menuOpen&&(e.preventDefault(),this.state.selected>=0&&this.handleOptionClick(e,this.state.selected))},t.prototype.handlePrintableKey=function(e){var t=this.elementReferences[-1];e.target===t||t.focus()},t.prototype.handleKeyDown=function(e){switch(g[e.keyCode]){case"up":this.handleUpArrow(e);break;case"down":this.handleDownArrow(e);break;case"space":this.handleSpace(e);break;case"enter":this.handleEnter(e);break;case"escape":this.handleComponentBlur({query:this.state.query});break;default:s(e.keyCode)&&this.handlePrintableKey(e)}},t.prototype.render=function(){var e=this,t=this.props,n=t.cssNamespace,o=t.displayMenu,r=t.id,l=t.minLength,i=t.name,u=t.placeholder,s=t.required,p=t.showAllValues,c=this.state,h=c.focused,_=c.hovered,y=c.menuOpen,b=c.options,g=c.query,w=c.selected,C=this.hasAutoselect(),E=-1===h,x=0===b.length,N=0!==g.length,I=g.length>=l,k=this.props.showNoOptionsFound&&E&&x&&N&&I,M=n+"__wrapper",S=n+"__input",A=null!==h,D=A?" "+S+"--focused":"",T=this.props.showAllValues?" "+S+"--show-all-values":" "+S+"--default",L=n+"__dropdown-arrow-down",V=-1!==h&&null!==h,j=n+"__menu",P=j+"--"+o,q=y||k,B=j+"--"+(q?"visible":"hidden"),U=n+"__option",R=n+"__hint",F=this.templateInputValue(b[w]),W=F&&0===F.toLowerCase().indexOf(g.toLowerCase()),K=W&&C?g+F.substr(g.length):"",H=O&&K;return(0,f.createElement)("div",{className:M,onKeyDown:this.handleKeyDown},(0,f.createElement)(m.default,{length:b.length,queryLength:g.length,minQueryLength:l,selectedOption:this.templateInputValue(b[w])}),H&&(0,f.createElement)("span",null,(0,f.createElement)("input",{className:R,readonly:!0,tabIndex:"-1",value:K})),(0,f.createElement)("input",d({"aria-activedescendant":!!V&&r+"__option--"+h,"aria-expanded":y,"aria-owns":r+"__listbox",autoComplete:"off",className:""+S+D+T,id:r,onClick:function(t){return e.handleInputClick(t)},onBlur:this.handleInputBlur},a(this.handleInputChange),{onFocus:this.handleInputFocus,name:i,placeholder:u,ref:function(t){e.elementReferences[-1]=t},role:"combobox",type:"text",required:s,value:g})),p&&(0,f.createElement)(v.default,{className:L}),(0,f.createElement)("ul",{className:j+" "+P+" "+B,id:r+"__listbox",role:"listbox"},b.map(function(t,n){var o=-1===h?w===n:h===n,l=o&&null===_?" "+U+"--focused":"",i=n%2?" "+U+"--odd":"";return(0,f.createElement)("li",{"aria-selected":h===n,className:""+U+l+i,dangerouslySetInnerHTML:{__html:e.templateSuggestion(t)},id:r+"__option--"+n,key:n,onBlur:function(t){return e.handleOptionBlur(t,n)},onClick:function(t){return e.handleOptionClick(t,n)},onMouseDown:e.handleOptionMouseDown,onMouseEnter:function(t){return e.handleOptionMouseEnter(t,n)},onMouseOut:function(t){return e.handleOptionMouseOut(t,n)},onTouchEnd:function(t){return e.handleOptionTouchEnd(t,n)},ref:function(t){e.elementReferences[n]=t},role:"option",tabIndex:"-1"})}),k&&(0,f.createElement)("li",{className:U+" "+U+"--no-results"},"No results found")))},t}(f.Component),p.defaultProps={autoselect:!1,cssNamespace:"autocomplete",defaultValue:"",displayMenu:"inline",minLength:0,name:"input-autocomplete",placeholder:"",onConfirm:function(){},confirmOnBlur:!0,showNoOptionsFound:!0,showAllValues:!1,required:!1},c);t.default=w},function(e,t,n){"use strict";function o(e,t){}function r(e,t){if(e)return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function l(e,t){"function"!=typeof t&&null!==t||(e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t))}t.__esModule=!0,t.default=void 0;var i=n(0),u=function(e){function t(){var n,l,i;o(this,t);for(var u=arguments.length,s=Array(u),a=0;a<u;a++)s[a]=arguments[a];return n=l=r(this,e.call.apply(e,[this].concat(s))),l.state={bump:!1},i=n,r(l,i)}return l(t,e),t.prototype.componentWillReceiveProps=function(e){e.queryLength!==this.props.queryLength&&this.setState(function(e){return{bump:!e.bump}})},t.prototype.render=function(){var e=this.props,t=e.length,n=e.queryLength,o=e.minQueryLength,r=e.selectedOption,l=this.state.bump,u={result:1===t?"result":"results",is:1===t?"is":"are"},s=n<o,a=0===t,p=r?(0,i.createElement)("span",null,r," (1 of ",t,") is selected."):null,c=null;return c=s?(0,i.createElement)("span",null,"Type in ",o," or more characters for results."):a?(0,i.createElement)("span",null,"No search results."):(0,i.createElement)("span",null,t," ",u.result," ",u.is," available. ",p),(0,i.createElement)("div",{"aria-atomic":"true","aria-live":"polite",role:"status",style:{border:"0",clip:"rect(0 0 0 0)",height:"1px",marginBottom:"-1px",marginRight:"-1px",overflow:"hidden",padding:"0",position:"absolute",whiteSpace:"nowrap",width:"1px"}},c,(0,i.createElement)("span",null,l?",":",,"))},t}(i.Component);t.default=u},function(e,t,n){"use strict";function o(e,t){}function r(e,t){if(e)return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function l(e,t){"function"!=typeof t&&null!==t||(e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t))}t.__esModule=!0,t.default=void 0;var i=n(0),u=function(e){function t(){return o(this,t),r(this,e.apply(this,arguments))}return l(t,e),t.prototype.render=function(){return(0,i.createElement)("svg",{version:"1.1",xmlns:"http://www.w3.org/2000/svg",className:this.props.className},(0,i.createElement)("g",{stroke:"none",fill:"none","fill-rule":"evenodd"},(0,i.createElement)("polygon",{fill:"#000000",points:"0 0 22 0 11 17"})))},t}(i.Component);t.default=u}])});
-//# sourceMappingURL=accessible-autocomplete.min.js.map
\ No newline at end of file
diff --git a/web/vendor/html5sortable.min.js b/web/vendor/html5sortable.min.js
index 3a7241283..77bfdee9d 100755
--- a/web/vendor/html5sortable.min.js
+++ b/web/vendor/html5sortable.min.js
@@ -1,2 +1 @@
 var sortable=function(){"use strict";function c(e,t,n){if(void 0===n)return e&&e.h5s&&e.h5s.data&&e.h5s.data[t];e.h5s=e.h5s||{},e.h5s.data=e.h5s.data||{},e.h5s.data[t]=n}var d=function(e,t){if(!(e instanceof NodeList||e instanceof HTMLCollection||e instanceof Array))throw new Error("You must provide a nodeList/HTMLCollection/Array of elements to be filtered.");return"string"!=typeof t?Array.from(e):Array.from(e).filter(function(e){return 1===e.nodeType&&e.matches(t)})},u=new Map,t=function(){function e(){this._config=new Map,this._placeholder=void 0,this._data=new Map}return Object.defineProperty(e.prototype,"config",{get:function(){var n={};return this._config.forEach(function(e,t){n[t]=e}),n},set:function(e){if("object"!=typeof e)throw new Error("You must provide a valid configuration object to the config setter.");var t=Object.assign({},e);this._config=new Map(Object.entries(t))},enumerable:!0,configurable:!0}),e.prototype.setConfig=function(e,t){if(!this._config.has(e))throw new Error("Trying to set invalid configuration item: "+e);this._config.set(e,t)},e.prototype.getConfig=function(e){if(!this._config.has(e))throw new Error("Invalid configuration item requested: "+e);return this._config.get(e)},Object.defineProperty(e.prototype,"placeholder",{get:function(){return this._placeholder},set:function(e){if(!(e instanceof HTMLElement)&&null!==e)throw new Error("A placeholder must be an html element or null.");this._placeholder=e},enumerable:!0,configurable:!0}),e.prototype.setData=function(e,t){if("string"!=typeof e)throw new Error("The key must be a string.");this._data.set(e,t)},e.prototype.getData=function(e){if("string"!=typeof e)throw new Error("The key must be a string.");return this._data.get(e)},e.prototype.deleteData=function(e){if("string"!=typeof e)throw new Error("The key must be a string.");return this._data.delete(e)},e}(),p=function(e){if(!(e instanceof HTMLElement))throw new Error("Please provide a sortable to the store function.");return u.has(e)||u.set(e,new t),u.get(e)};function a(e,t,n){if(e instanceof Array)for(var r=0;r<e.length;++r)a(e[r],t,n);else e.addEventListener(t,n),p(e).setData("event"+t,n)}function i(e,t){if(e instanceof Array)for(var n=0;n<e.length;++n)i(e[n],t);else e.removeEventListener(t,p(e).getData("event"+t)),p(e).deleteData("event"+t)}function l(e,t,n){if(e instanceof Array)for(var r=0;r<e.length;++r)l(e[r],t,n);else e.setAttribute(t,n)}function r(e,t){if(e instanceof Array)for(var n=0;n<e.length;++n)r(e[n],t);else e.removeAttribute(t)}var m=function(e){if(!e.parentElement||0===e.getClientRects().length)throw new Error("target element must be part of the dom");var t=e.getClientRects()[0];return{left:t.left+window.pageXOffset,right:t.right+window.pageXOffset,top:t.top+window.pageYOffset,bottom:t.bottom+window.pageYOffset}},h=function(n,r){var o;return void 0===r&&(r=0),function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];clearTimeout(o),o=setTimeout(function(){n.apply(void 0,e)},r)}},g=function(e,t){if(!(e instanceof HTMLElement&&(t instanceof NodeList||t instanceof HTMLCollection||t instanceof Array)))throw new Error("You must provide an element and a list of elements.");return Array.from(t).indexOf(e)},v=function(e){if(!(e instanceof HTMLElement))throw new Error("Element is not a node element.");return null!==e.parentNode},n=function(e,t,n){if(!(e instanceof HTMLElement&&e.parentElement instanceof HTMLElement))throw new Error("target and element must be a node");e.parentElement.insertBefore(t,"before"===n?e:e.nextElementSibling)},y=function(e,t){return n(e,t,"before")},E=function(e,t){return n(e,t,"after")},o=function(t,n,e){if(void 0===n&&(n=function(e,t){return e}),void 0===e&&(e=function(e){return e}),!(t instanceof HTMLElement)||!0==!t.isSortable)throw new Error("You need to provide a sortableContainer to be serialized.");if("function"!=typeof n||"function"!=typeof e)throw new Error("You need to provide a valid serializer for items and the container.");var r=c(t,"opts").items,o=d(t.children,r),i=o.map(function(e){return{parent:t,node:e,html:e.outerHTML,index:g(e,o)}});return{container:e({node:t,itemCount:i.length}),items:i.map(function(e){return n(e,t)})}},w=function(e,t,n){var r;if(void 0===n&&(n="sortable-placeholder"),!(e instanceof HTMLElement))throw new Error("You must provide a valid element as a sortable.");if(!(t instanceof HTMLElement)&&void 0!==t)throw new Error("You must provide a valid element as a placeholder or set ot to undefined.");return void 0===t&&(["UL","OL"].includes(e.tagName)?t=document.createElement("li"):["TABLE","TBODY"].includes(e.tagName)?(t=document.createElement("tr")).innerHTML='<td colspan="100"></td>':t=document.createElement("div")),"string"==typeof n&&(r=t.classList).add.apply(r,n.split(" ")),t},b=function(e){if(!(e instanceof HTMLElement))throw new Error("You must provide a valid dom element");var n=window.getComputedStyle(e);return["height","padding-top","padding-bottom"].map(function(e){var t=parseInt(n.getPropertyValue(e),10);return isNaN(t)?0:t}).reduce(function(e,t){return e+t})},s=function(e,t){if(!(e instanceof Array))throw new Error("You must provide a Array of HTMLElements to be filtered.");return"string"!=typeof t?e:e.filter(function(e){return e.querySelector(t)instanceof HTMLElement||e.shadowRoot&&e.shadowRoot.querySelector(t)instanceof HTMLElement}).map(function(e){return e.querySelector(t)||e.shadowRoot&&e.shadowRoot.querySelector(t)})},T=function(e){return e.composedPath&&e.composedPath()[0]||e.target},f=function(e,t,n){return{element:e,posX:n.pageX-t.left,posY:n.pageY-t.top}},L=function(e,t,n){if(!(e instanceof Event))throw new Error("setDragImage requires a DragEvent as the first argument.");if(!(t instanceof HTMLElement))throw new Error("setDragImage requires the dragged element as the second argument.");if(n||(n=f),e.dataTransfer&&e.dataTransfer.setDragImage){var r=n(t,m(t),e);if(!(r.element instanceof HTMLElement)||"number"!=typeof r.posX||"number"!=typeof r.posY)throw new Error("The customDragImage function you provided must return and object with the properties element[string], posX[integer], posY[integer].");e.dataTransfer.effectAllowed="copyMove",e.dataTransfer.setData("text/plain",T(e).id),e.dataTransfer.setDragImage(r.element,r.posX,r.posY)}},C=function(e,t){if(!0===e.isSortable){var n=p(e).getConfig("acceptFrom");if(null!==n&&!1!==n&&"string"!=typeof n)throw new Error('HTML5Sortable: Wrong argument, "acceptFrom" must be "null", "false", or a valid selector string.');if(null!==n)return!1!==n&&0<n.split(",").filter(function(e){return 0<e.length&&t.matches(e)}).length;if(e===t)return!0;if(void 0!==p(e).getConfig("connectWith")&&null!==p(e).getConfig("connectWith"))return p(e).getConfig("connectWith")===p(t).getConfig("connectWith")}return!1},M={items:null,connectWith:null,disableIEFix:null,acceptFrom:null,copy:!1,placeholder:null,placeholderClass:"sortable-placeholder",draggingClass:"sortable-dragging",hoverClass:!1,debounce:0,throttleTime:100,maxItems:0,itemSerializer:void 0,containerSerializer:void 0,customDragImage:null};var D,x,H,A,I,S,_,Y,O=function(e,t){if("string"==typeof p(e).getConfig("hoverClass")){var o=p(e).getConfig("hoverClass").split(" ");!0===t?(a(e,"mousemove",function(r,o){var i=this;if(void 0===o&&(o=250),"function"!=typeof r)throw new Error("You must provide a function as the first argument for throttle.");if("number"!=typeof o)throw new Error("You must provide a number as the second argument for throttle.");var a=null;return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=Date.now();(null===a||o<=n-a)&&(a=n,r.apply(i,e))}}(function(r){0===r.buttons&&d(e.children,p(e).getConfig("items")).forEach(function(e){var t,n;e!==r.target?(t=e.classList).remove.apply(t,o):(n=e.classList).add.apply(n,o)})},p(e).getConfig("throttleTime"))),a(e,"mouseleave",function(){d(e.children,p(e).getConfig("items")).forEach(function(e){var t;(t=e.classList).remove.apply(t,o)})})):(i(e,"mousemove"),i(e,"mouseleave"))}},P=function(e){i(e,"dragstart"),i(e,"dragend"),i(e,"dragover"),i(e,"dragenter"),i(e,"drop"),i(e,"mouseenter"),i(e,"mouseleave")},W=function(e,t){var n=e;return!0===p(t).getConfig("copy")&&(l(n=e.cloneNode(!0),"aria-copied","true"),e.parentElement.appendChild(n),n.style.display="none",n.oldDisplay=e.style.display),n},F=function(e){var t;(t=e).h5s&&delete t.h5s.data,r(e,"aria-dropeffect")},N=function(e){r(e,"aria-grabbed"),r(e,"aria-copied"),r(e,"draggable"),r(e,"role")};function j(e,t){if(t.composedPath)return t.composedPath().find(function(e){return e.isSortable});for(;!0!==e.isSortable;)e=e.parentElement;return e}function q(e,t){var n=c(e,"opts"),r=d(e.children,n.items).filter(function(e){return e.contains(t)||e.shadowRoot&&e.shadowRoot.contains(t)});return 0<r.length?r[0]:t}var z=function(e){var t=c(e,"opts"),n=d(e.children,t.items),r=s(n,t.handle);(l(e,"aria-dropeffect","move"),c(e,"_disabled","false"),l(r,"draggable","true"),!1===t.disableIEFix)&&("function"==typeof(document||window.document).createElement("span").dragDrop&&a(r,"mousedown",function(){if(-1!==n.indexOf(this))this.dragDrop();else{for(var e=this.parentElement;-1===n.indexOf(e);)e=e.parentElement;e.dragDrop()}}))},R=function(e){var t=c(e,"opts"),n=d(e.children,t.items),r=s(n,t.handle);c(e,"_disabled","false"),P(n),i(r,"mousedown"),i(e,"dragover"),i(e,"dragenter"),i(e,"drop")};function X(e,f){var i=String(f);return f=f||{},"string"==typeof e&&(e=document.querySelectorAll(e)),e instanceof HTMLElement&&(e=[e]),e=Array.prototype.slice.call(e),/serialize/.test(i)?e.map(function(e){var t=c(e,"opts");return o(e,t.itemSerializer,t.containerSerializer)}):(e.forEach(function(s){if(/enable|disable|destroy/.test(i))return X[i](s);["connectWith","disableIEFix"].forEach(function(e){f.hasOwnProperty(e)&&null!==f[e]&&console.warn('HTML5Sortable: You are using the deprecated configuration "'+e+'". This will be removed in an upcoming version, make sure to migrate to the new options when updating.')}),f=Object.assign({},M,p(s).config,f),p(s).config=f,c(s,"opts",f),s.isSortable=!0,R(s);var e,t=d(s.children,f.items);if(null!==f.placeholder&&void 0!==f.placeholder){var n=document.createElement(s.tagName);f.placeholder instanceof HTMLElement?n.appendChild(f.placeholder):n.innerHTML=f.placeholder,e=n.children[0]}p(s).placeholder=w(s,e,f.placeholderClass),c(s,"items",f.items),f.acceptFrom?c(s,"acceptFrom",f.acceptFrom):f.connectWith&&c(s,"connectWith",f.connectWith),z(s),l(t,"role","option"),l(t,"aria-grabbed","false"),O(s,!0),a(s,"dragstart",function(e){var t=T(e);if(!0!==t.isSortable&&(e.stopImmediatePropagation(),(!f.handle||t.matches(f.handle))&&"false"!==t.getAttribute("draggable"))){var n=j(t,e),r=q(n,t);S=d(n.children,f.items),A=S.indexOf(r),I=g(r,n.children),H=n,L(e,r,f.customDragImage),x=b(r),r.classList.add(f.draggingClass),l(D=W(r,n),"aria-grabbed","true"),n.dispatchEvent(new CustomEvent("sortstart",{detail:{origin:{elementIndex:I,index:A,container:H},item:D,originalTarget:t}}))}}),a(s,"dragenter",function(e){var t=T(e),n=j(t,e);n&&n!==_&&(Y=d(n.children,c(n,"items")).filter(function(e){return e!==p(s).placeholder}),n.dispatchEvent(new CustomEvent("sortenter",{detail:{origin:{elementIndex:I,index:A,container:H},destination:{container:n,itemsBeforeUpdate:Y},item:D,originalTarget:t}}))),_=n}),a(s,"dragend",function(e){if(D){D.classList.remove(f.draggingClass),l(D,"aria-grabbed","false"),"true"===D.getAttribute("aria-copied")&&"true"!==c(D,"dropped")&&D.remove(),D.style.display=D.oldDisplay,delete D.oldDisplay;var t=Array.from(u.values()).map(function(e){return e.placeholder}).filter(function(e){return e instanceof HTMLElement}).filter(v)[0];t&&t.remove(),s.dispatchEvent(new CustomEvent("sortstop",{detail:{origin:{elementIndex:I,index:A,container:H},item:D}})),x=D=_=null}}),a(s,"drop",function(e){if(C(s,D.parentElement)){e.preventDefault(),e.stopPropagation(),c(D,"dropped","true");var t=Array.from(u.values()).map(function(e){return e.placeholder}).filter(function(e){return e instanceof HTMLElement}).filter(v)[0];E(t,D),t.remove(),s.dispatchEvent(new CustomEvent("sortstop",{detail:{origin:{elementIndex:I,index:A,container:H},item:D}}));var n=p(s).placeholder,r=d(H.children,f.items).filter(function(e){return e!==n}),o=!0===this.isSortable?this:this.parentElement,i=d(o.children,c(o,"items")).filter(function(e){return e!==n}),a=g(D,Array.from(D.parentElement.children).filter(function(e){return e!==n})),l=g(D,i);I===a&&H===o||s.dispatchEvent(new CustomEvent("sortupdate",{detail:{origin:{elementIndex:I,index:A,container:H,itemsBeforeUpdate:S,items:r},destination:{index:l,elementIndex:a,container:o,itemsBeforeUpdate:Y,items:i},item:D}}))}});var o=h(function(t,e,n){if(D)if(f.forcePlaceholderSize&&(p(t).placeholder.style.height=x+"px"),-1<Array.from(t.children).indexOf(e)){var r=b(e),o=g(p(t).placeholder,e.parentElement.children),i=g(e,e.parentElement.children);if(x<r){var a=r-x,l=m(e).top;if(o<i&&n<l)return;if(i<o&&l+r-a<n)return}void 0===D.oldDisplay&&(D.oldDisplay=D.style.display),"none"!==D.style.display&&(D.style.display="none");var s=!1;try{s=m(e).top+e.offsetHeight/2<=n}catch(e){s=o<i}s?E(e,p(t).placeholder):y(e,p(t).placeholder),Array.from(u.values()).filter(function(e){return void 0!==e.placeholder}).forEach(function(e){e.placeholder!==p(t).placeholder&&e.placeholder.remove()})}else{var c=Array.from(u.values()).filter(function(e){return void 0!==e.placeholder}).map(function(e){return e.placeholder});-1!==c.indexOf(e)||t!==e||d(e.children,f.items).length||(c.forEach(function(e){return e.remove()}),e.appendChild(p(t).placeholder))}},f.debounce),r=function(e){var t=e.target,n=!0===t.isSortable?t:j(t,e);if(t=q(n,t),D&&C(n,D.parentElement)&&"true"!==c(n,"_disabled")){var r=c(n,"opts");parseInt(r.maxItems)&&d(n.children,c(n,"items")).length>=parseInt(r.maxItems)&&D.parentElement!==n||(e.preventDefault(),e.stopPropagation(),e.dataTransfer.dropEffect=!0===p(n).getConfig("copy")?"copy":"move",o(n,t,e.pageY))}};a(t.concat(s),"dragover",r),a(t.concat(s),"dragenter",r)}),e)}return X.destroy=function(e){var t,n,r,o;n=c(t=e,"opts")||{},r=d(t.children,n.items),o=s(r,n.handle),i(t,"dragover"),i(t,"dragenter"),i(t,"drop"),F(t),i(o,"mousedown"),P(r),N(r)},X.enable=function(e){z(e)},X.disable=function(e){var t,n,r,o;n=c(t=e,"opts"),r=d(t.children,n.items),o=s(r,n.handle),l(t,"aria-dropeffect","none"),c(t,"_disabled","true"),l(o,"draggable","false"),i(o,"mousedown")},X.__testing={_data:c,_removeItemEvents:P,_removeItemData:N,_removeSortableData:F},X}();
-//# sourceMappingURL=html5sortable.min.js.map
-- 
cgit v1.2.3


From 36bdf3a8c6ce406d23453b9bb840cf94ca57a820 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 18 May 2020 12:44:26 +0100
Subject: [Borsetshire] Add front end tests.

---
 .cypress/cypress/integration/borsetshire.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .cypress/cypress/integration/borsetshire.js

diff --git a/.cypress/cypress/integration/borsetshire.js b/.cypress/cypress/integration/borsetshire.js
new file mode 100644
index 000000000..c2a2710fb
--- /dev/null
+++ b/.cypress/cypress/integration/borsetshire.js
@@ -0,0 +1,21 @@
+it('loads the right front page', function() {
+    cy.visit('http://borsetshire.localhost:3001/');
+    cy.contains('Borsetshire');
+});
+
+it('logs in without fuss', function() {
+    cy.contains('Sign in').click();
+    cy.contains('Customer service').click();
+    cy.url().should('include', '/reports');
+
+    cy.visit('http://borsetshire.localhost:3001/auth');
+    cy.contains('Inspector').click();
+    cy.url().should('include', '/my/planned');
+
+    cy.visit('http://borsetshire.localhost:3001/auth');
+    cy.get('[name=username]').type('super@example.org');
+    cy.contains('Sign in with a password').click();
+    cy.get('[name=password_sign_in]').type('password');
+    cy.get('[name=sign_in_by_password]').last().click();
+    cy.url().should('include', '/admin');
+});
-- 
cgit v1.2.3


From 38dce48b716c3f6fc1561b976d98eee94af778b3 Mon Sep 17 00:00:00 2001
From: Sam Pearson <sam@sgp.me.uk>
Date: Thu, 14 May 2020 10:18:16 +0100
Subject: Include updates in failure summary report.

This includes details of any failing updates in the summary script.
---
 bin/send-failure-summary                     | 25 +++++++++++++++++++++++++
 bin/send-reports-failure-summary             | 20 --------------------
 conf/crontab-example                         |  2 +-
 perllib/Open311/PostServiceRequestUpdates.pm | 22 ++++++++++++++++++++++
 t/open311/post-service-request-updates.t     |  4 +++-
 5 files changed, 51 insertions(+), 22 deletions(-)
 create mode 100755 bin/send-failure-summary
 delete mode 100755 bin/send-reports-failure-summary

diff --git a/bin/send-failure-summary b/bin/send-failure-summary
new file mode 100755
index 000000000..1a435dc7c
--- /dev/null
+++ b/bin/send-failure-summary
@@ -0,0 +1,25 @@
+#!/usr/bin/env perl
+
+# send-failure-summary:
+# Prints a summary of report/update sending failures
+
+use warnings;
+use v5.14;
+
+BEGIN {
+    use File::Basename qw(dirname);
+    use File::Spec;
+    my $d = dirname(File::Spec->rel2abs($0));
+    require "$d/../setenv.pl";
+}
+
+use FixMyStreet::Script::Reports;
+use Open311::PostServiceRequestUpdates;
+
+# report summary
+my $manager = FixMyStreet::Script::Reports->new;
+$manager->end_summary_failures;
+
+# updates summary
+my $updates = Open311::PostServiceRequestUpdates->new;
+$updates->summary_failures;
diff --git a/bin/send-reports-failure-summary b/bin/send-reports-failure-summary
deleted file mode 100755
index c7a5b4086..000000000
--- a/bin/send-reports-failure-summary
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env perl
-
-# send-reports-failure-summary:
-# Prints a summary of report sending failures
-
-use strict;
-use warnings;
-use v5.14;
-
-BEGIN {
-    use File::Basename qw(dirname);
-    use File::Spec;
-    my $d = dirname(File::Spec->rel2abs($0));
-    require "$d/../setenv.pl";
-}
-
-use FixMyStreet::Script::Reports;
-
-my $manager = FixMyStreet::Script::Reports->new;
-$manager->end_summary_failures;
diff --git a/conf/crontab-example b/conf/crontab-example
index 86fcee80c..568b07e2e 100644
--- a/conf/crontab-example
+++ b/conf/crontab-example
@@ -12,7 +12,7 @@ PATH=/usr/local/bin:/usr/bin:/bin
 
 # send-reports has three rows so that its 8am entry can be run with --verbose to send a morning summary of anything that's gone wrong
 */5 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-reports.lock" "$FMS/bin/send-reports" || echo "stalled?"
-0 8 * * * "$FMS/bin/send-reports-failure-summary"
+0 8 * * * "$FMS/bin/send-failure-summary"
 
 2 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-alerts.lock" "$FMS/bin/send-alerts" || echo "stalled?"
 22,52 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-questionnaires.lock" "$FMS/bin/send-questionnaires" || echo "stalled?"
diff --git a/perllib/Open311/PostServiceRequestUpdates.pm b/perllib/Open311/PostServiceRequestUpdates.pm
index fadd063da..68823343c 100755
--- a/perllib/Open311/PostServiceRequestUpdates.pm
+++ b/perllib/Open311/PostServiceRequestUpdates.pm
@@ -141,6 +141,28 @@ sub process_update {
     }
 }
 
+sub summary_failures {
+    my $self = shift;
+    my $bodies = $self->fetch_bodies;
+    my $params = $self->construct_query(1);
+    my $u = FixMyStreet::DB->resultset("Comment")
+        ->to_body([ keys %$bodies ])
+        ->search({ "me.send_fail_count" => { '>', 0 } })
+        ->search($params, { join => "problem" });
+
+    my $base_url = FixMyStreet->config('BASE_URL');
+    my $sending_errors;
+    while (my $row = $u->next) {
+        my $url = $base_url . "/report/" . $row->problem_id;
+        $sending_errors .= "\n" . '=' x 80 . "\n\n" . "* $url, update " . $row->id . " failed "
+            . $row->send_fail_count . " times, last at " . $row->send_fail_timestamp
+            . ", reason " . $row->send_fail_reason . "\n";
+    }
+    if ($sending_errors) {
+        print '=' x 80 . "\n\n" . "The following updates failed sending:\n$sending_errors";
+    }
+}
+
 sub log {
     my ($self, $comment, $msg) = @_;
     return unless $self->verbose;
diff --git a/t/open311/post-service-request-updates.t b/t/open311/post-service-request-updates.t
index adfd4e3c5..71bba4af7 100644
--- a/t/open311/post-service-request-updates.t
+++ b/t/open311/post-service-request-updates.t
@@ -1,12 +1,13 @@
 #!/usr/bin/env perl
 
 use FixMyStreet::TestMech;
+use Test::Output;
 
 my $mech = FixMyStreet::TestMech->new;
 
 use_ok( 'Open311::PostServiceRequestUpdates' );
 
-my $o = Open311::PostServiceRequestUpdates->new( site => 'fixmystreet.com' );
+my $o = Open311::PostServiceRequestUpdates->new;
 
 my $params = {
     send_method => 'Open311',
@@ -130,6 +131,7 @@ subtest 'Oxfordshire gets an ID' => sub {
     $o->send;
     $c2->discard_changes;
     is $c2->send_fail_count, 1, 'Oxfordshire update tried to send, failed';
+    stdout_like { $o->summary_failures } qr/The following updates failed sending/;
   };
 };
 
-- 
cgit v1.2.3


From 6a6354640abd976b76f5644367bf8018532e43ec Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Wed, 20 May 2020 15:41:33 +0100
Subject: [fixmystreet.com] Update company details in footer

And in couple of cobrand templates.
---
 docs/_includes/footer.html                      | 11 ++++++++---
 docs/_layouts/pro.html                          |  9 +++++----
 templates/web/fixmystreet.com/footer_extra.html |  7 ++++++-
 templates/web/hounslow/about/mapterms.html      |  2 +-
 templates/web/isleofwight/about/mapterms.html   |  2 +-
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 25ffa94a7..d7260aaa7 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -25,7 +25,7 @@
             <div class="col-sm-3">
                 <div class="mysoc-footer__donate">
                     <p>Your donations keep this site and others like it running</p>
-                    <a href="https://www.mysociety.org/donate?utm_source=fixmystreet.org&utm_content=footer+donate+now&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__donate__button">Donate now</a>
+                    <a href="https://www.mysociety.org/donate?utm_source=fixmystreet.org&amp;utm_content=footer+donate+now&amp;utm_medium=link&amp;utm_campaign=mysoc_footer" class="mysoc-footer__donate__button">Donate now</a>
                 </div>
             </div>
 
@@ -37,14 +37,19 @@
                 <div class="mysoc-footer__orgs">
                     <p class="mysoc-footer__org">
                         Built by
-                        <a href="https://www.mysociety.org?utm_source=fixmystreet.org&utm_content=footer+logo&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a>
+                        <a href="https://www.mysociety.org?utm_source=fixmystreet.org&amp;utm_content=footer+logo&amp;utm_medium=link&amp;utm_campaign=mysoc_footer" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a>
                     </p>
                 </div>
             </div>
 
             <div class="col-sm-4">
                 <div class="mysoc-footer__legal">
-                    <p>mySociety Limited is a project of UK Citizens Online Democracy, a registered charity in England and Wales. For full details visit <a href="https://www.mysociety.org?utm_source=fixmystreet.org&utm_content=footer+full+legal+details&utm_medium=link&utm_campaign=mysoc_footer">mysociety.org</a>.</p>
+                    <p>
+                        <a href="https://www.mysociety.org?utm_source=fixmystreet.org&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">mySociety</a>
+                        is a registered charity in England and Wales (1076346)
+                        and a limited company (03277032). Through our trading subsidiary
+                        SocietyWorks (05798215) we also provide commercial services.
+                    </p>
                 </div>
             </div>
 
diff --git a/docs/_layouts/pro.html b/docs/_layouts/pro.html
index d04446a6e..f1e764c8b 100644
--- a/docs/_layouts/pro.html
+++ b/docs/_layouts/pro.html
@@ -137,14 +137,15 @@
         <hr class="mysoc-footer__divider" role="presentation">
               <div class="row">
             <div class="col-sm-4">
-                <a href="https://www.mysociety.org?utm_source=fixmystreet.com/pro&amp;utm_content=footer+logo&amp;utm_medium=link&amp;utm_campaign=mysoc_footer" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a>
+                <a href="https://www.mysociety.org?utm_source=fixmystreet.com%2Fpro&amp;utm_content=footer+logo&amp;utm_medium=link&amp;utm_campaign=mysoc_footer" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a>
             </div>
             <div class="col-sm-6">
                 <div class="mysoc-footer__legal">
                     <p>
-                        mySociety Limited is a project of UK Citizens Online Democracy,
-                        a registered charity in England and Wales. For full details visit
-                        <a href="https://www.mysociety.org?utm_source=fixmystreet.com/pro&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">mysociety.org</a>.
+                        <a href="https://www.societyworks.org?utm_source=fixmystreet.com%2Fpro&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">SocietyWorks</a>
+                        is a limited company (05798215). It is a trading subsidiary of
+                        <a href="https://www.mysociety.org?utm_source=fixmystreet.com%2Fpro&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">mySociety</a>,
+                        a registered charity in England and Wales (1076346).
                     </p>
                 </div>
             </div>
diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html
index 699d7de8b..b1cb0572e 100644
--- a/templates/web/fixmystreet.com/footer_extra.html
+++ b/templates/web/fixmystreet.com/footer_extra.html
@@ -70,7 +70,12 @@
 
             <div class="col-sm-4">
                 <div class="mysoc-footer__legal">
-                    <p>mySociety Limited is a project of UK Citizens Online Democracy, a registered charity in England and Wales. For full details visit <a href="https://www.mysociety.org?utm_source=fixmystreet.com&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">mysociety.org</a>.</p>
+                    <p>
+                        <a href="https://www.societyworks.org?utm_source=fixmystreet.com&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">SocietyWorks</a>
+                        is a limited company (05798215). It is a trading subsidiary of
+                        <a href="https://www.mysociety.org?utm_source=fixmystreet.com&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">mySociety</a>,
+                        a registered charity in England and Wales (1076346).
+                    </p>
                 </div>
             </div>
 
diff --git a/templates/web/hounslow/about/mapterms.html b/templates/web/hounslow/about/mapterms.html
index 04c0aeb09..fe08dcdd1 100644
--- a/templates/web/hounslow/about/mapterms.html
+++ b/templates/web/hounslow/about/mapterms.html
@@ -8,7 +8,7 @@
     <li>
         I. You are granted a non-exclusive, royalty free revocable licence
         solely to view the licensed data for non-commercial purposes for the
-        period during which mySociety Ltd. makes it available;
+        period during which SocietyWorks Ltd. makes it available;
     </li>
     <li>
         II. You are not permitted to copy, sub-license, distribute, sell or
diff --git a/templates/web/isleofwight/about/mapterms.html b/templates/web/isleofwight/about/mapterms.html
index 04c0aeb09..fe08dcdd1 100644
--- a/templates/web/isleofwight/about/mapterms.html
+++ b/templates/web/isleofwight/about/mapterms.html
@@ -8,7 +8,7 @@
     <li>
         I. You are granted a non-exclusive, royalty free revocable licence
         solely to view the licensed data for non-commercial purposes for the
-        period during which mySociety Ltd. makes it available;
+        period during which SocietyWorks Ltd. makes it available;
     </li>
     <li>
         II. You are not permitted to copy, sub-license, distribute, sell or
-- 
cgit v1.2.3


From c6e723a2fee40f7009de3f04de5870693e12889e Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 26 May 2020 23:01:36 +0100
Subject: [Docs] Update Gemfile.lock to current GitHub pages

---
 docs/Gemfile.lock | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index ed1962744..c6eb7aa83 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     coffee-script (2.4.1)
@@ -26,14 +26,14 @@ GEM
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (1.0.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.12.2)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (204)
+    github-pages (206)
       github-pages-health-check (= 1.16.1)
-      jekyll (= 3.8.5)
+      jekyll (= 3.8.7)
       jekyll-avatar (= 0.7.0)
       jekyll-coffeescript (= 1.1.1)
       jekyll-commonmark-ghpages (= 0.1.6)
@@ -72,7 +72,7 @@ GEM
       mercenary (~> 0.3)
       minima (= 2.5.1)
       nokogiri (>= 1.10.4, < 2.0)
-      rouge (= 3.13.0)
+      rouge (= 3.19.0)
       terminal-table (~> 1.4)
     github-pages-health-check (1.16.1)
       addressable (~> 2.3)
@@ -86,7 +86,7 @@ GEM
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
+    jekyll (3.8.7)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -205,23 +205,23 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.14.0)
+    minitest (5.14.1)
     multipart-post (2.1.1)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    octokit (4.16.0)
+    octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (3.1.1)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.13.0)
-    ruby-enum (0.7.2)
+    rouge (3.19.0)
+    ruby-enum (0.8.0)
       i18n
-    rubyzip (2.2.0)
+    rubyzip (2.3.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -234,12 +234,12 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    typhoeus (1.3.1)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.1)
-    zeitwerk (2.2.2)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
-- 
cgit v1.2.3


From 72809e405e690c88d0e2011802820c9ba215ef61 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 11 May 2020 16:06:37 +0100
Subject: Consistent use of Contact groups.

---
 bin/import_categories                                 |  2 +-
 bin/tfl/import_categories                             |  2 +-
 perllib/FixMyStreet/App/Controller/Admin/Templates.pm |  2 +-
 perllib/FixMyStreet/App/Controller/Admin/Triage.pm    |  6 ++----
 perllib/FixMyStreet/App/Controller/Admin/Users.pm     |  2 +-
 perllib/FixMyStreet/App/Controller/Dashboard.pm       |  4 ++--
 perllib/FixMyStreet/App/Controller/My.pm              | 10 +++++++++-
 perllib/FixMyStreet/App/Controller/Report.pm          |  5 ++---
 perllib/FixMyStreet/App/Controller/Report/New.pm      |  2 +-
 perllib/FixMyStreet/Cobrand/Hounslow.pm               |  4 ++--
 perllib/FixMyStreet/Cobrand/IsleOfWight.pm            |  5 +----
 perllib/FixMyStreet/DB/Result/Contact.pm              |  4 +++-
 templates/web/base/reports/_list-filters.html         |  2 +-
 13 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/bin/import_categories b/bin/import_categories
index 490e2187f..744759f1f 100644
--- a/bin/import_categories
+++ b/bin/import_categories
@@ -81,7 +81,7 @@ sub make_categories {
 
         if ($group) {
             my $groups = $child_cat->groups;
-            my %groups = map { $_ => 1} @$groups;
+            my %groups = map { $_ => 1 } grep { $_ } @$groups;
             $groups{$group} = 1;
             my @groups = keys %groups;
             $child_cat->set_extra_metadata(group => \@groups);
diff --git a/bin/tfl/import_categories b/bin/tfl/import_categories
index bb48ddc4e..d3b99547c 100755
--- a/bin/tfl/import_categories
+++ b/bin/tfl/import_categories
@@ -65,7 +65,7 @@ for my $group (keys %$groups) {
         $child_cat->note($child_cat->in_storage ? 'Updated by import_categories' : 'Created by import_categories');
         say colored("WARNING", 'red') . " " . $child_cat->category . " already exists" if $child_cat->in_storage and $child_cat->category ne 'Other (TfL)';
         my $groups = $child_cat->groups;
-        my %groups = map { $_ => 1} @$groups;
+        my %groups = map { $_ => 1 } grep { $_ } @$groups;
         $groups{$group} = 1;
         my @groups = keys %groups;
         $child_cat->extra(undef) if $child_cat->in_storage;
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Templates.pm b/perllib/FixMyStreet/App/Controller/Admin/Templates.pm
index efff1b488..f933c5f8a 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Templates.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Templates.pm
@@ -69,7 +69,7 @@ sub edit : Path : Args(2) {
         category => $_->category_display,
         active => $active_contacts{$_->id},
         email => $_->email,
-        group => $_->get_extra_metadata('group') // '',
+        group => $_->groups,
     } } @live_contacts;
     $c->stash->{contacts} = \@all_contacts;
     $c->forward('/report/stash_category_groups', [ \@all_contacts, 1 ]) if $c->cobrand->enable_category_groups;
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Triage.pm b/perllib/FixMyStreet/App/Controller/Admin/Triage.pm
index 428c35073..7cfcc93dd 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Triage.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Triage.pm
@@ -90,10 +90,8 @@ sub setup_categories : Private {
         delete $c->stash->{categories_hash};
         my %category_groups = ();
         for my $category (@{$c->stash->{end_options}}) {
-            my $group = $category->{group} // $category->get_extra_metadata('group') // [''];
-            # this could be an array ref or a string
-            my @groups = ref $group eq 'ARRAY' ? @$group : ($group);
-            push( @{$category_groups{$_}}, $category ) for @groups;
+            my $groups = $category->groups;
+            push( @{$category_groups{$_}}, $category ) for @$groups;
         }
         my @category_groups = ();
         for my $group ( grep { $_ ne _('Other') } sort keys %category_groups ) {
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Users.pm b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
index f4b9bd7dc..5bb91341d 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Users.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
@@ -401,7 +401,7 @@ sub edit : Chained('user') : PathPart('') : Args(0) {
             id => $_->id,
             category => $_->category,
             active => $active_contacts{$_->id},
-            group => $_->get_extra_metadata('group') // '',
+            group => $_->groups,
         } } @live_contacts;
         $c->stash->{contacts} = \@all_contacts;
         $c->forward('/report/stash_category_groups', [ \@all_contacts, 1 ]) if $c->cobrand->enable_category_groups;
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index 52af45940..abb2e0988 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -493,8 +493,8 @@ sub generate_csv : Private {
         }
 
         if ($asked_for{subcategory}) {
-            my $group = $obj->contact && $obj->contact->get_extra_metadata('group') || '';
-            $group = join(',', ref $group ? @$group : $group);
+            my $group = $obj->contact && $obj->contact->groups;
+            $group = join(',', @$group);
             if ($group) {
                 $hashref->{subcategory} = $obj->category;
                 $hashref->{category} = $group;
diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm
index 316fe08b8..f5c06d926 100644
--- a/perllib/FixMyStreet/App/Controller/My.pm
+++ b/perllib/FixMyStreet/App/Controller/My.pm
@@ -198,7 +198,15 @@ sub setup_page_data : Private {
         order_by => [ "$table.category" ],
     } )->all;
     $c->stash->{filter_categories} = \@categories;
-    $c->forward('/report/stash_category_groups', [ \@categories ]) if $c->cobrand->enable_category_groups;
+
+    if ($c->cobrand->enable_category_groups) {
+        my @contacts = map { {
+            category => $_->category,
+            category_display => $_->category_display,
+            group => [''],
+        } } @categories;
+        $c->forward('/report/stash_category_groups', [ \@contacts ]);
+    }
 
     my $pins = $c->stash->{pins};
     FixMyStreet::Map::display_map(
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 8a6047194..4d8794c59 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -703,9 +703,8 @@ sub stash_category_groups : Private {
 
     my %category_groups = ();
     for my $category (@$contacts) {
-        my $group = $category->{group} // $category->get_extra_metadata('group') // [''];
-        # this could be an array ref or a string
-        my @groups = ref $group eq 'ARRAY' ? @$group : ($group);
+        my $group = $category->{group} // $category->groups;
+        my @groups = @$group;
         if (scalar @groups > 1 && $combine_multiple) {
             @groups = sort @groups;
             $category->{group} = \@groups;
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index fc1a78cd5..abe37887e 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -766,7 +766,7 @@ sub setup_categories_and_bodies : Private {
     if (@category_options) {
         # If there's an Other category present, put it at the bottom
         @category_options = (
-            { category => _('-- Pick a category --'), category_display => _('-- Pick a category --'), group => '' },
+            { category => _('-- Pick a category --'), category_display => _('-- Pick a category --'), group => [''] },
             grep { $_->category ne _('Other') } @category_options );
         push @category_options, $seen{_('Other')} if $seen{_('Other')};
     }
diff --git a/perllib/FixMyStreet/Cobrand/Hounslow.pm b/perllib/FixMyStreet/Cobrand/Hounslow.pm
index 2fc949546..bc1c80571 100644
--- a/perllib/FixMyStreet/Cobrand/Hounslow.pm
+++ b/perllib/FixMyStreet/Cobrand/Hounslow.pm
@@ -138,8 +138,8 @@ sub setup_general_enquiries_stash {
         }
       )->all;
   @contacts = grep {
-    my $group = $_->get_extra_metadata('group') || '';
-    $group eq 'Other' || $group eq 'General Enquiries';
+    my $groups = $_->groups;
+    grep { $_ eq 'Other' || $_ eq 'General Enquiries' } @$groups;
   } @contacts;
   $self->{c}->stash->{bodies} = \%bodies;
   $self->{c}->stash->{bodies_to_list} = \%bodies;
diff --git a/perllib/FixMyStreet/Cobrand/IsleOfWight.pm b/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
index 3bcea4d3d..ee1a25465 100644
--- a/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
+++ b/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
@@ -176,10 +176,7 @@ sub expand_triage_cat_list {
 
     my %group_to_category;
     while ( my $cat = $all_cats->next ) {
-        next unless $cat->get_extra_metadata('group');
-        my $groups = $cat->get_extra_metadata('group');
-        $groups = ref $groups eq 'ARRAY' ? $groups : [ $groups ];
-        for my $group ( @$groups ) {
+        for my $group ( @{$cat->groups} ) {
             $group_to_category{$group} //= [];
             push @{ $group_to_category{$group} }, $cat->category;
         }
diff --git a/perllib/FixMyStreet/DB/Result/Contact.pm b/perllib/FixMyStreet/DB/Result/Contact.pm
index 2941683d1..1fa38e8a2 100644
--- a/perllib/FixMyStreet/DB/Result/Contact.pm
+++ b/perllib/FixMyStreet/DB/Result/Contact.pm
@@ -113,9 +113,11 @@ sub category_display {
     $self->get_extra_metadata('display_name') || $self->translate_column('category');
 }
 
+# Returns an arrayref of groups this Contact is in; if it is
+# not in any group, returns an arrayref of the empty string.
 sub groups {
     my $self = shift;
-    my $groups = $self->get_extra_metadata('group') || [];
+    my $groups = $self->get_extra_metadata('group') || [''];
     $groups = [ $groups ] unless ref $groups eq 'ARRAY';
     return $groups;
 }
diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html
index f5d1faa65..c5a8eaa75 100644
--- a/templates/web/base/reports/_list-filters.html
+++ b/templates/web/base/reports/_list-filters.html
@@ -2,7 +2,7 @@
 
 [% BLOCK category_options %]
     [% FOR cat IN categories %]
-        <option value="[% cat.category %]"[% ' selected' IF filter_category.${cat.category} OR ( filter_group AND ( cat.get_extra_metadata('group').grep(filter_group).size OR cat.category == filter_group ) ) %]>
+        <option value="[% cat.category %]"[% ' selected' IF filter_category.${cat.category} OR ( filter_group AND ( cat.groups.grep(filter_group).size OR cat.category == filter_group ) ) %]>
             [% cat.category_display %]
             [%~ IF cat.get_extra_metadata('help_text') %] ([% cat.get_extra_metadata('help_text') %])[% END ~%]
         </option>
-- 
cgit v1.2.3


From 901834444846905c85e56528b020bd1a667cb5d2 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 11 May 2020 16:56:46 +0100
Subject: Make sure category shown in all its groups.

When compiling the reporting category dropdown, only one instance of
each value was used. But if a value appears twice, from two different
bodies, in different groups, it would then not appear in all the groups
it would be expected to. Make sure we update the list of groups of the
category if we come across another with the same value.
---
 CHANGELOG.md                                     |  1 +
 perllib/FixMyStreet/App/Controller/JSON.pm       |  1 -
 perllib/FixMyStreet/App/Controller/Report/New.pm | 13 +++++++++----
 t/app/controller/report_new.t                    |  4 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba34d428c..11f7cbf29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * Unreleased
     - Bugfixes:
         - Fix issue with dashboard report CSV export. #3026
+        - Make sure category shown in all its groups when reporting.
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/FixMyStreet/App/Controller/JSON.pm b/perllib/FixMyStreet/App/Controller/JSON.pm
index ccc5b31dc..a7913bb4b 100644
--- a/perllib/FixMyStreet/App/Controller/JSON.pm
+++ b/perllib/FixMyStreet/App/Controller/JSON.pm
@@ -7,7 +7,6 @@ BEGIN { extends 'Catalyst::Controller'; }
 use JSON::MaybeXS;
 use DateTime;
 use DateTime::Format::ISO8601;
-use List::MoreUtils 'uniq';
 use FixMyStreet::DateRange;
 
 =head1 NAME
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index abe37887e..ad324fe60 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -6,8 +6,7 @@ BEGIN { extends 'Catalyst::Controller'; }
 
 use utf8;
 use Encode;
-use List::MoreUtils qw(uniq);
-use List::Util 'first';
+use List::Util qw(first uniq);
 use HTML::Entities;
 use Path::Class;
 use Utils;
@@ -759,8 +758,14 @@ sub setup_categories_and_bodies : Private {
             if !$c->stash->{unresponsive}{ALL} &&
                 ($contact->email =~ /^REFUSED$/i || $body_send_method eq 'Refused');
 
-        push @category_options, $contact unless $seen{$contact->category};
-        $seen{$contact->category} = $contact;
+        if (my $cat = $seen{$contact->category}) {
+            # Make sure the category is listed in all its groups, not just the first set
+            my @groups = uniq @{$cat->groups}, @{$contact->groups};
+            $cat->set_extra_metadata(group => \@groups);
+        } else {
+            push @category_options, $contact;
+            $seen{$contact->category} = $contact;
+        }
     }
 
     if (@category_options) {
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index d2da75f2c..6af709c2c 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -641,10 +641,10 @@ subtest "category groups" => sub {
         }
     }, sub {
         $contact2->update( { extra => { group => ['Roads','Pavements'] } } );
-        $contact9->update( { extra => { group => 'Roads' } } );
+        $contact9->update( { extra => { group => 'Pavements' } } );
         $contact10->update( { extra => { group => 'Roads' } } );
         $mech->get_ok("/report/new?lat=$saved_lat&lon=$saved_lon");
-        $mech->content_like(qr{<optgroup label="Pavements">\s*<option value='Potholes'>Potholes</option></optgroup>});
+        $mech->content_like(qr{<optgroup label="Pavements">\s*<option value='Potholes'>Potholes</option>\s*<option value='Street lighting'>Street lighting</option></optgroup>});
         $mech->content_like(qr{<optgroup label="Roads">\s*<option value='Potholes'>Potholes</option>\s*<option value='Street lighting'>Street lighting</option></optgroup>});
     };
 };
-- 
cgit v1.2.3


From 7b7e00c16f6d31ff77b9f28e63aac3b608f2bfbb Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Tue, 26 May 2020 13:34:34 +0100
Subject: Fix update-schema constraint check on Postgres 12

pg_constraint.consrc has been removed in Postgres 12, and this is the recommended replacement.
See https://www.postgresql.org/docs/12/release-12.html
---
 CHANGELOG.md      | 1 +
 bin/update-schema | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba34d428c..e0afca449 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * Unreleased
     - Bugfixes:
         - Fix issue with dashboard report CSV export. #3026
+        - bin/update-schema PostgreSQL 12 compatibility. #3043
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/bin/update-schema b/bin/update-schema
index 8f31085c9..44e299b91 100755
--- a/bin/update-schema
+++ b/bin/update-schema
@@ -319,7 +319,7 @@ sub constraint_exists {
 # Returns true if a check constraint contains a certain string
 sub constraint_contains {
     my ( $constraint, $check ) = @_;
-    my ($consrc) = $db->dbh->selectrow_array('select consrc from pg_constraint where conname = ?', {}, $constraint);
+    my ($consrc) = $db->dbh->selectrow_array('select pg_get_expr(conbin, conrelid) from pg_constraint where conname = ?', {}, $constraint);
     return unless $consrc;
     return $consrc =~ /$check/;
 }
-- 
cgit v1.2.3


From 363e9b29df531494a01726b3d1d12acb37ac9c8a Mon Sep 17 00:00:00 2001
From: Chris Mytton <chrism@mysociety.org>
Date: Fri, 29 May 2020 13:32:33 +0100
Subject: [TfL] Update COVID-19 homepage messaging

---
 templates/web/tfl/front/pre-steps.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/templates/web/tfl/front/pre-steps.html b/templates/web/tfl/front/pre-steps.html
index 9a740c692..ee22f4978 100644
--- a/templates/web/tfl/front/pre-steps.html
+++ b/templates/web/tfl/front/pre-steps.html
@@ -8,6 +8,4 @@
     <br>
     We will continue to serve you the best that we can but urge everyone not to
     make journeys unless absolutely necessary.
-    <br>
-    We will be able to give you a further update on this by the end of May.
 </p>
-- 
cgit v1.2.3


From f8859e29f5bcf75c1b2acb934bd4353f83c5a2c1 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 29 May 2020 16:21:57 +0100
Subject: [UK] Remove Somerset West and Taunton special destination handling

---
 perllib/FixMyStreet/SendReport/Email.pm | 20 --------------------
 t/Mock/MapIt.pm                         |  1 -
 t/app/sendreport/email.t                | 16 ----------------
 3 files changed, 37 deletions(-)

diff --git a/perllib/FixMyStreet/SendReport/Email.pm b/perllib/FixMyStreet/SendReport/Email.pm
index 72cd42952..81a25f896 100644
--- a/perllib/FixMyStreet/SendReport/Email.pm
+++ b/perllib/FixMyStreet/SendReport/Email.pm
@@ -16,9 +16,6 @@ sub build_recipient_list {
 
         my ($body_email, $state, $note) = ( $contact->email, $contact->state, $contact->note );
 
-        $body_email = swandt_contact($row->latitude, $row->longitude)
-            if $body->name eq 'Somerset West and Taunton Council' && $body_email eq 'SPECIAL';
-
         unless ($state eq 'confirmed') {
             $all_confirmed = 0;
             $note = 'Body ' . $row->bodies_str . ' deleted'
@@ -128,21 +125,4 @@ sub email_list {
     return \@list;
 }
 
-# SW&T has different contact addresses depending upon the old district
-sub swandt_contact {
-    my $district = _get_district_for_contact(@_);
-    my $email;
-    $email = ['customerservices', 'westsomerset'] if $district == 2427;
-    $email = ['enquiries', 'tauntondeane'] if $district == 2429;
-    return join('@', $email->[0], $email->[1] . '.gov.uk');
-}
-
-sub _get_district_for_contact {
-    my ( $lat, $lon ) = @_;
-    my $district =
-      FixMyStreet::MapIt::call( 'point', "4326/$lon,$lat", type => 'DIS', generation => 34 );
-    ($district) = keys %$district;
-    return $district;
-}
-
 1;
diff --git a/t/Mock/MapIt.pm b/t/Mock/MapIt.pm
index d49294a6a..b54ba0ddb 100644
--- a/t/Mock/MapIt.pm
+++ b/t/Mock/MapIt.pm
@@ -50,7 +50,6 @@ my @PLACES = (
     [ '?', 51.345714, -0.227959, 2457, 'Epsom and Ewell Borough Council', 'DIS' ],
     [ 'CW11 1HZ', 53.145324, -2.370437, 21069, 'Cheshire East Council', 'UTA', 135301, 'Sandbach Town', 'UTW' ],
     [ '?', 50.78301, -0.646929 ],
-    [ 'TA1 1QP', 51.023569, -3.099055, 2239, 'Somerset County Council', 'CTY', 2429, 'Taunton Deane Borough Council', 'DIS' ],
     [ 'GU51 4AE', 51.279456, -0.846216, 2333, 'Hart District Council', 'DIS', 2227, 'Hampshire County Council', 'CTY' ],
     [ 'WS1 4NH', 52.563074, -1.991032, 2535, 'Sandwell Borough Council', 'MTD' ],
     [ 'PO30 5XJ', 50.71086, -1.29573, 2636, 'Isle of Wight Council', 'UTA' ],
diff --git a/t/app/sendreport/email.t b/t/app/sendreport/email.t
index cfd70a097..c9363b787 100644
--- a/t/app/sendreport/email.t
+++ b/t/app/sendreport/email.t
@@ -20,8 +20,6 @@ my $contact = $mech->create_contact_ok(
 );
 
 my $row = FixMyStreet::DB->resultset('Problem')->new( {
-    latitude => 51.023569,
-    longitude => -3.099055,
     bodies_str => '1000',
     category => 'category',
     cobrand => '',
@@ -70,18 +68,4 @@ foreach my $test ( {
     };
 }
 
-$body->update({ name => 'Somerset West and Taunton Council' });
-
-subtest 'Test special behaviour' => sub {
-    my $e = FixMyStreet::SendReport::Email->new;
-    $contact->update( { state => 'confirmed', email => 'SPECIAL' } );
-    $e->add_body( $body );
-    FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.uk/'
-    }, sub {
-        my ($e) = $e->build_recipient_list( $row, {} );
-        like $e->[0], qr/tauntondeane/, 'correct recipient';
-    };
-};
-
 done_testing();
-- 
cgit v1.2.3


From a7541a181013378da0090da53847c882881825d0 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 1 Jun 2020 10:08:55 +0100
Subject: Add user_country call that uses Gaze.

---
 CHANGELOG.md                | 1 +
 perllib/FixMyStreet/App.pm  | 5 +++++
 perllib/FixMyStreet/Gaze.pm | 8 ++++++++
 3 files changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a2466913..096c07bd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
         - Add option to show front end testing code coverage. #3036
+        - Add function to fetch user's country from Gaze.
 
 * v3.0.1 (6th May 2020)
     - New features:
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 6a41d93a9..4ca6f23cb 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -536,6 +536,11 @@ sub check_2fa {
     return 0;
 }
 
+sub user_country {
+    my $c = shift;
+    return FixMyStreet::Gaze::get_country_from_ip($c->req->address);
+}
+
 =head1 SEE ALSO
 
 L<FixMyStreet::App::Controller::Root>, L<Catalyst>
diff --git a/perllib/FixMyStreet/Gaze.pm b/perllib/FixMyStreet/Gaze.pm
index bccc81d8c..e2b2e0e08 100644
--- a/perllib/FixMyStreet/Gaze.pm
+++ b/perllib/FixMyStreet/Gaze.pm
@@ -3,6 +3,7 @@ package FixMyStreet::Gaze;
 use strict;
 use warnings;
 
+use FixMyStreet;
 use mySociety::Gaze;
 
 sub get_radius_containing_population ($$) {
@@ -24,4 +25,11 @@ sub get_radius_containing_population ($$) {
     return $dist;
 }
 
+sub get_country_from_ip {
+    my ($ip) = @_;
+    return 'GB' if FixMyStreet->test_mode;
+    # uncoverable statement
+    return mySociety::Gaze::get_country_from_ip($ip);
+}
+
 1;
-- 
cgit v1.2.3


From 5412a569e233b82c8f971e07c57c73d2ef3f6733 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 27 May 2020 21:01:10 +0100
Subject: Mark user as active when sent an email alert.

---
 CHANGELOG.md                         | 2 ++
 perllib/FixMyStreet/Script/Alerts.pm | 4 ++++
 t/app/controller/alert_new.t         | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a2466913..05663b366 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## Releases
 
 * Unreleased
+    - Changes:
+        - Mark user as active when sent an email alert.
     - Bugfixes:
         - Fix issue with dashboard report CSV export. #3026
         - bin/update-schema PostgreSQL 12 compatibility. #3043
diff --git a/perllib/FixMyStreet/Script/Alerts.pm b/perllib/FixMyStreet/Script/Alerts.pm
index cb1f022fa..d07728092 100644
--- a/perllib/FixMyStreet/Script/Alerts.pm
+++ b/perllib/FixMyStreet/Script/Alerts.pm
@@ -307,6 +307,10 @@ sub _send_aggregated_alert_email(%) {
     # Ignore phone-only users
     return unless $data{alert_user}->email_verified;
 
+    # Mark user as active as they're being sent an alert
+    $data{alert_user}->set_last_active;
+    $data{alert_user}->update;
+
     my $email = $data{alert_user}->email;
     my ($domain) = $email =~ m{ @ (.*) \z }x;
     return if $data{schema}->resultset('Abuse')->search( {
diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 7eba90530..d968b56b1 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -523,6 +523,8 @@ subtest "Test alerts are not sent for no-text updates" => sub {
     };
 
     $mech->email_count_is(1);
+    $user2->discard_changes;
+    isnt $user2->last_active, undef, 'Last active has been set';
 
     $mech->delete_user($user1);
     $mech->delete_user($user2);
-- 
cgit v1.2.3


From 7068bba405c905753bd3b41ebf16c399b9d3213f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 27 May 2020 21:01:29 +0100
Subject: [fixmystreet.com] State account deletion policy.

---
 templates/web/fixmystreet.com/about/privacy.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/web/fixmystreet.com/about/privacy.html b/templates/web/fixmystreet.com/about/privacy.html
index 8ed953cc9..665b0968b 100755
--- a/templates/web/fixmystreet.com/about/privacy.html
+++ b/templates/web/fixmystreet.com/about/privacy.html
@@ -287,8 +287,10 @@ When you make a report
 </p>
 
 <p>
+    Personal details will automatically be removed from our database after two
+    years of inactivity of the associated account.
     Please <a href="/contact">contact us</a> if you would like your details to be removed from our admin
-    database.
+    database sooner than that.
 </p>
 
 <h3>
@@ -297,7 +299,7 @@ When you make a report
 
 <p>
     If you contact FixMyStreet via our support email address we keep your message for two
-    years at which point they will be automatically deleted.. This is to aid continuity
+    years at which point it will be automatically deleted. This is to aid continuity
     and so that we can view any historic context which may have bearing on subsequent
     support mail, even if members of the support staff change. Support staff adhere to
     internal privacy policies which may be viewed on request.
-- 
cgit v1.2.3


From f2ef45fb4ed8e167a0dea3bba1a9cd1ad640a31c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 1 Jun 2020 11:06:55 +0100
Subject: Ignore body users when anonymizing.

---
 perllib/FixMyStreet/Script/Inactive.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/perllib/FixMyStreet/Script/Inactive.pm b/perllib/FixMyStreet/Script/Inactive.pm
index 8dd524ce1..4d28057d4 100644
--- a/perllib/FixMyStreet/Script/Inactive.pm
+++ b/perllib/FixMyStreet/Script/Inactive.pm
@@ -158,8 +158,14 @@ sub delete_reports {
 sub anonymize_users {
     my $self = shift;
 
+    my $body_users = FixMyStreet::DB->resultset("Body")->search({
+        comment_user_id => { '!=' => undef },
+    }, {
+        columns => 'comment_user_id',
+    });
     my $users = FixMyStreet::DB->resultset("User")->search({
         last_active => { '<', interval($self->anonymize) },
+        id => { -not_in => $body_users->as_query },
         email => { -not_like => 'removed-%@' . FixMyStreet->config('EMAIL_DOMAIN') },
     });
 
-- 
cgit v1.2.3


From e210a3576aa4fe247feafe4f7c0d27e308faba86 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 3 Jun 2020 17:23:32 +0100
Subject: Store staff user when staff make anonymous update.

Match the identical code for anonymous reports.
---
 perllib/FixMyStreet/App/Controller/Report/Update.pm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index c5d20a5da..8ffba3dcf 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -484,6 +484,13 @@ sub save_update : Private {
         $update->confirm();
     } elsif ($c->stash->{contributing_as_anonymous_user}) {
         $update->set_extra_metadata( contributed_as => 'anonymous_user' );
+        if ( $c->user_exists && $c->user->from_body ) {
+            # If a staff user has clicked the 'report anonymously' button then
+            # there would be no record of who that staff member was as we've
+            # used the cobrand's anonymous_account for the report. In this case
+            # record the staff user ID in the report metadata.
+            $update->set_extra_metadata( contributed_by => $c->user->id );
+        }
         $update->confirm();
     } elsif ( !$update->user->in_storage ) {
         # User does not exist.
-- 
cgit v1.2.3


From 766f0ed07864ac89a81d9356a8960c3c0744fc99 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 1 Jun 2020 10:47:27 +0100
Subject: [fixmystreet.com] Add option for recaptcha.

We are getting spam submissions of e.g. alert subscribe form,
which causes people to get a confirmation email.
---
 CHANGELOG.md                                       |  2 ++
 perllib/FixMyStreet/App/Controller/Auth.pm         |  3 ++
 perllib/FixMyStreet/Cobrand/UK.pm                  | 33 ++++++++++++++++++++++
 t/app/controller/alert.t                           | 22 +++++++++++++++
 templates/web/base/alert/_list.html                |  1 +
 templates/web/base/alert/updates.html              |  2 ++
 templates/web/base/auth/form_extra.html            |  0
 templates/web/base/report/display_tools.html       |  1 +
 .../base/report/form/user_loggedout_by_email.html  |  2 ++
 templates/web/fixmystreet.com/auth/form_extra.html |  4 +++
 10 files changed, 70 insertions(+)
 create mode 100644 templates/web/base/auth/form_extra.html
 create mode 100644 templates/web/fixmystreet.com/auth/form_extra.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 096c07bd8..6830bfbb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
         - Add option to show front end testing code coverage. #3036
         - Add function to fetch user's country from Gaze.
+    - UK:
+        - Add option for recaptcha. #3050
 
 * v3.0.1 (6th May 2020)
     - New features:
diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index cecfa318c..beba6b235 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -448,6 +448,9 @@ sub check_csrf_token : Private {
         unless $time
             && $time > time() - 3600
             && $token eq $gen_token;
+
+    # Also check recaptcha if needed
+    $c->cobrand->call_hook('check_recaptcha');
 }
 
 sub no_csrf_token : Private {
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index a42ff58a6..4c62dd538 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -3,6 +3,7 @@ use base 'FixMyStreet::Cobrand::Default';
 use strict;
 
 use JSON::MaybeXS;
+use LWP::UserAgent;
 use mySociety::MaPit;
 use mySociety::VotingArea;
 use Utils;
@@ -422,4 +423,36 @@ sub report_new_munge_before_insert {
     }
 }
 
+# To use recaptcha, add a RECAPTCHA key to your config, with subkeys secret and
+# site_key, taken from the recaptcha site. This shows it to non-UK IP addresses
+# on alert and report pages.
+
+sub requires_recaptcha {
+    my $self = shift;
+    my $c = $self->{c};
+
+    return 0 if $c->user_exists;
+    return 0 if !FixMyStreet->config('RECAPTCHA');
+    return 0 if $c->user_country eq 'GB';
+    return 0 unless $c->action =~ /^(alert|report)/;
+    return 1;
+}
+
+sub check_recaptcha {
+    my $self = shift;
+    my $c = $self->{c};
+
+    return unless $self->requires_recaptcha;
+
+    my $url = 'https://www.google.com/recaptcha/api/siteverify';
+    my $res = LWP::UserAgent->new->post($url, {
+        secret => FixMyStreet->config('RECAPTCHA')->{secret},
+        response => $c->get_param('g-recaptcha-response'),
+        remoteip => $c->req->address,
+    });
+    $res = decode_json($res->content);
+    $c->detach('/page_error_400_bad_request', ['Bad recaptcha'])
+        unless $res->{success};
+}
+
 1;
diff --git a/t/app/controller/alert.t b/t/app/controller/alert.t
index 41aee5bbc..34e68177c 100644
--- a/t/app/controller/alert.t
+++ b/t/app/controller/alert.t
@@ -1,6 +1,7 @@
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
 
+use Test::MockModule;
 use t::Mock::Nominatim;
 
 # check that we can get the page
@@ -73,4 +74,25 @@ FixMyStreet::override_config {
     is $mech->uri->path, '/rss/reports/Cheltenham/Lansdown';
 };
 
+FixMyStreet::override_config {
+    ALLOWED_COBRANDS => 'fixmystreet',
+    MAPIT_URL => 'http://mapit.uk/',
+    GEOCODER => '',
+    RECAPTCHA => { secret => 'secret', site_key => 'site_key' },
+}, sub {
+    subtest 'recaptcha' => sub {
+        $mech->get_ok('/alert/list?pc=EH11BB');
+        $mech->content_lacks('g-recaptcha'); # GB is default test country
+
+        my $mod_app = Test::MockModule->new('FixMyStreet::App');
+        $mod_app->mock('user_country', sub { 'FR' });
+        my $mod_lwp = Test::MockModule->new('LWP::UserAgent');
+        $mod_lwp->mock('post', sub { HTTP::Response->new(200, 'OK', [], '{ "success": true }') });
+
+        $mech->get_ok('/alert/list?pc=EH11BB');
+        $mech->content_contains('g-recaptcha');
+        $mech->submit_form_ok({ with_fields => { rznvy => 'someone@example.org' } });
+    };
+};
+
 done_testing();
diff --git a/templates/web/base/alert/_list.html b/templates/web/base/alert/_list.html
index 782989a5c..e6c5183e4 100644
--- a/templates/web/base/alert/_list.html
+++ b/templates/web/base/alert/_list.html
@@ -62,6 +62,7 @@
     </div>
   [% END %]
 
+  [% PROCESS 'auth/form_extra.html' %]
 
   <div class="alerts__cta-box">
     <h3>[% loc('Subscribe by email') %]</h3>
diff --git a/templates/web/base/alert/updates.html b/templates/web/base/alert/updates.html
index 0fbed2254..40380849f 100644
--- a/templates/web/base/alert/updates.html
+++ b/templates/web/base/alert/updates.html
@@ -15,6 +15,8 @@
 </p>
 
 <form action="/alert/subscribe" method="post">
+    [% PROCESS 'auth/form_extra.html' %]
+
     <fieldset>
       [% IF c.user_exists %]
         [% IF c.user.has_permission_to("contribute_as_another_user", problem.bodies_str_ids) %]
diff --git a/templates/web/base/auth/form_extra.html b/templates/web/base/auth/form_extra.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html
index 4c79e4b71..532c78ec8 100644
--- a/templates/web/base/report/display_tools.html
+++ b/templates/web/base/report/display_tools.html
@@ -44,6 +44,7 @@
             <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0">
         </a>
         [% loc('Receive email when updates are left on this problem.' ) %]</p>
+        [% PROCESS 'auth/form_extra.html' %]
         <fieldset>
       [% IF c.user_exists %]
           [% IF permissions.contribute_as_another_user %]
diff --git a/templates/web/base/report/form/user_loggedout_by_email.html b/templates/web/base/report/form/user_loggedout_by_email.html
index 33526cc46..459428059 100644
--- a/templates/web/base/report/form/user_loggedout_by_email.html
+++ b/templates/web/base/report/form/user_loggedout_by_email.html
@@ -62,6 +62,8 @@
 
     <input class="form-control js-password-validate" type="password" name="password_register" id="password_register" aria-describedby="password_register_hint" value="">
 
+    [% PROCESS 'auth/form_extra.html' %]
+
     <input class="btn btn--primary btn--block btn--final js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
 
 </div>
diff --git a/templates/web/fixmystreet.com/auth/form_extra.html b/templates/web/fixmystreet.com/auth/form_extra.html
new file mode 100644
index 000000000..8e96b447c
--- /dev/null
+++ b/templates/web/fixmystreet.com/auth/form_extra.html
@@ -0,0 +1,4 @@
+[% IF c.cobrand.requires_recaptcha %]
+    <script src="https://www.google.com/recaptcha/api.js" async defer></script>
+    <div class="g-recaptcha" data-sitekey="[% c.config.RECAPTCHA.site_key %]"></div>
+[% END %]
-- 
cgit v1.2.3


From 1c8f7efec8e04919ad43c63ce9bcf148ee72a2cc Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 3 Jun 2020 15:31:15 +0100
Subject: [Open311] Do not remove any devolved contacts.

---
 CHANGELOG.md                           |  1 +
 perllib/Open311/PopulateServiceList.pm |  6 ++--
 t/open311/populate-service-list.t      | 64 ++++++++++++++++++++++------------
 3 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a2466913..d9fe1e282 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
         - Fix issue with dashboard report CSV export. #3026
         - bin/update-schema PostgreSQL 12 compatibility. #3043
         - Make sure category shown in all its groups when reporting.
+        - Do not remove any devolved contacts.
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/Open311/PopulateServiceList.pm b/perllib/Open311/PopulateServiceList.pm
index 9be17946e..20fca90b3 100644
--- a/perllib/Open311/PopulateServiceList.pm
+++ b/perllib/Open311/PopulateServiceList.pm
@@ -350,10 +350,10 @@ sub _delete_contacts_not_in_service_list {
     );
 
     if ($self->_current_body->can_be_devolved) {
-        # If the body has can_be_devolved switched on, it's most likely a
-        # combination of Open311/email, so ignore any email addresses.
+        # If the body has can_be_devolved switched on, ignore any
+        # contact with its own send method
         $found_contacts = $found_contacts->search(
-            { email => { -not_like => '%@%' } }
+            { send_method => [ "", undef ] },
         );
     }
 
diff --git a/t/open311/populate-service-list.t b/t/open311/populate-service-list.t
index bd837f203..20f092da4 100644
--- a/t/open311/populate-service-list.t
+++ b/t/open311/populate-service-list.t
@@ -175,33 +175,53 @@ subtest "set multiple groups with groups element" => sub {
     is_deeply $contact->get_extra->{group}, ['sanitation & cleaning','street'], "groups set correctly";
 };
 
-subtest 'check non open311 contacts marked as deleted' => sub {
-    FixMyStreet::DB->resultset('Contact')->search( { body_id => $body->id } )->delete();
+$body->update({ can_be_devolved => 1 });
+for my $test (
+    {
+        test => 'check non open311 contacts marked as deleted',
+        contact_params => {
+            email => 'contact@example.com',
+        },
+        deleted => 1,
+    },
+    {
+        test => 'check devolved non open311 contacts not marked as deleted',
+        contact_params => {
+            email => 'contact',
+            send_method => 'Open311',
+        },
+        deleted => 0,
+    },
+) {
+    subtest $test->{test} => sub {
+        FixMyStreet::DB->resultset('Contact')->search( { body_id => $body->id } )->delete();
 
-    my $contact = FixMyStreet::DB->resultset('Contact')->create(
-        {
-            body_id => $body->id,
-            email =>   'contact@example.com',
-            category => 'An old category',
-            state => 'confirmed',
-            editor => $0,
-            whenedited => \'current_timestamp',
-            note => 'test contact',
-        }
-    );
+        my $contact = FixMyStreet::DB->resultset('Contact')->create(
+            {
+                body_id => $body->id,
+                category => 'An old category',
+                state => 'confirmed',
+                editor => $0,
+                whenedited => \'current_timestamp',
+                note => 'test contact',
+                %{$test->{contact_params}},
+            }
+        );
 
-    my $service_list = get_xml_simple_object( get_standard_xml() );
+        my $service_list = get_xml_simple_object( get_standard_xml() );
 
-    my $processor = Open311::PopulateServiceList->new();
-    $processor->_current_body( $body );
-    $processor->process_services( $service_list );
+        my $processor = Open311::PopulateServiceList->new();
+        $processor->_current_body( $body );
+        $processor->process_services( $service_list );
 
-    my $contact_count = FixMyStreet::DB->resultset('Contact')->search( { body_id => $body->id } )->count();
-    is $contact_count, 4, 'correct number of contacts';
+        my $contact_count = FixMyStreet::DB->resultset('Contact')->search( { body_id => $body->id } )->count();
+        is $contact_count, 4, 'correct number of contacts';
 
-    $contact_count = FixMyStreet::DB->resultset('Contact')->search( { body_id => $body->id, state => 'deleted' } )->count();
-    is $contact_count, 1, 'correct number of deleted contacts';
-};
+        $contact_count = FixMyStreet::DB->resultset('Contact')->search( { body_id => $body->id, state => 'deleted' } )->count();
+        is $contact_count, $test->{deleted}, 'correct number of deleted contacts';
+    };
+}
+$body->update({ can_be_devolved => 0 });
 
 subtest 'check email changed if matching category' => sub {
     FixMyStreet::DB->resultset('Contact')->search( { body_id => $body->id } )->delete();
-- 
cgit v1.2.3


From ce5588038dfafb2db53c7de7e0d34e8c59bed8ba Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 29 May 2020 11:09:09 +0100
Subject: Small refactor of around.t, add "lat,lon" test.

---
 t/app/controller/around.t | 95 ++++++++++++++++-------------------------------
 1 file changed, 32 insertions(+), 63 deletions(-)

diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index 6e49c6f29..be8b0df9e 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -53,6 +53,11 @@ foreach my $test (
     };
 }
 
+FixMyStreet::override_config {
+    ALLOWED_COBRANDS => 'fixmystreet',
+    MAPIT_URL => 'http://mapit.uk/',
+}, sub {
+
 # check that exact queries result in the correct lat,lng
 foreach my $test (
     {
@@ -69,16 +74,18 @@ foreach my $test (
 {
     subtest "check lat/lng for '$test->{pc}'" => sub {
         $mech->get_ok('/');
-        FixMyStreet::override_config {
-            ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-            MAPIT_URL => 'http://mapit.uk/',
-        }, sub {
-            $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
-                "good location" );
-        };
+        $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
+            "good location" );
         is_deeply $mech->page_errors, [], "no errors for pc '$test->{pc}'";
         is_deeply $mech->extract_location, $test,
           "got expected location for pc '$test->{pc}'";
+        $mech->get_ok('/');
+        my $pc = "$test->{latitude},$test->{longitude}";
+        $mech->submit_form_ok( { with_fields => { pc => $pc } },
+            "good location" );
+        is_deeply $mech->page_errors, [], "no errors for pc '$pc'";
+        is_deeply $mech->extract_location, { %$test, pc => $pc },
+          "got expected location for pc '$pc'";
     };
 }
 
@@ -93,10 +100,10 @@ my @edinburgh_problems = $mech->create_problems_for_body( 5, $body_edin_id, 'Aro
 
 subtest 'check lookup by reference' => sub {
     $mech->get_ok('/');
-    $mech->submit_form_ok( { with_fields => { pc => 'ref:12345' } }, 'bad ref');
+    $mech->submit_form_ok( { with_fields => { pc => '12345' } }, 'bad ref');
     $mech->content_contains('Searching found no reports');
     my $id = $edinburgh_problems[0]->id;
-    $mech->submit_form_ok( { with_fields => { pc => "ref:$id" } }, 'good ref');
+    $mech->submit_form_ok( { with_fields => { pc => $id } }, 'good ref');
     is $mech->uri->path, "/report/$id", "redirected to report page";
 };
 
@@ -106,19 +113,14 @@ subtest 'check lookup by reference does not show non_public reports' => sub {
     });
     my $id = $edinburgh_problems[0]->id;
     $mech->get_ok('/');
-    $mech->submit_form_ok( { with_fields => { pc => "ref:$id" } }, 'non_public ref');
+    $mech->submit_form_ok( { with_fields => { pc => $id } }, 'non_public ref');
     $mech->content_contains('Searching found no reports');
 };
 
 subtest 'check non public reports are not displayed on around page' => sub {
     $mech->get_ok('/');
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
-        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
-            "good location" );
-    };
+    $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
+        "good location" );
     $mech->content_contains( "Around page Test 3 for $body_edin_id",
         'problem to be marked non public visible' );
 
@@ -126,26 +128,16 @@ subtest 'check non public reports are not displayed on around page' => sub {
     ok $private->update( { non_public => 1 } ), 'problem marked non public';
 
     $mech->get_ok('/');
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
-        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
-            "good location" );
-    };
+    $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
+        "good location" );
     $mech->content_lacks( "Around page Test 3 for $body_edin_id",
         'problem marked non public is not visible' );
 };
 
 subtest 'check missing body message not shown when it does not need to be' => sub {
     $mech->get_ok('/');
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => 'fixmystreet',
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
-        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
-            "good location" );
-    };
+    $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
+        "good location" );
     $mech->content_lacks('yet have details for the other councils that cover this location');
 };
 
@@ -162,24 +154,14 @@ for my $permission ( qw/ report_inspect report_mark_private/ ) {
         });
 
         $mech->get_ok('/');
-        FixMyStreet::override_config {
-            ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-            MAPIT_URL => 'http://mapit.uk/',
-        }, sub {
-            $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
-                "good location" );
-        };
+        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
+            "good location" );
         $mech->content_contains( "Around page Test 3 for $body_edin_id",
             'problem marked non public is visible' );
         $mech->content_contains( "Around page Test 2 for $body_edin_id",
             'problem marked public is visible' );
 
-        FixMyStreet::override_config {
-            ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-            MAPIT_URL => 'http://mapit.uk/',
-        }, sub {
-            $mech->get_ok('/around?pc=EH1+1BB&status=non_public');
-        };
+        $mech->get_ok('/around?pc=EH1+1BB&status=non_public');
         $mech->content_contains( "Around page Test 3 for $body_edin_id",
             'problem marked non public is visible' );
         $mech->content_lacks( "Around page Test 2 for $body_edin_id",
@@ -193,24 +175,14 @@ for my $permission ( qw/ report_inspect report_mark_private/ ) {
         });
 
         $mech->get_ok('/');
-        FixMyStreet::override_config {
-            ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-            MAPIT_URL => 'http://mapit.uk/',
-        }, sub {
-            $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
-                "good location" );
-        };
+        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
+            "good location" );
         $mech->content_lacks( "Around page Test 3 for $body_edin_id",
             'problem marked non public is not visible' );
         $mech->content_contains( "Around page Test 2 for $body_edin_id",
             'problem marked public is visible' );
 
-        FixMyStreet::override_config {
-            ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-            MAPIT_URL => 'http://mapit.uk/',
-        }, sub {
-            $mech->get_ok('/around?pc=EH1+1BB&status=non_public');
-        };
+        $mech->get_ok('/around?pc=EH1+1BB&status=non_public');
         $mech->content_lacks( "Around page Test 3 for $body_edin_id",
             'problem marked non public is not visible' );
         $mech->content_lacks( "Around page Test 2 for $body_edin_id",
@@ -230,17 +202,14 @@ subtest 'check assigned-only list items do not display shortlist buttons' => sub
     $user->update({ from_body => $body });
     $user->user_body_permissions->find_or_create({ body => $body, permission_type => 'planned_reports' });
 
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => 'fixmystreet',
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
-        $mech->get_ok('/around?pc=EH1+1BB');
-    };
+    $mech->get_ok('/around?pc=EH1+1BB');
     $mech->content_contains('shortlist-add-' . $edinburgh_problems[4]->id);
     $mech->content_lacks('shortlist-add-' . $edinburgh_problems[3]->id);
     $mech->content_lacks('shortlist-add-' . $edinburgh_problems[1]->id);
 };
 
+}; # End big override_config
+
 my $body = $mech->create_body_ok(2237, "Oxfordshire");
 
 subtest 'check category, status and extra filtering works on /around' => sub {
-- 
cgit v1.2.3


From abc63a85b47bbc6b9e81c8256a226864ac7fe0ce Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 29 May 2020 11:09:36 +0100
Subject: Add Open Location Codes support to search box.

---
 CHANGELOG.md                                   |  2 ++
 cpanfile                                       |  1 +
 cpanfile.snapshot                              |  9 +++++++++
 perllib/FixMyStreet/App/Controller/Location.pm | 25 +++++++++++++++++++++++++
 t/Mock/Nominatim.pm                            |  5 +++++
 t/app/controller/around.t                      | 25 +++++++++++++++++++++++++
 6 files changed, 67 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9fe1e282..1bd70243c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## Releases
 
 * Unreleased
+    - New features:
+        - Add Open Location Codes support to search box. #3047
     - Bugfixes:
         - Fix issue with dashboard report CSV export. #3026
         - bin/update-schema PostgreSQL 12 compatibility. #3043
diff --git a/cpanfile b/cpanfile
index 0474f4691..1415a7af5 100644
--- a/cpanfile
+++ b/cpanfile
@@ -80,6 +80,7 @@ requires 'Error';
 requires 'FCGI'; # Required by e.g. Plack::Handler::FCGI
 requires 'File::Find';
 requires 'File::Path';
+requires 'Geo::OLC';
 requires 'Geography::NationalGrid',
     mirror => 'https://cpan.metacpan.org/';
 requires 'Getopt::Long::Descriptive', '0.105';
diff --git a/cpanfile.snapshot b/cpanfile.snapshot
index 53ce1f120..edc125960 100644
--- a/cpanfile.snapshot
+++ b/cpanfile.snapshot
@@ -3116,6 +3116,15 @@ DISTRIBUTIONS
       perl 5.014000
       strict 0
       warnings 0
+  Geo-OLC-1
+    pathname: J/JG/JGREELY/Geo-OLC-1.tar.gz
+    provides:
+      Geo::OLC 1
+    requirements:
+      ExtUtils::MakeMaker 0
+      List::Util 1
+      Test::More 0
+      perl 5.010001
   Geography-NationalGrid-1.6
     pathname: P/PK/PKENT/Geography-NationalGrid-1.6.tar.gz
     provides:
diff --git a/perllib/FixMyStreet/App/Controller/Location.pm b/perllib/FixMyStreet/App/Controller/Location.pm
index 416fb942a..3869ef8d3 100644
--- a/perllib/FixMyStreet/App/Controller/Location.pm
+++ b/perllib/FixMyStreet/App/Controller/Location.pm
@@ -6,6 +6,7 @@ BEGIN {extends 'Catalyst::Controller'; }
 
 use Encode;
 use FixMyStreet::Geocode;
+use Geo::OLC;
 use Try::Tiny;
 use Utils;
 
@@ -74,6 +75,30 @@ sub determine_location_from_pc : Private {
             map { Utils::truncate_coordinate($_) } ($1, $2);
         return $c->forward( 'check_location' );
     }
+
+    if (Geo::OLC::is_full($pc)) {
+        my $ref = Geo::OLC::decode($pc);
+        ($c->stash->{latitude}, $c->stash->{longitude}) =
+            map { Utils::truncate_coordinate($_) } @{$ref->{center}};
+        return $c->forward( 'check_location' );
+    }
+
+    if ($pc =~ /^\s*([2-9CFGHJMPQRVWX]{4,6}\+[2-9CFGHJMPQRVWX]{2,3})\s+(.*)$/i) {
+        my ($code, $rest) = ($1, $2);
+        my ($lat, $lon, $error) = FixMyStreet::Geocode::lookup($rest, $c);
+        if (ref($error) eq 'ARRAY') { # Just take the first result
+            $lat = $error->[0]{latitude};
+            $lon = $error->[0]{longitude};
+        }
+        if (defined $lat && defined $lon) {
+            $code = Geo::OLC::recover_nearest($code, $lat, $lon);
+            my $ref = Geo::OLC::decode($code);
+            ($c->stash->{latitude}, $c->stash->{longitude}) =
+                map { Utils::truncate_coordinate($_) } @{$ref->{center}};
+            return $c->forward( 'check_location' );
+        }
+    }
+
     if ( $c->cobrand->country eq 'GB' && $pc =~ /^([A-Z])([A-Z])([\d\s]{4,})$/i) {
         if (my $convert = gridref_to_latlon( $1, $2, $3 )) {
             ($c->stash->{latitude}, $c->stash->{longitude}) =
diff --git a/t/Mock/Nominatim.pm b/t/Mock/Nominatim.pm
index 806ebbfd3..d108256f5 100644
--- a/t/Mock/Nominatim.pm
+++ b/t/Mock/Nominatim.pm
@@ -1,6 +1,7 @@
 package t::Mock::Nominatim;
 
 use JSON::MaybeXS;
+use LWP::Protocol::PSGI;
 use Web::Simple;
 
 has json => (
@@ -35,6 +36,10 @@ sub query {
             {"osm_type"=>"way","osm_id"=>"4684282","lat"=>"55.9504009","lon"=>"-3.1858425","display_name"=>"High Street, Old Town, City of Ed\x{ed}nburgh, Scotland, EH1 1SP, United Kingdom","class"=>"highway","type"=>"tertiary","importance"=>0.55892577838734},
             {"osm_type"=>"node","osm_id"=>"27424410","lat"=>"55.8596449","lon"=>"-4.240377","display_name"=>"High Street, Collegelands, Merchant City, Glasgow, Glasgow City, Scotland, G, United Kingdom","class"=>"railway","type"=>"station","importance"=>0.53074299592768}
         ];
+    } elsif ($q eq 'edinburgh') {
+        return [
+            {"osm_type"=>"node","osm_id"=>"17898859","lat"=>"55.9533456","lon"=>"-3.1883749","display_name"=>"Edinburgh","class"=>"place","type"=>"place:city","importance"=>0.676704}
+        ];
     }
     return [];
 }
diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index be8b0df9e..784801517 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -9,6 +9,7 @@ use constant MIN_ZOOM_LEVEL => 88;
 package main;
 
 use Test::MockModule;
+use t::Mock::Nominatim;
 
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
@@ -89,6 +90,30 @@ foreach my $test (
     };
 }
 
+subtest "check lat/lng for full plus code" => sub {
+    $mech->get_ok('/');
+    $mech->submit_form_ok( { with_fields => { pc => "9C7RXR26+R5" } } );
+    is_deeply $mech->page_errors, [], "no errors for plus code";
+    is_deeply $mech->extract_location, {
+        pc => "9C7RXR26+R5",
+        latitude  => 55.952063,
+        longitude => -3.189562,
+    },
+      "got expected location for full plus code";
+};
+
+subtest "check lat/lng for short plus code" => sub {
+    $mech->get_ok('/');
+    $mech->submit_form_ok( { with_fields => { pc => "XR26+R5 Edinburgh" } } );
+    is_deeply $mech->page_errors, [], "no errors for plus code";
+    is_deeply $mech->extract_location, {
+        pc => "XR26+R5 Edinburgh",
+        latitude  => 55.952063,
+        longitude => -3.189562,
+    },
+      "got expected location for short plus code";
+};
+
 my $body_edin_id = $mech->create_body_ok(2651, 'City of Edinburgh Council')->id;
 my $body_west_id = $mech->create_body_ok(2504, 'Westminster City Council')->id;
 
-- 
cgit v1.2.3


From f706b89ef794ed3d16c015842d6052d03a5d39ef Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 9 Jun 2020 13:46:59 +0100
Subject: Fix double encoding of per-category templates.

encode_json encodes to UTF-8, and then
he output was being encoded again.
---
 CHANGELOG.md                              | 1 +
 perllib/FixMyStreet/Roles/ContactExtra.pm | 2 +-
 t/app/model/responsetemplate.t            | 8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bd70243c..733ad04c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
         - bin/update-schema PostgreSQL 12 compatibility. #3043
         - Make sure category shown in all its groups when reporting.
         - Do not remove any devolved contacts.
+        - Fix double encoding of per-category templates.
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/FixMyStreet/Roles/ContactExtra.pm b/perllib/FixMyStreet/Roles/ContactExtra.pm
index e78d9b53f..73b1d3e6a 100644
--- a/perllib/FixMyStreet/Roles/ContactExtra.pm
+++ b/perllib/FixMyStreet/Roles/ContactExtra.pm
@@ -46,7 +46,7 @@ sub by_categories {
             || (grep { $_->contact_id == $contact->get_column('id') } $_->$join_table)
         } @results;
         @ts = $rs->map_extras(@ts);
-        $extras{$contact->category} = encode_json(\@ts);
+        $extras{$contact->category} = JSON::XS->new->encode(\@ts);
     }
 
     return \%extras;
diff --git a/t/app/model/responsetemplate.t b/t/app/model/responsetemplate.t
index 9efc7e3b4..29c41a0e0 100644
--- a/t/app/model/responsetemplate.t
+++ b/t/app/model/responsetemplate.t
@@ -1,3 +1,4 @@
+use utf8;
 use FixMyStreet::TestMech;
 use JSON::MaybeXS;
 
@@ -7,7 +8,7 @@ my $area_id = 2651;
 my $body = $mech->create_body_ok($area_id, 'Edinburgh Council');
 my $c1 = $mech->create_contact_ok(category => 'Potholes', body_id => $body->id, email => 'p');
 my $c2 = $mech->create_contact_ok(category => 'Graffiti', body_id => $body->id, email => 'g');
-my $t1 = FixMyStreet::DB->resultset('ResponseTemplate')->create({ body_id => $body->id, title => "Title 1", text => "Text 1" });
+my $t1 = FixMyStreet::DB->resultset('ResponseTemplate')->create({ body_id => $body->id, title => "Title 1", text => "Text 1 ⛄" });
 my $t2 = FixMyStreet::DB->resultset('ResponseTemplate')->create({ body_id => $body->id, title => "Title 2", text => "Text 2", state => 'investigating' });
 my $t3 = FixMyStreet::DB->resultset('ResponseTemplate')->create({ body_id => $body->id, title => "Title 3", text => "Text 3" });
 $t1->add_to_contacts($c1);
@@ -17,12 +18,13 @@ my @contacts = FixMyStreet::DB->resultset('Contact')->not_deleted->search( { bod
 
 subtest 'by_categories returns allresponse templates grouped by category' => sub {
     my $templates = FixMyStreet::DB->resultset('ResponseTemplate')->by_categories(\@contacts, body_id => $body->id);
-    my $potholes = decode_json($templates->{Potholes});
-    my $graffiti = decode_json($templates->{Graffiti});
+    my $potholes = JSON::MaybeXS->new->decode($templates->{Potholes});
+    my $graffiti = JSON::MaybeXS->new->decode($templates->{Graffiti});
 
     is scalar @$potholes, 2, 'Potholes have 2 templates';
     is scalar @$graffiti, 2, 'Graffiti has 2 templates';
     is $graffiti->[0]->{state}, 'investigating', 'Graffiti first template has right state';
+    is $potholes->[0]->{id}, 'Text 1 ⛄', 'Pothole first template has right text';
 };
 
 done_testing;
-- 
cgit v1.2.3


From d56c3d7396ddd71b5cbf8e69d8cb0c3d7c400466 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 9 Jun 2020 14:43:30 +0100
Subject: Use problem name in reporting to match display.

---
 templates/web/base/contact/index.html    | 2 +-
 templates/web/bathnes/contact/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/web/base/contact/index.html b/templates/web/base/contact/index.html
index 05a24160f..4e65ce674 100644
--- a/templates/web/base/contact/index.html
+++ b/templates/web/base/contact/index.html
@@ -63,7 +63,7 @@
                     [% IF problem.anonymous %]
                         [% tprintf( loc('Reported anonymously at %s'), prettify_dt( problem.confirmed ) ) %]
                     [% ELSE %]
-                        [% tprintf( loc('Reported by %s at %s'), problem.user.name, prettify_dt( problem.confirmed ) ) | html %]
+                        [% tprintf( loc('Reported by %s at %s'), problem.name, prettify_dt( problem.confirmed ) ) | html %]
                     [% END %]
                 </cite>
 
diff --git a/templates/web/bathnes/contact/index.html b/templates/web/bathnes/contact/index.html
index f0589bd9e..aaa0d3c57 100644
--- a/templates/web/bathnes/contact/index.html
+++ b/templates/web/bathnes/contact/index.html
@@ -63,7 +63,7 @@
                     [% IF problem.anonymous %]
                         [% tprintf( loc('Reported anonymously at %s'), prettify_dt( problem.confirmed ) ) %]
                     [% ELSE %]
-                        [% tprintf( loc('Reported by %s at %s'), problem.user.name, prettify_dt( problem.confirmed ) ) | html %]
+                        [% tprintf( loc('Reported by %s at %s'), problem.name, prettify_dt( problem.confirmed ) ) | html %]
                     [% END %]
                 </cite>
 
-- 
cgit v1.2.3


From 20cc280dd9f4cd17dadd2f540c6e8c0127ea350d Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 9 Jun 2020 14:57:08 +0100
Subject: [Open311] Use indexed way of searching by body.

---
 perllib/FixMyStreet/App/Controller/Open311.pm | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm
index b4b5d5e3a..b87d3d11c 100644
--- a/perllib/FixMyStreet/App/Controller/Open311.pm
+++ b/perllib/FixMyStreet/App/Controller/Open311.pm
@@ -210,7 +210,7 @@ sub output_requests : Private {
     };
 
     # Look up categories for this council or councils
-    my $problems = $c->cobrand->problems->search( $criteria, $attr );
+    my $problems = $c->stash->{rs}->search( $criteria, $attr );
 
     my %statusmap = (
         map( { $_ => 'open' } FixMyStreet::DB::Result::Problem->open_states() ),
@@ -325,22 +325,6 @@ sub get_requests : Private {
                 'open' => [ FixMyStreet::DB::Result::Problem->open_states() ],
                 'closed' => [ FixMyStreet::DB::Result::Problem->fixed_states(), 'closed' ],
             }->{$value};
-        } elsif ( 'agency_responsible' eq $param ) {
-            my @valuelist;
-            for my $agency (split(/\|/, $value)) {
-                unless ($agency =~ m/^(\d+)$/) {
-                    $c->detach( 'error', [
-                        sprintf(_('Invalid agency_responsible value %s'),
-                            $value)
-                    ] );
-                }
-                my $agencyid = $1;
-                # FIXME This seem to match the wrong entries
-                # some times.  Not sure when or why
-                my $re = "(\\y$agencyid\\y|^$agencyid\\y|\\y$agencyid\$)";
-                push(@valuelist, $re);
-            }
-            $value = \@valuelist;
         } elsif ( 'has_photo' eq $param ) {
             $value = undef;
             $op = '!=' if 'true' eq $value;
@@ -363,6 +347,11 @@ sub get_requests : Private {
         $criteria->{confirmed} = { '<', $c->get_param('end_date') };
     }
 
+    $c->stash->{rs} = $c->cobrand->problems;
+    if (my $bodies = $c->get_param('agency_responsible')) {
+        $c->stash->{rs} = $c->stash->{rs}->to_body([ split(/\|/, $bodies) ]);
+    }
+
     if ('rss' eq $c->stash->{format}) {
         $c->stash->{type} = 'new_problems';
         $c->forward( '/rss/lookup_type' );
@@ -384,7 +373,7 @@ sub rss_query : Private {
         rows => $limit
     };
 
-    my $problems = $c->cobrand->problems->search( $criteria, $attr );
+    my $problems = $c->stash->{rs}->search( $criteria, $attr );
     $c->stash->{problems} = $problems;
 }
 
@@ -411,6 +400,7 @@ sub get_request : Private {
         id => $id,
         non_public => 0,
     };
+    $c->stash->{rs} = $c->cobrand->problems;
     $c->forward( 'output_requests', [ $criteria ] );
 }
 
-- 
cgit v1.2.3


From e1c8f0dadbcdf1f8511ec673c2e6892207fca328 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 9 Jun 2020 14:57:22 +0100
Subject: [Open311] Return reports in all closed states.

---
 CHANGELOG.md                                  | 1 +
 perllib/FixMyStreet/App/Controller/Open311.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bd70243c..6edef1831 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
         - bin/update-schema PostgreSQL 12 compatibility. #3043
         - Make sure category shown in all its groups when reporting.
         - Do not remove any devolved contacts.
+        - Return reports in all closed states through Open311.
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm
index b87d3d11c..31cf84874 100644
--- a/perllib/FixMyStreet/App/Controller/Open311.pm
+++ b/perllib/FixMyStreet/App/Controller/Open311.pm
@@ -323,7 +323,7 @@ sub get_requests : Private {
         if ( 'status' eq $param ) {
             $value = {
                 'open' => [ FixMyStreet::DB::Result::Problem->open_states() ],
-                'closed' => [ FixMyStreet::DB::Result::Problem->fixed_states(), 'closed' ],
+                'closed' => [ FixMyStreet::DB::Result::Problem->fixed_states(), FixMyStreet::DB::Result::Problem->closed_states() ],
             }->{$value};
         } elsif ( 'has_photo' eq $param ) {
             $value = undef;
-- 
cgit v1.2.3


From 6088d10642da56cbea96446da9d9cd87c922ede5 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 9 Jun 2020 15:18:16 +0100
Subject: [Highways England] Anonymize all names on cobrand.

---
 perllib/FixMyStreet/App/Controller/JSON.pm     |  1 +
 perllib/FixMyStreet/App/Controller/Open311.pm  |  2 ++
 perllib/FixMyStreet/App/Controller/Report.pm   |  2 ++
 perllib/FixMyStreet/Cobrand/HighwaysEngland.pm |  9 +++++++++
 t/cobrand/highwaysengland.t                    | 18 +++++++++++-------
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/JSON.pm b/perllib/FixMyStreet/App/Controller/JSON.pm
index a7913bb4b..4657fcf2c 100644
--- a/perllib/FixMyStreet/App/Controller/JSON.pm
+++ b/perllib/FixMyStreet/App/Controller/JSON.pm
@@ -101,6 +101,7 @@ sub problems : Local {
     } );
 
     foreach my $problem (@problems) {
+        $c->cobrand->call_hook(munge_problem_list => $problem);
         $problem->name( '' ) if $problem->anonymous == 1;
         $problem->service( 'Web interface' ) if $problem->service eq '';
         my $body_names = $problem->body_names;
diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm
index 31cf84874..73a91a62a 100644
--- a/perllib/FixMyStreet/App/Controller/Open311.pm
+++ b/perllib/FixMyStreet/App/Controller/Open311.pm
@@ -220,6 +220,8 @@ sub output_requests : Private {
 
     my @problemlist;
     while ( my $problem = $problems->next ) {
+        $c->cobrand->call_hook(munge_problem_list => $problem);
+
         my $id = $problem->id;
 
         $problem->service( 'Web interface' ) unless $problem->service;
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 4d8794c59..4f9825cae 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -197,6 +197,7 @@ sub load_problem_or_display_error : Private {
         }
     }
 
+    $c->cobrand->call_hook(munge_problem_list => $problem);
     $c->stash->{problem} = $problem;
     if ( $c->user_exists && $c->user->can_moderate($problem) ) {
         $c->stash->{problem_original} = $problem->find_or_new_related(
@@ -251,6 +252,7 @@ sub load_updates : Private {
     my @combined;
     my %questionnaires_with_updates;
     while (my $update = $updates->next) {
+        $c->cobrand->call_hook(munge_update_list => $update);
         push @combined, [ $update->confirmed, $update ];
         if (my $qid = $update->get_extra_metadata('questionnaire_id')) {
             $questionnaires_with_updates{$qid} = $update;
diff --git a/perllib/FixMyStreet/Cobrand/HighwaysEngland.pm b/perllib/FixMyStreet/Cobrand/HighwaysEngland.pm
index ed58eb4f7..c282ac5ea 100644
--- a/perllib/FixMyStreet/Cobrand/HighwaysEngland.pm
+++ b/perllib/FixMyStreet/Cobrand/HighwaysEngland.pm
@@ -29,6 +29,15 @@ sub users_restriction { FixMyStreet::Cobrand::UKCouncils::users_restriction($_[0
 sub updates_restriction { FixMyStreet::Cobrand::UKCouncils::updates_restriction($_[0], $_[1]) }
 sub base_url { FixMyStreet::Cobrand::UKCouncils::base_url($_[0]) }
 
+sub munge_problem_list {
+    my ($self, $problem) = @_;
+    $problem->anonymous(1);
+}
+sub munge_update_list {
+    my ($self, $update) = @_;
+    $update->anonymous(1);
+}
+
 sub admin_allow_user {
     my ( $self, $user ) = @_;
     return 1 if $user->is_superuser;
diff --git a/t/cobrand/highwaysengland.t b/t/cobrand/highwaysengland.t
index f6400ea7c..0b71c613f 100644
--- a/t/cobrand/highwaysengland.t
+++ b/t/cobrand/highwaysengland.t
@@ -29,12 +29,11 @@ my $highways = $mech->create_body_ok(2234, 'Highways England');
 
 $mech->create_contact_ok(email => 'highways@example.com', body_id => $highways->id, category => 'Pothole');
 
-# Br1 3UH
-subtest "check where heard from saved" => sub {
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => 'highwaysengland',
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
+FixMyStreet::override_config {
+    ALLOWED_COBRANDS => 'highwaysengland',
+    MAPIT_URL => 'http://mapit.uk/',
+}, sub {
+    subtest "check where heard from saved" => sub {
         $mech->get_ok('/around');
         $mech->submit_form_ok( { with_fields => { pc => 'M1, J16', } }, "submit location" );
         $mech->follow_link_ok( { text_regex => qr/skip this step/i, },
@@ -64,7 +63,12 @@ subtest "check where heard from saved" => sub {
         like $mech->get_text_body_from_email($email), qr/Heard from: Facebook/, 'where hear included in email'
 
     };
-};
 
+    subtest "check anonymous display" => sub {
+        my ($problem) = $mech->create_problems_for_body(1, $highways->id, 'Title');
+        $mech->get_ok('/report/' . $problem->id);
+        $mech->content_lacks('Reported by Test User at');
+    };
+};
 
 done_testing();
-- 
cgit v1.2.3


From 931f391ddc521a5dc76a2747a1cf3663431631e8 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 9 Jun 2020 17:17:36 +0100
Subject: Add recaptcha config option to example file.

---
 conf/general.yml-example | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/general.yml-example b/conf/general.yml-example
index 91507b03d..26399bb81 100644
--- a/conf/general.yml-example
+++ b/conf/general.yml-example
@@ -244,6 +244,9 @@ TESTING_COUNCILS: ''
 # if you're using Message Manager, include the URL here (see https://github.com/mysociety/message-manager/)
 MESSAGE_MANAGER_URL: ''
 
+# If you set up using recaptcha, you can put its configuration keys here
+RECAPTCHA: ''
+
 # If you want to use SMS login or 'report as' with just a phone number, you'll
 # need to set the site's two-digit ISO 3166 country code (e.g. GB) here.
 PHONE_COUNTRY: ''
-- 
cgit v1.2.3


From 6b2af7944bb7d07411fe9375fef535c8248b46d1 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 9 Jun 2020 17:26:10 +0100
Subject: [fixmystreet.com] Include script nonce in new script element.

---
 templates/web/fixmystreet.com/auth/form_extra.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/web/fixmystreet.com/auth/form_extra.html b/templates/web/fixmystreet.com/auth/form_extra.html
index 8e96b447c..92cc31050 100644
--- a/templates/web/fixmystreet.com/auth/form_extra.html
+++ b/templates/web/fixmystreet.com/auth/form_extra.html
@@ -1,4 +1,4 @@
 [% IF c.cobrand.requires_recaptcha %]
-    <script src="https://www.google.com/recaptcha/api.js" async defer></script>
+    <script nonce="[% csp_nonce %]" src="https://www.google.com/recaptcha/api.js" async defer></script>
     <div class="g-recaptcha" data-sitekey="[% c.config.RECAPTCHA.site_key %]"></div>
 [% END %]
-- 
cgit v1.2.3


From 476781624d03b8ae57f456206465fd3fb2e45e97 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 10 Jun 2020 14:31:10 +0100
Subject: [TfL] Update front page text.

---
 templates/web/tfl/front/pre-steps.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/web/tfl/front/pre-steps.html b/templates/web/tfl/front/pre-steps.html
index ee22f4978..1dead5c89 100644
--- a/templates/web/tfl/front/pre-steps.html
+++ b/templates/web/tfl/front/pre-steps.html
@@ -6,6 +6,7 @@
         safety critical issues.
     </strong>
     <br>
-    We will continue to serve you the best that we can but urge everyone not to
-    make journeys unless absolutely necessary.
+    If you are concerned about pavement overcrowding during social distancing
+    on the Transport for London Road Network, you can now report that to us
+    here.
 </p>
-- 
cgit v1.2.3


From fa49a5ec148e975d98df1138e0688410cf81d9b3 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 2 Jun 2020 13:05:25 +0100
Subject: [Bath,Bristol] No need for special hidden overrides.

---
 perllib/FixMyStreet/Cobrand/BathNES.pm | 8 --------
 perllib/FixMyStreet/Cobrand/Bristol.pm | 2 ++
 perllib/FixMyStreet/Cobrand/UK.pm      | 6 ------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/BathNES.pm b/perllib/FixMyStreet/Cobrand/BathNES.pm
index 06095734b..10e74056f 100644
--- a/perllib/FixMyStreet/Cobrand/BathNES.pm
+++ b/perllib/FixMyStreet/Cobrand/BathNES.pm
@@ -90,14 +90,6 @@ sub send_questionnaires { 0 }
 
 sub default_map_zoom { 3 }
 
-sub category_extra_hidden {
-    my ($self, $meta) = @_;
-    my $code = $meta->{code};
-    # These two are used in the non-Open311 'Street light fault' category.
-    return 1 if $code eq 'unitid' || $code eq 'asset_details';
-    return $self->SUPER::category_extra_hidden($meta);
-}
-
 sub available_permissions {
     my $self = shift;
 
diff --git a/perllib/FixMyStreet/Cobrand/Bristol.pm b/perllib/FixMyStreet/Cobrand/Bristol.pm
index 6e3160c89..7e85a3315 100644
--- a/perllib/FixMyStreet/Cobrand/Bristol.pm
+++ b/perllib/FixMyStreet/Cobrand/Bristol.pm
@@ -68,8 +68,10 @@ sub open311_contact_meta_override {
     $service->{group} = [];
 
     my %server_set = (easting => 1, northing => 1);
+    my %hidden_field = (usrn => 1, asset_id => 1);
     foreach (@$meta) {
         $_->{automated} = 'server_set' if $server_set{$_->{code}};
+        $_->{automated} = 'hidden_field' if $hidden_field{$_->{code}};
     }
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index 4c62dd538..322b257a7 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -408,12 +408,6 @@ sub lookup_by_ref_regex {
     return qr/^\s*(\d+)\s*$/;
 }
 
-sub category_extra_hidden {
-    my ($self, $meta) = @_;
-    return 1 if $meta->{code} eq 'usrn' || $meta->{code} eq 'asset_id';
-    return $self->SUPER::category_extra_hidden($meta);
-}
-
 sub report_new_munge_before_insert {
     my ($self, $report) = @_;
 
-- 
cgit v1.2.3


From 4d0a57b172c44d4f880bb560f7a876aff3ccae27 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Fri, 20 Mar 2020 14:07:54 +0000
Subject: [Bexley] Redesign.

Make sure spans in navbar are legible at all times.
---
 web/cobrands/bexley/_colours.scss |  6 ++---
 web/cobrands/bexley/layout.scss   | 47 ++++++++++++++++++++++++++++++++++++---
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/web/cobrands/bexley/_colours.scss b/web/cobrands/bexley/_colours.scss
index 615ef65a4..453623fb5 100644
--- a/web/cobrands/bexley/_colours.scss
+++ b/web/cobrands/bexley/_colours.scss
@@ -40,9 +40,9 @@ $primary_text: $text_black;
 $base_bg: $white;
 $base_fg: $text_black;
 
-$nav_background_colour: $fuchsia;
-$nav_colour: $white;
-$nav_hover_background_colour: darken($fuchsia, 10%);
+$nav_background_colour: $white;
+$nav_colour: $text_black;
+$nav_hover_background_colour: $fuchsia_lt;
 
 $col_click_map: $aqua;
 
diff --git a/web/cobrands/bexley/layout.scss b/web/cobrands/bexley/layout.scss
index 948b01443..c18574bd5 100644
--- a/web/cobrands/bexley/layout.scss
+++ b/web/cobrands/bexley/layout.scss
@@ -6,6 +6,10 @@ body.twothirdswidthpage .content .sticky-sidebar aside {
     top: 10em;
 }
 
+#site-header {
+    border-top: 7px solid $fuchsia;
+}
+
 #site-logo {
     width: 208px;
     height: 80px;
@@ -18,10 +22,47 @@ body.twothirdswidthpage .content .sticky-sidebar aside {
     color: $fuchsia_lt;
 }
 
+.frontpage {
+    .nav-menu--main {
+        margin: 3em 0 0 0;
+    }
+}
+
 .nav-menu--main {
-  span {
-    background-color: $nav_hover_background_colour;
-  }
+    a {
+        &:hover,
+        &:active,
+        &:focus {
+            color: $text_black;
+        }
+    }
+    a.report-a-problem-btn,
+    span.report-a-problem-btn,
+    span {
+        background-color: $nav_hover_background_colour;
+        color: $text_black;
+        border-radius: 0;
+        &:hover {
+            color: $fuchsia;
+            cursor: pointer;
+        }
+    }
+    a[href='/auth'] {
+        position: absolute;
+        top: 0;
+        right: 1em;
+        .frontpage & {
+            right: 0;
+        }
+        background-color: $fuchsia;
+        color: $white;
+        padding: 0 0.75em;
+        &:hover,
+        &:active,
+        &:focus {
+            color: $white;
+        }
+    }
 }
 
 .general-notes {
-- 
cgit v1.2.3


From 368d1513eca9423edaba3ddff20af2364d54b7c2 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 11 Jun 2020 16:42:34 +0100
Subject: [TfL] Add new Streetspace category, TLRN-only.

---
 perllib/FixMyStreet/Cobrand/TfL.pm | 1 +
 web/cobrands/tfl/assets.js         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm
index da762e386..c37b9a0e5 100644
--- a/perllib/FixMyStreet/Cobrand/TfL.pm
+++ b/perllib/FixMyStreet/Cobrand/TfL.pm
@@ -494,6 +494,7 @@ sub _tlrn_categories { [
     "Single Light out (street light)",
     "Standing water",
     "Street Light - Equipment damaged, pole leaning",
+    "Streetspace Suggestions and Feedback",
     "Unstable hoardings",
     "Unstable scaffolding",
     "Worn out road markings",
diff --git a/web/cobrands/tfl/assets.js b/web/cobrands/tfl/assets.js
index b47769b6f..9eb197da8 100644
--- a/web/cobrands/tfl/assets.js
+++ b/web/cobrands/tfl/assets.js
@@ -72,6 +72,7 @@ var tlrn_categories = [
     "Single Light out (street light)",
     "Standing water",
     "Street Light - Equipment damaged, pole leaning",
+    "Streetspace Suggestions and Feedback",
     "Unstable hoardings",
     "Unstable scaffolding",
     "Worn out road markings"
-- 
cgit v1.2.3


From 251acf7799e78fd46a39154f0381c7470d5542a9 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 11 Jun 2020 17:25:49 +0100
Subject: Skip accounts without email for inactive emails.

---
 CHANGELOG.md                           | 1 +
 perllib/FixMyStreet/Script/Inactive.pm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf3bfae5d..2413892c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
         - Do not remove any devolved contacts.
         - Fix double encoding of per-category templates.
         - Return reports in all closed states through Open311.
+        - Skip accounts without email when sending inactive emails.
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/FixMyStreet/Script/Inactive.pm b/perllib/FixMyStreet/Script/Inactive.pm
index 4d28057d4..6b3372a2b 100644
--- a/perllib/FixMyStreet/Script/Inactive.pm
+++ b/perllib/FixMyStreet/Script/Inactive.pm
@@ -185,6 +185,7 @@ sub email_inactive_users {
     });
     while (my $user = $users->next) {
         next if $user->get_extra_metadata('inactive_email_sent');
+        next unless $user->email && $user->email_verified;
 
         say "Emailing user #" . $user->id if $self->verbose;
         next if $self->dry_run;
-- 
cgit v1.2.3


From b39b8dd5d579b195da2bb2e81bbacea552e09216 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 2 Mar 2020 14:14:56 +0000
Subject: [UK Councils] Enable private photo uploading on cobrands whose
 backend supports it

For https://github.com/mysociety/fixmystreet-commercial/issues/1778
---
 perllib/FixMyStreet/Cobrand/IsleOfWight.pm  | 7 +++++++
 perllib/FixMyStreet/Cobrand/Lincolnshire.pm | 7 +++++++
 perllib/FixMyStreet/Cobrand/Peterborough.pm | 7 +++++++
 3 files changed, 21 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/IsleOfWight.pm b/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
index ee1a25465..08741639c 100644
--- a/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
+++ b/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
@@ -77,6 +77,13 @@ sub open311_pre_send {
 # Make sure fetched report description isn't shown.
 sub filter_report_description { "" }
 
+around 'open311_config' => sub {
+    my ($orig, $self, $row, $h, $params) = @_;
+
+    $params->{upload_files} = 1;
+    $self->$orig($row, $h, $params);
+};
+
 sub open311_munge_update_params {
     my ($self, $params, $comment, $body) = @_;
 
diff --git a/perllib/FixMyStreet/Cobrand/Lincolnshire.pm b/perllib/FixMyStreet/Cobrand/Lincolnshire.pm
index ee40bb173..d1fe319e1 100644
--- a/perllib/FixMyStreet/Cobrand/Lincolnshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Lincolnshire.pm
@@ -77,4 +77,11 @@ sub pin_colour {
     return 'yellow';
 }
 
+around 'open311_config' => sub {
+    my ($orig, $self, $row, $h, $params) = @_;
+
+    $params->{upload_files} = 1;
+    $self->$orig($row, $h, $params);
+};
+
 1;
diff --git a/perllib/FixMyStreet/Cobrand/Peterborough.pm b/perllib/FixMyStreet/Cobrand/Peterborough.pm
index 133767fa7..1bd0c83fb 100644
--- a/perllib/FixMyStreet/Cobrand/Peterborough.pm
+++ b/perllib/FixMyStreet/Cobrand/Peterborough.pm
@@ -89,4 +89,11 @@ sub open311_munge_update_params {
     $params->{service_code} = $contact->email;
 }
 
+around 'open311_config' => sub {
+    my ($orig, $self, $row, $h, $params) = @_;
+
+    $params->{upload_files} = 1;
+    $self->$orig($row, $h, $params);
+};
+
 1;
-- 
cgit v1.2.3


From 9553c8daac73f06af704a87ace7294f751a77b8f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Sat, 23 May 2020 11:38:25 +0100
Subject: Add lazy image loading on list items.

---
 CHANGELOG.md                                    |   2 +
 templates/web/base/common_scripts.html          |   2 +
 templates/web/base/report/_item.html            |   4 +-
 templates/web/base/report/_item_expandable.html |   4 +-
 web/js/loading-attribute-polyfill.js            | 213 ++++++++++++++++++++++++
 web/js/map-OpenLayers.js                        |   3 +
 6 files changed, 226 insertions(+), 2 deletions(-)
 create mode 100644 web/js/loading-attribute-polyfill.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2413892c1..0ae55f306 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 * Unreleased
     - New features:
         - Add Open Location Codes support to search box. #3047
+    - Front end improvements:
+        - Add lazy image loading on list items.
     - Changes:
         - Mark user as active when sent an email alert.
     - Bugfixes:
diff --git a/templates/web/base/common_scripts.html b/templates/web/base/common_scripts.html
index b8c4db343..32ec9b00f 100644
--- a/templates/web/base/common_scripts.html
+++ b/templates/web/base/common_scripts.html
@@ -13,6 +13,7 @@ IF bodyclass.match('frontpage');
     scripts.push(
         version('/js/front.js'),
         version('/js/geolocation.js'),
+        version('/js/loading-attribute-polyfill.js'),
     );
 ELSIF bodyclass.match('alertpage');
     scripts.push(
@@ -64,6 +65,7 @@ IF bodyclass.match('mappage');
         version('/cobrands/fixmystreet/map.js'),
         version('/vendor/dropzone.min.js'),
         version('/vendor/fancybox/jquery.fancybox-1.3.4.pack.js'),
+        version('/js/loading-attribute-polyfill.js'),
     );
 ELSE;
     scripts.push(
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index baba04d3e..6f567de01 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -50,7 +50,9 @@ END;
     [% PROCESS 'report/_item_photo_title.html' ~%]
   [% CATCH file ~%]
     [% IF problem.photo %]
-        <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt="">
+        <noscript class="loading-lazy">
+            <img loading="lazy" class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt="">
+        </noscript>
     [% END %]
       [% TRY %]
         [% PROCESS 'report/_item_heading.html' %]
diff --git a/templates/web/base/report/_item_expandable.html b/templates/web/base/report/_item_expandable.html
index fad935407..ab363482a 100644
--- a/templates/web/base/report/_item_expandable.html
+++ b/templates/web/base/report/_item_expandable.html
@@ -18,7 +18,9 @@
 
   [% IF problem.photo %]
     <a href="[% c.cobrand.relative_url_for_report( problem ) %][% problem.url %]" class="item-list__item--expandable__hide-when-expanded">
-        <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt="">
+        <noscript class="loading-lazy">
+            <img loading="lazy" class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt="">
+        </noscript>
     </a>
   [% END %]
 
diff --git a/web/js/loading-attribute-polyfill.js b/web/js/loading-attribute-polyfill.js
new file mode 100644
index 000000000..f11397985
--- /dev/null
+++ b/web/js/loading-attribute-polyfill.js
@@ -0,0 +1,213 @@
+/*
+ * Loading attribute polyfill - https://github.com/mfranzke/loading-attribute-polyfill
+ * @license Copyright(c) 2019 by Maximilian Franzke
+ * Credits for the initial kickstarter / script to @Sora2455, and supported by @cbirdsong, @eklingen, @DaPo, @nextgenthemes, @diogoterremoto, @dracos, @Flimm, @TomS- and @vinyfc93 - many thanks for that !
+ */
+/*
+ * A minimal and dependency-free vanilla JavaScript loading attribute polyfill.
+ * Supports standard's functionality and tests for native support upfront.
+ * Elsewhere the functionality gets emulated with the support of noscript wrapper tags.
+ * Use an IntersectionObserver polyfill in case of IE11 support necessary.
+ *
+ * MS - Removed iframe/picture/srcset parts, unneeded at present, and added external API
+ */
+
+(function () {
+	'use strict';
+
+	var config = {
+		// Start download if the item gets within 256px in the Y axis
+		rootMargin: '256px 0px',
+		threshold: 0.01
+	};
+
+	// Device/browser capabilities object
+	var capabilities = {
+		loading: 'loading' in HTMLImageElement.prototype,
+		scrolling: 'onscroll' in window
+	};
+
+	// Nodelist foreach polyfill / source: https://stackoverflow.com/a/46929259
+	if (
+		typeof NodeList !== 'undefined' &&
+		NodeList.prototype &&
+		!NodeList.prototype.forEach
+	) {
+		// Yes, there's really no need for `Object.defineProperty` here
+		NodeList.prototype.forEach = Array.prototype.forEach;
+	}
+
+	// Define according to browsers support of the IntersectionObserver feature (missing e.g. on IE11 or Safari 11)
+	var intersectionObserver;
+
+	if ('IntersectionObserver' in window) {
+		intersectionObserver = new IntersectionObserver(onIntersection, config);
+	}
+
+	// On using a browser w/o requestAnimationFrame support (IE9, Opera Mini), just run the passed function
+	var rAFWrapper;
+
+	if ('requestAnimationFrame' in window) {
+		rAFWrapper = window.requestAnimationFrame;
+	} else {
+		rAFWrapper = function (func) {
+			func();
+		};
+	}
+
+	/**
+	 * Put the source back where it belongs - now that the elements content is attached to the document, it will load now
+	 * @param {Object} lazyItem Current item to be restored after lazy loading.
+	 */
+	function restoreSource(lazyItem) {
+		lazyItem.setAttribute('src', lazyItem.getAttribute('data-lazy-src'));
+		lazyItem.removeAttribute('data-lazy-src'); // Not using delete .dataset here for compatibility down to IE9
+	}
+
+	/**
+	 * Handle IntersectionObservers callback
+	 * @param {Object} entries Target elements Intersection observed changes
+	 * @param {Object} observer IntersectionObserver instance reference
+	 */
+	function onIntersection(entries, observer) {
+		entries.forEach(function (entry) {
+			// Mitigation for EDGE lacking support of .isIntersecting until v15, compare to e.g. https://github.com/w3c/IntersectionObserver/issues/211#issuecomment-309144669
+			if (entry.intersectionRatio === 0) {
+				return;
+			}
+
+			// If the item is visible now, load it and stop watching it
+			var lazyItem = entry.target;
+
+			observer.unobserve(lazyItem);
+
+			restoreSource(lazyItem);
+		});
+	}
+
+	/**
+	 * Handle printing the page
+	 */
+	function onPrinting() {
+		if (typeof window.matchMedia === 'undefined') {
+			return;
+		}
+
+		var mediaQueryList = window.matchMedia('print');
+
+		mediaQueryList.addListener(function (mql) {
+			if (mql.matches) {
+				document
+					.querySelectorAll('img[loading="lazy"][data-lazy-src]')
+					.forEach(function (lazyItem) {
+						restoreSource(lazyItem);
+					});
+			}
+		});
+	}
+
+	/**
+	 * Get and prepare the HTML code depending on feature detection,
+	 * and if not scrolling supported, because it's a Google or Bing Bot
+	 * @param {String} lazyAreaHtml Noscript inner HTML code that src-urls need to get rewritten
+	 */
+	function getAndPrepareHTMLCode(noScriptTag) {
+		// The contents of a <noscript> tag are treated as text to JavaScript
+		var lazyAreaHtml = noScriptTag.textContent || noScriptTag.innerHTML;
+
+		var getImageWidth = lazyAreaHtml.match(/width=['"](\d+)['"]/) || false;
+		var temporaryImageWidth = getImageWidth[1] || 1;
+		var getImageHeight = lazyAreaHtml.match(/height=['"](\d+)['"]/) || false;
+		var temporaryImageHeight = getImageHeight[1] || 1;
+
+		var temporaryImage =
+			'data:image/svg+xml,%3Csvg xmlns=%27http://www.w3.org/2000/svg%27 viewBox=%270 0 ' +
+			temporaryImageWidth +
+			' ' +
+			temporaryImageHeight +
+			'%27%3E%3C/svg%3E';
+
+		if (!capabilities.loading && capabilities.scrolling) {
+			// Check for IntersectionObserver support
+			if (typeof intersectionObserver === 'undefined') {
+				// Attach abandonned attribute 'lazyload' to the HTML tags on browsers w/o IntersectionObserver being available
+				lazyAreaHtml = lazyAreaHtml.replace(
+					/(?:\r\n|\r|\n|\t| )src=/g,
+					' lazyload="1" src='
+				);
+			} else {
+				// Temporarily replace a expensive resource load with a simple one by storing the actual source for later and point src to a temporary replacement (data URI)
+				lazyAreaHtml = lazyAreaHtml
+					.replace(
+						/(?:\r\n|\r|\n|\t| )src=/g,
+						' src="' + temporaryImage + '" data-lazy-src='
+					);
+			}
+		}
+
+		return lazyAreaHtml;
+	}
+
+	/**
+	 * Retrieve the elements from the 'lazy load' <noscript> tag and prepare them for display
+	 * @param {Object} noScriptTag noscript HTML tag that should get initially transformed
+	 */
+	function prepareElement(noScriptTag) {
+		// Sticking the noscript HTML code in the innerHTML of a new <div> tag to 'load' it after creating that <div>
+		var lazyArea = document.createElement('div');
+
+		lazyArea.innerHTML = getAndPrepareHTMLCode(noScriptTag);
+
+		// Move all children out of the element
+		while (lazyArea.firstChild) {
+			if (
+				!capabilities.loading &&
+				capabilities.scrolling &&
+				typeof intersectionObserver !== 'undefined' &&
+				lazyArea.firstChild.tagName &&
+				lazyArea.firstChild.tagName.toLowerCase() === 'img'
+			) {
+				// Observe the item so that loading could start when it gets close to the viewport
+				intersectionObserver.observe(lazyArea.firstChild);
+			}
+
+			noScriptTag.parentNode.insertBefore(lazyArea.firstChild, noScriptTag);
+		}
+
+		// Remove the empty element - not using .remove() here for IE11 compatibility
+		noScriptTag.parentNode.removeChild(noScriptTag); // Preferred .removeChild over .remove here for IE
+	}
+
+	/* Add a function we can call externally */
+	fixmystreet.loading_recheck = function() {
+		var lazyLoadAreas = document.querySelectorAll('noscript.loading-lazy');
+		lazyLoadAreas.forEach(prepareElement);
+	};
+
+	/**
+	 * Get all the <noscript> tags on the page and setup the printing
+	 */
+	function prepareElements() {
+		fixmystreet.loading_recheck();
+
+		// Bind for someone printing the page
+		onPrinting();
+	}
+
+	// If the page has loaded already, run setup - if it hasn't, run as soon as it has.
+	// Use requestAnimationFrame as this will propably cause repaints
+	// document.readyState values: https://www.w3schools.com/jsref/prop_doc_readystate.asp
+	if (/comp|inter/.test(document.readyState)) {
+		rAFWrapper(prepareElements);
+	} else if ('addEventListener' in document) {
+		document.addEventListener('DOMContentLoaded', function () {
+			rAFWrapper(prepareElements);
+		});
+	} else {
+		document.attachEvent('onreadystatechange', function () {
+			if (document.readyState === 'complete') {
+				prepareElements();
+			}
+		});
+	}
+})();
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 182cd79a1..d5fd36e97 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -1278,6 +1278,9 @@ OpenLayers.Format.FixMyStreet = OpenLayers.Class(OpenLayers.Format.JSON, {
         var reports_list;
         if (typeof(obj.reports_list) != 'undefined' && (reports_list = document.getElementById('js-reports-list'))) {
             reports_list.innerHTML = obj.reports_list;
+            if (fixmystreet.loading_recheck) {
+                fixmystreet.loading_recheck();
+            }
             if ( $('.item-list--reports').data('show-old-reports') ) {
                 $('#show_old_reports_wrapper').removeClass('hidden');
             } else {
-- 
cgit v1.2.3


From 89bfe7226a2c2202e8151aa32c7648dad9f9f038 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 15 Jun 2020 12:11:31 +0100
Subject: [Buckinghamshire] Spot lights e.g. ending with "A"

---
 web/cobrands/buckinghamshire/assets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js
index 1030d11db..2ac084193 100644
--- a/web/cobrands/buckinghamshire/assets.js
+++ b/web/cobrands/buckinghamshire/assets.js
@@ -63,7 +63,7 @@ var labeled_defaults = $.extend(true, {}, defaults, {
     stylemap: streetlight_stylemap,
     asset_item_message: 'You can pick a <b class="asset-spot">ITEM</b> from the map &raquo;',
     construct_asset_name: function(id) {
-        var code = id.replace(/[0-9]/g, '');
+        var code = id.replace(/[O0-9]+[A-Z]*/g, '');
         return {id: id, name: streetlight_code_to_type[code]};
     },
     actions: {
-- 
cgit v1.2.3


From dae0ca4686c5613800df5bb792fe803b952f6bde Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 15 Jun 2020 13:05:40 +0100
Subject: Small refactor of asset message display.

Wherever asset_item_message is checked/used, make sure it does
the text replacement and falls back to the default.
---
 web/cobrands/fixmystreet/assets.js | 84 ++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index e816fb4e5..eda9bb276 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -402,12 +402,13 @@ function check_zoom_message_visibility() {
     if (this.fixmystreet.non_interactive && !this.fixmystreet.display_zoom_message) {
         return;
     }
-    var select = this.fixmystreet.asset_group ? 'category_group' : 'form_category';
-    var category = $("select#" + select).val() || '',
-        prefix = category.replace(/[^a-z]/gi, ''),
-        id = "category_meta_message_" + prefix,
-        $p = $('#' + id);
     if (this.relevant()) {
+        var select = this.fixmystreet.asset_group ? 'category_group' : 'form_category',
+            category = $("select#" + select).val() || '',
+            prefix = category.replace(/[^a-z]/gi, ''),
+            id = "category_meta_message_" + prefix,
+            $p = $('#' + id),
+            message;
         if ($p.length === 0) {
             $p = $("<p>").prop("id", id).prop('class', 'category_meta_message');
             if ($('html').hasClass('mobile')) {
@@ -419,30 +420,48 @@ function check_zoom_message_visibility() {
         }
 
         if (this.getVisibility() && this.inRange) {
-            if (typeof this.fixmystreet.asset_item_message !== 'undefined') {
-                $p.html(this.fixmystreet.asset_item_message);
-            } else {
-                $p.html('You can pick a <b class="asset-' + this.fixmystreet.asset_type + '">' + this.fixmystreet.asset_item + '</b> from the map &raquo;');
-            }
+            message = get_asset_pick_message.call(this);
         } else {
-            $p.html('Zoom in to pick a ' + this.fixmystreet.asset_item + ' from the map');
+            message = 'Zoom in to pick a ' + this.fixmystreet.asset_item + ' from the map';
         }
+        $p.html(message);
+    } else {
+        update_message_display.call(this, null);
+    }
+}
 
-    } else if (this.fixmystreet.asset_group) {
-        prefix = this.fixmystreet.asset_group.replace(/[^a-z]/gi, '');
-        id = "category_meta_message_" + prefix;
-        $p = $('#' + id);
-        $p.remove();
+function get_asset_pick_message() {
+    var message;
+    if (typeof this.fixmystreet.asset_item_message !== 'undefined') {
+        message = this.fixmystreet.asset_item_message;
+        message = message.replace('ITEM', this.fixmystreet.asset_item);
+    } else {
+        message = 'You can pick a <b class="asset-' + this.fixmystreet.asset_type + '">' + this.fixmystreet.asset_item + '</b> from the map &raquo;';
+    }
+    return message;
+}
+
+function update_message_display(message) {
+    if (this.fixmystreet.asset_group) {
+        _update_message(message, this.fixmystreet.asset_group);
     } else {
         $.each(this.fixmystreet.asset_category, function(i, c) {
-            var prefix = c.replace(/[^a-z]/gi, ''),
-                id = "category_meta_message_" + prefix,
-                $p = $('#' + id);
-            $p.remove();
+            _update_message(message, c);
         });
     }
 }
 
+function _update_message(message, c) {
+    var prefix = c.replace(/[^a-z]/gi, ''),
+        id = "category_meta_message_" + prefix,
+        $p = $('#' + id);
+    if (message) {
+        $p.html(message);
+    } else {
+        $p.remove();
+    }
+}
+
 function layer_visibilitychanged() {
     if (this.fixmystreet.road) {
         if (!this.getVisibility()) {
@@ -818,34 +837,21 @@ fixmystreet.assets = {
     },
     named_select_action_found: function(asset) {
         var id = asset.attributes[this.fixmystreet.feature_code] || '';
+        var message;
         if (id !== '') {
             var data = { id: id, name: this.fixmystreet.asset_item };
             if (this.fixmystreet.construct_asset_name) {
                 data = this.fixmystreet.construct_asset_name(id) || data;
             }
-            $('.category_meta_message').html('You have selected ' + data.name + ' <b>' + data.id + '</b>');
+            message = 'You have selected ' + data.name + ' <b>' + data.id + '</b>';
         } else {
-            var message = this.fixmystreet.asset_item_message;
-            message = message.replace('ITEM', this.fixmystreet.asset_item);
-            $('.category_meta_message').html(message);
+            message = get_asset_pick_message.call(this);
         }
+        $('.category_meta_message').html(message);
     },
     named_select_action_not_found: function() {
-        var message = this.fixmystreet.asset_item_message;
-        message = message.replace('ITEM', this.fixmystreet.asset_item);
-        if (this.fixmystreet.asset_group) {
-            var prefix = this.fixmystreet.asset_group.replace(/[^a-z]/gi, '');
-            var id = "category_meta_message_" + prefix;
-            var $p = $('#' + id);
-            $p.html(message);
-        } else {
-            $.each(this.fixmystreet.asset_category, function(i, c) {
-                var prefix = c.replace(/[^a-z]/gi, ''),
-                    id = "category_meta_message_" + prefix,
-                    $p = $('#' + id);
-                $p.html(message);
-            });
-        }
+        var message = get_asset_pick_message.call(this);
+        update_message_display.call(this, message);
     },
 
     selectedFeature: function() {
-- 
cgit v1.2.3


From a2b1c1a19327fea4c9a0688cf67affb34ce08726 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 15 Jun 2020 13:19:22 +0100
Subject: [UK Councils] Config matches default.

With the refactor to make sure asset message always uses the default, no
need for these specific config lines any more.
---
 .cypress/cypress/integration/peterborough.js | 2 +-
 web/cobrands/buckinghamshire/assets.js       | 1 -
 web/cobrands/cheshireeast/assets.js          | 3 +--
 web/cobrands/hounslow/assets.js              | 1 -
 web/cobrands/peterborough/assets.js          | 1 -
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.cypress/cypress/integration/peterborough.js b/.cypress/cypress/integration/peterborough.js
index be1515028..452795d8c 100644
--- a/.cypress/cypress/integration/peterborough.js
+++ b/.cypress/cypress/integration/peterborough.js
@@ -33,7 +33,7 @@ describe('new report form', function() {
 
   it('correctly changes the asset select message', function() {
     cy.get('select:eq(4)').select('Street lighting');
-    cy.get('.category_meta_message').should('contain', 'You can pick a street light from the map');
+    cy.get('.category_meta_message').should('contain', 'You can pick a light from the map');
     cy.get('select:eq(4)').select('Trees');
     cy.get('.category_meta_message').should('contain', 'You can pick a tree from the map');
   });
diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js
index 2ac084193..7c8995e41 100644
--- a/web/cobrands/buckinghamshire/assets.js
+++ b/web/cobrands/buckinghamshire/assets.js
@@ -61,7 +61,6 @@ var labeled_defaults = $.extend(true, {}, defaults, {
     select_action: true,
     feature_code: 'feature_id',
     stylemap: streetlight_stylemap,
-    asset_item_message: 'You can pick a <b class="asset-spot">ITEM</b> from the map &raquo;',
     construct_asset_name: function(id) {
         var code = id.replace(/[O0-9]+[A-Z]*/g, '');
         return {id: id, name: streetlight_code_to_type[code]};
diff --git a/web/cobrands/cheshireeast/assets.js b/web/cobrands/cheshireeast/assets.js
index d9eb25821..4e5df342d 100644
--- a/web/cobrands/cheshireeast/assets.js
+++ b/web/cobrands/cheshireeast/assets.js
@@ -42,8 +42,7 @@ fixmystreet.assets.add(labeled_defaults, {
     filter_key: 'feature_gr',
     filter_value: 'LCOL',
     asset_group: 'Street lights',
-    asset_item: 'street light',
-    asset_item_message: 'You can pick a <b class="asset-spot">street light</b> from the map &raquo;'
+    asset_item: 'street light'
 });
 
 fixmystreet.assets.add(defaults, {
diff --git a/web/cobrands/hounslow/assets.js b/web/cobrands/hounslow/assets.js
index 375a74e3f..9521d73b8 100644
--- a/web/cobrands/hounslow/assets.js
+++ b/web/cobrands/hounslow/assets.js
@@ -136,7 +136,6 @@ var labeled_defaults = $.extend(true, {}, defaults, {
     select_action: true,
     stylemap: streetlight_stylemap,
     feature_code: 'FeatureId',
-    asset_item_message: 'You can pick a <b class="asset-spot">ITEM</b> from the map &raquo;',
     construct_asset_name: function(id) {
         if (id.split) {
             var code = id.split("/").slice(-1)[0];
diff --git a/web/cobrands/peterborough/assets.js b/web/cobrands/peterborough/assets.js
index 3d718116e..1da72264d 100644
--- a/web/cobrands/peterborough/assets.js
+++ b/web/cobrands/peterborough/assets.js
@@ -143,7 +143,6 @@ fixmystreet.assets.add(light_defaults, {
                   options.category !== UNKNOWN_LIGHT_CATEGORY_NAME
                 ) || options.category === "Lighting enquiry";
     },
-    asset_item_message: 'You can pick a <b class="asset-spot">street light</b> from the map &raquo;',
     select_action: true,
     actions: {
         asset_found: function(asset) {
-- 
cgit v1.2.3


From cd639b946ef6954730e7b027149f21e8561e4582 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 16 Jun 2020 12:09:15 +0100
Subject: [East Sussex] Tidy up named select actions.

---
 web/cobrands/eastsussex/assets.js  | 41 ++++++++++++++------------------------
 web/cobrands/fixmystreet/assets.js | 24 +++++++++++++---------
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/web/cobrands/eastsussex/assets.js b/web/cobrands/eastsussex/assets.js
index 296c8ede4..6f5304cd0 100644
--- a/web/cobrands/eastsussex/assets.js
+++ b/web/cobrands/eastsussex/assets.js
@@ -72,18 +72,10 @@ fixmystreet.assets.add(defaults, {
     asset_item: 'street light',
     asset_category: ["Burning By Day", "Intermittent", "Lamp Dim", "Lamp Flashing", "Lamp Obscured", "Lamp Out", "Missing Number", "Noisy Column", "Vandalism" ],
     select_action: true,
+    feature_code: 'Name',
     actions: {
-        asset_found: function(asset) {
-          var id = asset.attributes.Name || '';
-          if (id !== '') {
-              $('.category_meta_message').html('You have selected <b>' + id + '</b>');
-          } else {
-              $('.category_meta_message').html('You can pick a <b class="asset-spot">' + this.fixmystreet.asset_item + '</b> from the map &raquo;');
-          }
-        },
-        asset_not_found: function() {
-           $('.category_meta_message').html('You can pick a <b class="asset-spot">' + this.fixmystreet.asset_item + '</b> from the map &raquo;');
-        }
+        asset_found: fixmystreet.assets.named_select_action_found,
+        asset_not_found: fixmystreet.assets.named_select_action_not_found
     }
 });
 
@@ -106,22 +98,19 @@ fixmystreet.assets.add(defaults, {
     asset_item: 'drain',
     asset_category: ["Blocked Drain", "Culvert", "Broken Drain Cover", "Smell", "Sunken Drain", "Missing Drain Cover"],
     select_action: true,
+    construct_selected_asset_message: function(asset) {
+      var last_clean = asset.attributes.Gully_Last_Clean_Date__c || '';
+      var next_clean = asset.attributes.Gully_Next_Clean_Date__c || '';
+      if (last_clean !== '' || next_clean !== '') {
+          var message = '';
+          if (last_clean) { message += '<b>Last Cleaned</b>: ' + last_clean; }
+          if (next_clean) { message += ' <b>Next Clean</b>: ' + next_clean; }
+          return message;
+      }
+    },
     actions: {
-        asset_found: function(asset) {
-          var last_clean = asset.attributes.Gully_Last_Clean_Date__c || '';
-          var next_clean = asset.attributes.Gully_Next_Clean_Date__c || '';
-          if (last_clean !== '' || next_clean !== '') {
-              var message = '';
-              if (last_clean) { message += '<b>Last Cleaned</b>: ' + last_clean; }
-              if (next_clean) { message += ' <b>Next Clean</b>: ' + next_clean; }
-              $('.category_meta_message').html(message);
-          } else {
-              $('.category_meta_message').html('You can pick a <b class="asset-spot">' + this.fixmystreet.asset_item + '</b> from the map &raquo;');
-          }
-        },
-        asset_not_found: function() {
-           $('.category_meta_message').html('You can pick a <b class="asset-spot">' + this.fixmystreet.asset_item + '</b> from the map &raquo;');
-        }
+        asset_found: fixmystreet.assets.named_select_action_found,
+        asset_not_found: fixmystreet.assets.named_select_action_not_found
     }
 });
 
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index eda9bb276..ffa342e5f 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -179,6 +179,18 @@ OpenLayers.Layer.VectorAsset = OpenLayers.Class(OpenLayers.Layer.Vector, {
         return (f1.attributes[asset_id_field] == f2.attributes[asset_id_field]);
     },
 
+    construct_selected_asset_message: function(asset) {
+        var id = asset.attributes[this.fixmystreet.feature_code] || '';
+        if (id === '') {
+            return;
+        }
+        var data = { id: id, name: this.fixmystreet.asset_item };
+        if (this.fixmystreet.construct_asset_name) {
+            data = this.fixmystreet.construct_asset_name(id) || data;
+        }
+        return 'You have selected ' + data.name + ' <b>' + data.id + '</b>';
+    },
+
     find_matching_feature: function(feature, layer) {
         if (!layer) {
             return false;
@@ -836,15 +848,9 @@ fixmystreet.assets = {
         return new OpenLayers.Style(f);
     },
     named_select_action_found: function(asset) {
-        var id = asset.attributes[this.fixmystreet.feature_code] || '';
-        var message;
-        if (id !== '') {
-            var data = { id: id, name: this.fixmystreet.asset_item };
-            if (this.fixmystreet.construct_asset_name) {
-                data = this.fixmystreet.construct_asset_name(id) || data;
-            }
-            message = 'You have selected ' + data.name + ' <b>' + data.id + '</b>';
-        } else {
+        var fn = this.fixmystreet.construct_selected_asset_message || this.construct_selected_asset_message;
+        var message = fn.call(this, asset);
+        if (!message) {
             message = get_asset_pick_message.call(this);
         }
         $('.category_meta_message').html(message);
-- 
cgit v1.2.3


From 6d3ab9722b91e4929d01d168dfc0dc0916a8b542 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 17 Jun 2020 18:27:33 +0100
Subject: Include -p in systemd mkdir command.

---
 conf/systemd.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/systemd.example b/conf/systemd.example
index 1f8edf13c..7f22b091a 100644
--- a/conf/systemd.example
+++ b/conf/systemd.example
@@ -7,7 +7,7 @@ After=network.target
 Type=forking
 User=fms
 PIDFile=/var/www/fixmystreet/fixmystreet.pid
-ExecStartPre=mkdir /var/www/fixmystreet/logs
+ExecStartPre=/bin/mkdir -p /var/www/fixmystreet/logs
 ExecStart=/var/www/fixmystreet/fixmystreet/script/server \
             --port 9000 \
             --env deployment \
-- 
cgit v1.2.3


From 948338c4cfa30885f552f775a8727bf3b34859f1 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 17 Jun 2020 18:28:00 +0100
Subject: Prevent uninitialized value warnings.

---
 perllib/FixMyStreet/DB/Result/Contact.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/perllib/FixMyStreet/DB/Result/Contact.pm b/perllib/FixMyStreet/DB/Result/Contact.pm
index 1fa38e8a2..5cf3302dd 100644
--- a/perllib/FixMyStreet/DB/Result/Contact.pm
+++ b/perllib/FixMyStreet/DB/Result/Contact.pm
@@ -180,10 +180,12 @@ sub disable_form_field {
 sub sent_by_open311 {
     my $self = shift;
     my $body = $self->body;
+    my $method = $self->send_method || '';
+    my $body_method = $body->send_method || '';
     return 1 if
-        (!$body->can_be_devolved && $body->send_method eq 'Open311')
-        || ($body->can_be_devolved && $body->send_method eq 'Open311' && !$self->send_method)
-        || ($body->can_be_devolved && $self->send_method eq 'Open311');
+        (!$body->can_be_devolved && $body_method eq 'Open311')
+        || ($body->can_be_devolved && $body_method eq 'Open311' && !$method)
+        || ($body->can_be_devolved && $method eq 'Open311');
     return 0;
 }
 
-- 
cgit v1.2.3


From cbe3e9a5af21cef3774585dd489aaedbe7a564bc Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 20 May 2020 17:50:01 +0100
Subject: Map should respect cobrand default zoom, if set.

This brings the behaviour of the code in line with the comment
on Cobrand:Default::default_map_zoom
---
 perllib/FixMyStreet/Map/OSM.pm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index ef465d7dc..417fdca0b 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -77,11 +77,16 @@ sub generate_map_data {
         $zoomOffset = 0;
     }
 
-    # Adjust zoom level dependent upon population density
-    my $dist = $data->{distance}
-        || FixMyStreet::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude} );
-    my $default_zoom = $data->{cobrand}->default_map_zoom() || ($numZoomLevels - 4);
-    $default_zoom = $numZoomLevels - 3 if $dist < 10;
+    # Adjust zoom level dependent upon population density if cobrand hasn't
+    # specified a default zoom.
+    my $default_zoom;
+    if (my $cobrand_default_zoom = $data->{cobrand}->default_map_zoom) {
+        $default_zoom = $cobrand_default_zoom;
+    } else {
+        my $dist = $data->{distance}
+            || FixMyStreet::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude} );
+        $default_zoom = $dist < 10 ? $numZoomLevels - 3 : $numZoomLevels - 4;
+    }
 
     my $zoom = $data->{zoom} || $default_zoom;
     $zoom = $numZoomLevels - 1 if $zoom >= $numZoomLevels;
-- 
cgit v1.2.3


From 37a2eba471761281039f9078d17123badcf9b40c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 17 Jun 2020 18:29:49 +0100
Subject: [Peterborough] Increase default map zoom.

---
 perllib/FixMyStreet/Cobrand/Peterborough.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/perllib/FixMyStreet/Cobrand/Peterborough.pm b/perllib/FixMyStreet/Cobrand/Peterborough.pm
index 1bd0c83fb..bdd19a338 100644
--- a/perllib/FixMyStreet/Cobrand/Peterborough.pm
+++ b/perllib/FixMyStreet/Cobrand/Peterborough.pm
@@ -13,6 +13,7 @@ sub council_area { 'Peterborough' }
 sub council_name { 'Peterborough City Council' }
 sub council_url { 'peterborough' }
 sub map_type { 'MasterMap' }
+sub default_map_zoom { 5 }
 
 sub send_questionnaires { 0 }
 
-- 
cgit v1.2.3


From 04d217ae31c156c17d95e757842693caa31c06ed Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 16 Jun 2020 20:36:52 +0100
Subject: [Hounslow] Closed as well as fixed on front page.

---
 perllib/FixMyStreet/Cobrand/Hounslow.pm     | 25 ++++++++++++++++++
 perllib/FixMyStreet/DB/ResultSet/Problem.pm | 17 ++++++++++--
 t/cobrand/hounslow.t                        |  9 +++++++
 templates/web/hounslow/front/stats.html     | 40 +++++++++++++++++++++++++++++
 4 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 templates/web/hounslow/front/stats.html

diff --git a/perllib/FixMyStreet/Cobrand/Hounslow.pm b/perllib/FixMyStreet/Cobrand/Hounslow.pm
index bc1c80571..f37fec6a7 100644
--- a/perllib/FixMyStreet/Cobrand/Hounslow.pm
+++ b/perllib/FixMyStreet/Cobrand/Hounslow.pm
@@ -171,4 +171,29 @@ sub lookup_site_code_config { {
 # their cobrand at all.
 sub cut_off_date { '2019-05-06' }
 
+sub front_stats_data {
+    my ( $self ) = @_;
+
+    my $recency = '1 week';
+    my $shorter_recency = '3 days';
+
+    my $completed = $self->problems->recent_completed();
+    my $updates = $self->problems->number_comments();
+    my $new = $self->problems->recent_new( $recency );
+
+    if ( $new > $completed ) {
+        $recency = $shorter_recency;
+        $new = $self->problems->recent_new( $recency );
+    }
+
+    my $stats = {
+        completed => $completed,
+        updates => $updates,
+        new => $new,
+        recency => $recency,
+    };
+
+    return $stats;
+}
+
 1;
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index 2ce4c04be..9f7c035ed 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -72,13 +72,26 @@ sub _cache_timeout {
     FixMyStreet->config('CACHE_TIMEOUT') // 3600;
 }
 
+sub recent_completed {
+    my $rs = shift;
+    $rs->_recent_in_states('completed', [
+        FixMyStreet::DB::Result::Problem->fixed_states(),
+        FixMyStreet::DB::Result::Problem->closed_states()
+    ]);
+}
+
 sub recent_fixed {
     my $rs = shift;
-    my $key = "recent_fixed:$site_key";
+    $rs->_recent_in_states('fixed', [ FixMyStreet::DB::Result::Problem->fixed_states() ]);
+}
+
+sub _recent_in_states {
+    my ($rs, $state_key, $states) = @_;
+    my $key = "recent_$state_key:$site_key";
     my $result = Memcached::get($key);
     unless ($result) {
         $result = $rs->search( {
-            state => [ FixMyStreet::DB::Result::Problem->fixed_states() ],
+            state => $states,
             lastupdate => { '>', \"current_timestamp-'1 month'::interval" },
         } )->count;
         Memcached::set($key, $result, _cache_timeout());
diff --git a/t/cobrand/hounslow.t b/t/cobrand/hounslow.t
index 91c1cb455..e58309925 100644
--- a/t/cobrand/hounslow.t
+++ b/t/cobrand/hounslow.t
@@ -38,6 +38,15 @@ my ($report) = $mech->create_problems_for_body(1, $hounslow_id, 'A brand new pro
     cobrand => 'fixmystreet'
 });
 
+subtest "showing the front page" => sub {
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => 'hounslow',
+    }, sub {
+        $mech->get_ok('/');
+        $mech->content_contains('completed in past month');
+    };
+};
+
 subtest "it still shows old reports on fixmystreet.com" => sub {
     FixMyStreet::override_config {
         MAPIT_URL => 'http://mapit.uk/',
diff --git a/templates/web/hounslow/front/stats.html b/templates/web/hounslow/front/stats.html
new file mode 100644
index 000000000..23d035551
--- /dev/null
+++ b/templates/web/hounslow/front/stats.html
@@ -0,0 +1,40 @@
+[% USE Number.Format %]
+
+[%
+    stats = c.cobrand.front_stats_data();
+
+    new_text =
+        stats.recency == '1 week'
+        ? nget(
+            "<big>%s</big> report in past week",
+            "<big>%s</big> reports in past week",
+            stats.new
+          )
+        : nget(
+            "<big>%s</big> report recently",
+            "<big>%s</big> reports recently",
+            stats.new
+         );
+
+    completed_text = nget(
+        "<big>%s</big> completed in past month",
+        "<big>%s</big> completed in past month",
+        stats.completed
+    );
+
+    updates_text = nget(
+        "<big>%s</big> update on reports",
+        "<big>%s</big> updates on reports",
+        stats.updates
+    );
+
+    new_n = stats.new | format_number;
+    completed_n = stats.completed | format_number;
+    updates_n = stats.updates | format_number;
+%]
+
+<div id="front_stats">
+    <div>[% tprintf( new_text, decode(new_n) ) %]</div>
+    <div>[% tprintf( completed_text, decode(completed_n) ) %]</div>
+    <div>[% tprintf( updates_text, decode(updates_n) ) %]</div>
+</div>
-- 
cgit v1.2.3


From a7d5e06b1ecd6c356e1d0c9292ad706cebf2a144 Mon Sep 17 00:00:00 2001
From: abimysoc <abi@mysociety.org>
Date: Mon, 22 Jun 2020 10:29:38 +0100
Subject: Change UKCOD to mySociety

---
 templates/email/default/submit-example.txt         | 2 +-
 templates/web/bromley/about/faq-en-gb.html         | 5 ++---
 templates/web/eastherts/about/faq-en-gb.html       | 2 +-
 templates/web/fixmystreet.com/contact/address.html | 4 ++--
 templates/web/greenwich/about/faq-en-gb.html       | 5 ++---
 templates/web/hart/about/faq-en-gb.html            | 5 ++---
 templates/web/stevenage/about/faq-en-gb.html       | 5 ++---
 7 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/templates/email/default/submit-example.txt b/templates/email/default/submit-example.txt
index 1d9db23d3..8927914d5 100644
--- a/templates/email/default/submit-example.txt
+++ b/templates/email/default/submit-example.txt
@@ -46,7 +46,7 @@ Replies to this email will go to the user who submitted the problem.
 Yours,  
 The FixMyStreet team
 
-This message was sent via FixMyStreet, a project of UKCOD,
+This message was sent via FixMyStreet, a project of mySociety,
 registered charity number 1076346. If there is a more appropriate
 email address for messages about 'Potholes', please let us know by
 visiting <https://www.fixmystreet.com/contact>. This will help
diff --git a/templates/web/bromley/about/faq-en-gb.html b/templates/web/bromley/about/faq-en-gb.html
index 615069150..8b0c7f4fb 100755
--- a/templates/web/bromley/about/faq-en-gb.html
+++ b/templates/web/bromley/about/faq-en-gb.html
@@ -70,11 +70,10 @@ the problem.</dd>
 
     <dt>The site is powered by FixMyStreet, who are they?</dt>
         <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>.
-mySociety is the project of a registered charity which has grown out of the community of
+mySociety is a registered charity, number 1076346, which has grown out of the community of
 volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>.
 mySociety&rsquo;s primary mission is to build Internet projects which give people simple, tangible
-benefits in the civic and community aspects of their lives.
-The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety
+benefits in the civic and community aspects of their lives. mySociety
 can be contacted by email at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
 or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd>
 
diff --git a/templates/web/eastherts/about/faq-en-gb.html b/templates/web/eastherts/about/faq-en-gb.html
index 697536df8..fd617d1a5 100644
--- a/templates/web/eastherts/about/faq-en-gb.html
+++ b/templates/web/eastherts/about/faq-en-gb.html
@@ -79,7 +79,7 @@ by a user of the site.</dd>
 
     <dt>The site is powered by FixMyStreet, who are they?</dt>
         <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. 
-mySociety is the project of a registered charity which has grown out of the community of
+mySociety is a registered charity, number 1076346, which has grown out of the community of
 volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. 
 mySociety&rsquo;s primary mission is to build Internet projects which give people simple, tangible
 benefits in the civic and community aspects of their lives.
diff --git a/templates/web/fixmystreet.com/contact/address.html b/templates/web/fixmystreet.com/contact/address.html
index 2cea59684..c1d61d24f 100644
--- a/templates/web/fixmystreet.com/contact/address.html
+++ b/templates/web/fixmystreet.com/contact/address.html
@@ -1,7 +1,7 @@
 <hr>
 
-<p>FixMyStreet is a service provided by mySociety, which is the project of a
-registered charity, UK Citizens Online Democracy, charity number 1076346.</p>
+<p>FixMyStreet is a service provided by mySociety, which is a
+registered charity, charity number 1076346.</p>
 
 <p>If you wish to contact us by post, our address is
 <address>mySociety, 483 Green Lanes, London, N13 4BS, UK.</address></p>
diff --git a/templates/web/greenwich/about/faq-en-gb.html b/templates/web/greenwich/about/faq-en-gb.html
index dc628dbe9..bb890ff9d 100644
--- a/templates/web/greenwich/about/faq-en-gb.html
+++ b/templates/web/greenwich/about/faq-en-gb.html
@@ -72,11 +72,10 @@ by a user of the site.</dd>
 
     <dt>The site is powered by FixMyStreet, who are they?</dt>
         <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. 
-mySociety is the project of a registered charity which has grown out of the community of
+mySociety is a registered charity, number 1076346, which has grown out of the community of
 volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. 
 mySociety&rsquo;s primary mission is to build Internet projects which give people simple, tangible
-benefits in the civic and community aspects of their lives.
-The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety
+benefits in the civic and community aspects of their lives. mySociety
 can be contacted by email at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
 or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd>
 
diff --git a/templates/web/hart/about/faq-en-gb.html b/templates/web/hart/about/faq-en-gb.html
index 522d7f3b2..2f9958cbe 100755
--- a/templates/web/hart/about/faq-en-gb.html
+++ b/templates/web/hart/about/faq-en-gb.html
@@ -70,11 +70,10 @@ by a user of the site.</dd>
 
     <dt>The site is powered by FixMyStreet, who are they?</dt>
         <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. 
-mySociety is the project of a registered charity which has grown out of the community of
+mySociety is a registered charity, number 1076346, which has grown out of the community of
 volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. 
 mySociety&rsquo;s primary mission is to build Internet projects which give people simple, tangible
-benefits in the civic and community aspects of their lives.
-The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety
+benefits in the civic and community aspects of their lives. mySociety
 can be contacted by email at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
 or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd>
 
diff --git a/templates/web/stevenage/about/faq-en-gb.html b/templates/web/stevenage/about/faq-en-gb.html
index a92a80cb3..764a9fbfc 100644
--- a/templates/web/stevenage/about/faq-en-gb.html
+++ b/templates/web/stevenage/about/faq-en-gb.html
@@ -64,11 +64,10 @@ by a user of the site.</dd>
 
     <dt>The site is powered by FixMyStreet, who are they?</dt>
         <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>.
-mySociety is the project of a registered charity which has grown out of the community of
+mySociety is a registered charity, number 1076346, which has grown out of the community of
 volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>.
 mySociety&rsquo;s primary mission is to build Internet projects which give people simple, tangible
-benefits in the civic and community aspects of their lives.
-The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety
+benefits in the civic and community aspects of their lives. mySociety
 can be contacted by email at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
 or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd>
 
-- 
cgit v1.2.3


From 230882043f4e9eabb01f12251e4a6b961df08353 Mon Sep 17 00:00:00 2001
From: abimysoc <abi@mysociety.org>
Date: Mon, 22 Jun 2020 14:41:03 +0100
Subject: Change UKCOD to mySociety

Inevitably, missed one reference with first PR...
---
 templates/web/eastherts/about/faq-en-gb.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/web/eastherts/about/faq-en-gb.html b/templates/web/eastherts/about/faq-en-gb.html
index fd617d1a5..d9f9becb7 100644
--- a/templates/web/eastherts/about/faq-en-gb.html
+++ b/templates/web/eastherts/about/faq-en-gb.html
@@ -82,8 +82,7 @@ by a user of the site.</dd>
 mySociety is a registered charity, number 1076346, which has grown out of the community of
 volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. 
 mySociety&rsquo;s primary mission is to build Internet projects which give people simple, tangible
-benefits in the civic and community aspects of their lives.
-The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety
+benefits in the civic and community aspects of their lives. mySociety
 can be contacted by email at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
 or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd>
 
-- 
cgit v1.2.3


From 58a7df7603b657e8b56bae9b46a0451b4534e9ad Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 22 Jun 2020 14:53:59 +0100
Subject: [Hounslow] Allow two email categories to be shown.

By default, devolved categories are not shown.
---
 perllib/FixMyStreet/Cobrand/Hounslow.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Hounslow.pm b/perllib/FixMyStreet/Cobrand/Hounslow.pm
index f37fec6a7..5ce22762f 100644
--- a/perllib/FixMyStreet/Cobrand/Hounslow.pm
+++ b/perllib/FixMyStreet/Cobrand/Hounslow.pm
@@ -65,8 +65,14 @@ sub categories_restriction {
     # Email categories with a devolved send_method, so can identify Open311
     # categories as those which have a blank send_method.
     return $rs->search({
-        'me.send_method' => undef,
         'body.name' => [ 'Hounslow Borough Council', 'Highways England' ],
+        -or => [
+            'me.send_method' => undef,
+            'me.category' => { -in => [
+                'Pavement Overcrowding',
+                'Streetspace Suggestions and Feedback',
+            ] },
+        ],
     });
 }
 
-- 
cgit v1.2.3


From 4b780de3e34128a4581dbc4daead30be00ceadb4 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 23 Jun 2020 16:30:29 +0100
Subject: [Open311] Use devolved data on update sending.

---
 CHANGELOG.md                                 |  2 ++
 bin/send-daemon                              |  1 -
 perllib/FixMyStreet/Cobrand/Default.pm       |  2 +-
 perllib/Open311/PostServiceRequestUpdates.pm | 25 +++++++++++++++----------
 t/open311/post-service-request-updates.t     |  9 ++++++++-
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ae55f306..968d00efb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,8 @@
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
         - Add option to show front end testing code coverage. #3036
         - Add function to fetch user's country from Gaze.
+    - Open311 improvements:
+        - Use devolved data on update sending.
     - UK:
         - Add option for recaptcha. #3050
 
diff --git a/bin/send-daemon b/bin/send-daemon
index dee9e949f..ae54c2564 100755
--- a/bin/send-daemon
+++ b/bin/send-daemon
@@ -125,7 +125,6 @@ sub look_for_update {
     my ($body) = grep { $bodies->{$_} } @{$comment->problem->bodies_str_ids};
     $body = $bodies->{$body};
 
-    $updates->construct_open311($body);
     $updates->process_update($body, $comment);
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index c8e11f93d..73340338b 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -961,7 +961,7 @@ sub get_body_sender {
 
     # look up via category
     my $contact = $body->contacts->search( { category => $category } )->first;
-    if ( $body->can_be_devolved && $contact->send_method ) {
+    if ( $body->can_be_devolved && $contact && $contact->send_method ) {
         return { method => $contact->send_method, config => $contact, contact => $contact };
     }
 
diff --git a/perllib/Open311/PostServiceRequestUpdates.pm b/perllib/Open311/PostServiceRequestUpdates.pm
index 68823343c..d7345ea4d 100755
--- a/perllib/Open311/PostServiceRequestUpdates.pm
+++ b/perllib/Open311/PostServiceRequestUpdates.pm
@@ -14,14 +14,12 @@ use Open311;
 use constant SEND_METHOD_OPEN311 => 'Open311';
 
 has verbose => ( is => 'ro', default => 0 );
-has current_open311 => ( is => 'rw' );
 
 sub send {
     my $self = shift;
 
     my $bodies = $self->fetch_bodies;
     foreach my $body (values %$bodies) {
-        $self->construct_open311($body);
         $self->process_body($body);
     }
 }
@@ -41,18 +39,25 @@ sub fetch_bodies {
 }
 
 sub construct_open311 {
-    my ($self, $body) = @_;
-    my $o = Open311->new($self->open311_params($body));
-    $self->current_open311($o);
+    my ($self, $body, $comment) = @_;
+    my $o = Open311->new($self->open311_params($body, $comment));
+    return $o;
 }
 
 sub open311_params {
-    my ($self, $body) = @_;
+    my ($self, $body, $comment) = @_;
+
+    my $conf = $body;
+    if ($comment) {
+        my $cobrand_logged = $comment->get_cobrand_logged;
+        my $sender = $cobrand_logged->get_body_sender($body, $comment->problem->category);
+        $conf = $sender->{config};
+    }
 
     my %open311_conf = (
-        endpoint => $body->endpoint,
-        jurisdiction => $body->jurisdiction,
-        api_key => $body->api_key,
+        endpoint => $conf->endpoint,
+        jurisdiction => $conf->jurisdiction,
+        api_key => $conf->api_key,
         extended_statuses => $body->send_extended_statuses,
         fixmystreet_body => $body,
     );
@@ -119,7 +124,7 @@ sub process_update {
         return;
     }
 
-    my $o = $self->current_open311;
+    my $o = $self->construct_open311($body, $comment);
 
     $cobrand->call_hook(open311_pre_send => $comment, $o);
 
diff --git a/t/open311/post-service-request-updates.t b/t/open311/post-service-request-updates.t
index 71bba4af7..75711bd2d 100644
--- a/t/open311/post-service-request-updates.t
+++ b/t/open311/post-service-request-updates.t
@@ -16,7 +16,7 @@ my $params = {
     endpoint => 'endpoint',
     jurisdiction => 'home',
 };
-my $bromley = $mech->create_body_ok(2482, 'Bromley', { %$params, send_extended_statuses => 1 });
+my $bromley = $mech->create_body_ok(2482, 'Bromley', { %$params, send_extended_statuses => 1, can_be_devolved => 1 });
 my $oxon = $mech->create_body_ok(2237, 'Oxfordshire', { %$params, id => "5" . $bromley->id });
 my $bucks = $mech->create_body_ok(2217, 'Buckinghamshire', $params);
 my $lewisham = $mech->create_body_ok(2492, 'Lewisham', $params);
@@ -135,5 +135,12 @@ subtest 'Oxfordshire gets an ID' => sub {
   };
 };
 
+subtest 'Devolved contact' => sub {
+    $mech->create_contact_ok(body_id => $bromley->id, category => 'Other', email => "OTHER", send_method => 'Open311', endpoint => '/devolved-endpoint/');
+    $c1->update({ send_fail_count => 0 });
+    $o->send;
+    $c1->discard_changes;
+    like $c1->send_fail_reason, qr/devolved-endpoint/, 'Failure message contains correct endpoint';
+};
 
 done_testing();
-- 
cgit v1.2.3


From b6e026aad3424a966ac449bcacab7335731bad7f Mon Sep 17 00:00:00 2001
From: Joe Siltberg <git@joesiltberg.se>
Date: Wed, 24 Jun 2020 13:47:13 +0200
Subject: Upgrades the Mozilla::CA module to 20200520.

LWP::UserAgent (used by MapIt and Open311 integrations) uses this
cert bundle by default to verify peers.

Fixes #3088
---
 cpanfile          | 3 +++
 cpanfile.snapshot | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cpanfile b/cpanfile
index 1415a7af5..4485314b0 100644
--- a/cpanfile
+++ b/cpanfile
@@ -185,6 +185,9 @@ requires 'Test::WWW::Mechanize::Catalyst', '0.62';
 requires 'Web::Scraper';
 requires 'Web::Simple';
 
+# Default root certificates used by LWP::UserAgent
+requires 'Mozilla::CA', '20200520';
+
 #################################################################
 # [1] Params::Classify 0.13 installs XS, but 0.15 will only do so
 # if ParseXS >= 3.30 is installed. If we don't do that, and are
diff --git a/cpanfile.snapshot b/cpanfile.snapshot
index edc125960..cdb785a26 100644
--- a/cpanfile.snapshot
+++ b/cpanfile.snapshot
@@ -3691,6 +3691,7 @@ DISTRIBUTIONS
       IO::Socket::SSL::Utils 2.014
     requirements:
       ExtUtils::MakeMaker 0
+      Mozilla::CA 0
       Net::SSLeay 1.46
       Scalar::Util 0
   IO-String-1.08
@@ -5108,10 +5109,10 @@ DISTRIBUTIONS
       MooseX::Types 0.04
       Path::Class 0.16
       Test::More 0.88
-  Mozilla-CA-20130114
-    pathname: A/AB/ABH/Mozilla-CA-20130114.tar.gz
+  Mozilla-CA-20200520
+    pathname: A/AB/ABH/Mozilla-CA-20200520.tar.gz
     provides:
-      Mozilla::CA 20130114
+      Mozilla::CA 20200520
     requirements:
       ExtUtils::MakeMaker 0
       Test 0
-- 
cgit v1.2.3


From d1c38a2bdbe5891fa63bde40e398e3cc33881566 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 23 Jun 2020 14:32:42 +0100
Subject: Improve Bing geocoder results.

Add a couple of parameters to hopefully improve results, and make
sure the returned locality is included in the summary address.
---
 CHANGELOG.md                        |  1 +
 perllib/FixMyStreet/Geocode/Bing.pm | 10 +++++++++-
 t/Mock/Bing.pm                      | 30 ++++++++++++++++++++++++++++++
 t/geocode/bing.t                    | 24 ++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 t/geocode/bing.t

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 968d00efb..8f8fc5ef0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
         - Add Open Location Codes support to search box. #3047
     - Front end improvements:
         - Add lazy image loading on list items.
+        - Improve Bing geocoder results.
     - Changes:
         - Mark user as active when sent an email alert.
     - Bugfixes:
diff --git a/perllib/FixMyStreet/Geocode/Bing.pm b/perllib/FixMyStreet/Geocode/Bing.pm
index 1d39d911f..1b947abee 100644
--- a/perllib/FixMyStreet/Geocode/Bing.pm
+++ b/perllib/FixMyStreet/Geocode/Bing.pm
@@ -36,6 +36,8 @@ sub string {
     $url .= '&userMapView=' . join(',', @{$params->{bounds}})
         if $params->{bounds};
     $url .= '&userLocation=' . $params->{centre} if $params->{centre};
+    $url .= '&userIp=127.0.0.1'; # So server location does not affect results
+    $url .= '&maxResults=10'; # Match what is said in the front end
     $url .= '&c=' . $params->{bing_culture} if $params->{bing_culture};
 
     $c->stash->{geocoder_url} = $url;
@@ -52,7 +54,13 @@ sub string {
 
     foreach (@$results) {
         my $address = $_->{name};
-        next if $params->{bing_country} && $_->{address}->{countryRegion} ne $params->{bing_country};
+        if ($params->{bing_country}) {
+            next if $_->{address}->{countryRegion} ne $params->{bing_country};
+            $address =~ s/, $params->{bing_country}$//;
+        }
+        if ($address !~ /$_->{address}->{locality}/) {
+            $address .= ", $_->{address}->{locality}";
+        }
 
         # Getting duplicate, yet different, results from Bing sometimes
         next if @valid_locations
diff --git a/t/Mock/Bing.pm b/t/Mock/Bing.pm
index 3dfb8fbe0..77045950f 100644
--- a/t/Mock/Bing.pm
+++ b/t/Mock/Bing.pm
@@ -14,6 +14,36 @@ has json => (
 sub dispatch_request {
     my $self = shift;
 
+    sub (GET + /REST/v1/Locations + ?*) {
+        my ($self, $query) = @_;
+        my $results = [ {
+            point => { coordinates => [ 51, -1 ] },
+            name => 'Constitution Hill, London, SW1A',
+            address => {
+                addressLine => 'Constitution Hill',
+                locality => 'London',
+                countryRegion => 'United Kingdom',
+            }
+        } ];
+        if ($query->{q} =~ /two results/) {
+            push @$results, {
+                point => { coordinates => [ 51, -1 ] },
+                name => 'Constitution Hill again, United Kingdom',
+                address => {
+                    addressLine => 'Constitution Hill again',
+                    locality => 'London',
+                    countryRegion => 'United Kingdom',
+                }
+            };
+        }
+        my $data = {
+            statusCode => 200,
+            resourceSets => [ { resources => $results } ],
+        };
+        my $json = $self->json->encode($data);
+        return [ 200, [ 'Content-Type' => 'application/json' ], [ $json ] ];
+    },
+
     sub (GET + /REST/v1/Locations/* + ?*) {
         my ($self, $location, $query) = @_;
         my $data = {
diff --git a/t/geocode/bing.t b/t/geocode/bing.t
new file mode 100644
index 000000000..32cffaa4e
--- /dev/null
+++ b/t/geocode/bing.t
@@ -0,0 +1,24 @@
+use FixMyStreet::Test;
+use FixMyStreet::Geocode::Bing;
+use Catalyst::Test 'FixMyStreet::App';
+use t::Mock::Bing;
+
+my $c = ctx_request('/');
+
+FixMyStreet::override_config {
+    GEOCODING_DISAMBIGUATION => { bing_culture => 'en-GB' }
+}, sub {
+    my $r = FixMyStreet::Geocode::Bing->string('a result', $c);
+    ok $r->{latitude};
+    ok $r->{longitude};
+};
+
+FixMyStreet::override_config {
+    GEOCODING_DISAMBIGUATION => { bing_country => 'United Kingdom' }
+}, sub {
+    my $r = FixMyStreet::Geocode::Bing->string('two results', $c);
+    is scalar @{$r->{error}}, 2;
+    is $r->{error}[1]{address}, 'Constitution Hill again, London';
+};
+
+done_testing;
-- 
cgit v1.2.3


From c7cc69f6cd5e7f91a48223dd0194aeed39b8e59e Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 25 Jun 2020 14:20:33 +0100
Subject: [Bromley] Use HTTPS scheme for bromley.gov.uk links/search form

Also updates the search form URL as the old one had stopped working.
---
 templates/web/bromley/about/faq-en-gb.html |  4 +-
 templates/web/bromley/front/pre-steps.html |  2 +-
 templates/web/bromley/header_logo.html     | 62 +++++++++++++++---------------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/templates/web/bromley/about/faq-en-gb.html b/templates/web/bromley/about/faq-en-gb.html
index 8b0c7f4fb..8b5945471 100755
--- a/templates/web/bromley/about/faq-en-gb.html
+++ b/templates/web/bromley/about/faq-en-gb.html
@@ -15,7 +15,7 @@
 <dl>
     <dt>What issues can&rsquo;t be reported here?</dt>
     <dd><p>The following problems should be reported via
-    <a href="http://www.bromley.gov.uk/report">http://www.bromley.gov.uk/report</a>:</p>
+    <a href="https://www.bromley.gov.uk/report">https://www.bromley.gov.uk/report</a>:</p>
     <ul>
     <li>missed rubbish or recycling collections
     <li>anti-social behaviour
@@ -39,7 +39,7 @@
     <dt><a name="emergencies"></a>Reporting emergencies (out of hours)</dt>
     <dd>
     <p>Please do not report problems which present an immediate risk to life, for example missing manhole covers or a fallen lamp column.</p>
-    <p>Please direct your enquiry to our <a href="http://www.bromley.gov.uk/info/200039/emergencies/460/emergency_contacts">Out of Hours service</a></p>
+    <p>Please direct your enquiry to our <a href="https://www.bromley.gov.uk/info/200039/emergencies/460/emergency_contacts">Out of Hours service</a></p>
 
     </dd>
 
diff --git a/templates/web/bromley/front/pre-steps.html b/templates/web/bromley/front/pre-steps.html
index ebe7154c1..4ba703cb0 100644
--- a/templates/web/bromley/front/pre-steps.html
+++ b/templates/web/bromley/front/pre-steps.html
@@ -9,5 +9,5 @@ priority issues in the first instance.
 <p>This is primarily for reporting physical problems that can be fixed
 like graffiti, cleansing issues or road defects. To report other
 kinds of problems like missed bins use our
-<a href="http://www.bromley.gov.uk/report">online report it forms</a>.
+<a href="https://www.bromley.gov.uk/report">online report it forms</a>.
 </p>
diff --git a/templates/web/bromley/header_logo.html b/templates/web/bromley/header_logo.html
index 8c49d9145..b86960af3 100644
--- a/templates/web/bromley/header_logo.html
+++ b/templates/web/bromley/header_logo.html
@@ -1,13 +1,13 @@
     <div class="bromley-header clearfix">
-        <a href="http://www.bromley.gov.uk/" id="site-logo">[% site_name %]</a>
+        <a href="https://www.bromley.gov.uk/" id="site-logo">[% site_name %]</a>
 
         <ul class="linear-links subtext float-right top-links">
-            <li class="first-child"><i class="fa fa-home"></i><a href="http://www.bromley.gov.uk">Home</a></li>
-            <li><i class="fa fa-sitemap"></i><a href="http://www.bromley.gov.uk/site_map">Sitemap</a></li>
+            <li class="first-child"><i class="fa fa-home"></i><a href="https://www.bromley.gov.uk">Home</a></li>
+            <li><i class="fa fa-sitemap"></i><a href="https://www.bromley.gov.uk/site_map">Sitemap</a></li>
             <li><i class="fa fa-user"></i><a href="https://www.bromley.gov.uk/SiteLogin">Register/Sign in</a></li>
         </ul>
 
-        <form action="http://www.bromley.gov.uk/site/scripts/google_results.aspx" method="get" id="search" class="main-search" role="search">
+        <form action="https://www.bromley.gov.uk/site_search/results/" method="get" id="search" class="main-search" role="search">
             <label for="SearchSite" class="hidden">Search this site</label>
             <input type="text" size="18" class="main-search-input field" name="q" id="SearchSite" value="" placeholder="Search the website">
             <input value="Search" type="submit" class="button__primary">
@@ -21,32 +21,32 @@
                 <li class="first-child">
                     <a href="#" class="main-nav-title">A-Z</a>
                     <ul class="nav-hover-item nav-hover-item-active a-z">
-                        <li class="first-child"><a href="http://www.bromley.gov.uk/a_to_z/A">a</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/B">b</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/C">c</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/D">d</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/E">e</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/F">f</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/G">g</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/H">h</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/I">i</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/J">j</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/K">k</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/L">l</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/M">m</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/N">n</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/O">o</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/P">p</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/Q">q</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/R">r</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/S">s</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/T">t</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/U">u</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/V">v</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/W">w</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/X">x</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/Y">y</a></li>
-                        <li><a href="http://www.bromley.gov.uk/a_to_z/Z">z</a></li>
+                        <li class="first-child"><a href="https://www.bromley.gov.uk/a_to_z/A">a</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/B">b</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/C">c</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/D">d</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/E">e</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/F">f</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/G">g</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/H">h</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/I">i</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/J">j</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/K">k</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/L">l</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/M">m</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/N">n</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/O">o</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/P">p</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/Q">q</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/R">r</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/S">s</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/T">t</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/U">u</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/V">v</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/W">w</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/X">x</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/Y">y</a></li>
+                        <li><a href="https://www.bromley.gov.uk/a_to_z/Z">z</a></li>
                     </ul>
                 </li>
             </ul>
@@ -55,7 +55,7 @@
     <div class="breadcrumb">
         <!-- Breadcrumb --><!-- googleoff:all -->
         <ul>
-            <li class="first-child"><a href="http://www.bromley.gov.uk">Home</a></li>
+            <li class="first-child"><a href="https://www.bromley.gov.uk">Home</a></li>
             <li class="current"><span>FixMyStreet</span></li>
         </ul>
         <!-- END Breadcrumb --><!-- googleon:all -->
-- 
cgit v1.2.3


From 655174d175e034b078141c33e5a5f848d255f7f9 Mon Sep 17 00:00:00 2001
From: Joe Siltberg <git@joesiltberg.se>
Date: Mon, 29 Jun 2020 13:40:32 +0200
Subject: Internationalization of the heatmap page.

Fixes #3096
---
 templates/web/base/dashboard/heatmap-list.html |  8 ++++----
 templates/web/base/dashboard/heatmap.html      | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/web/base/dashboard/heatmap-list.html b/templates/web/base/dashboard/heatmap-list.html
index d736a11f4..53720af35 100644
--- a/templates/web/base/dashboard/heatmap-list.html
+++ b/templates/web/base/dashboard/heatmap-list.html
@@ -1,12 +1,12 @@
-<h3>Five newest reports</h3>
+<h3>[% loc('Five newest reports') %]</h3>
 [% INCLUDE column problems = five_newest %]
 
-<h3>Five most recent commented reports<br>
-<small>Not from yourself/backend</small>
+<h3>[% loc('Five most recent commented reports') %]<br>
+<small>[% loc('Not from yourself/backend') %]</small>
 </h3>
 [% INCLUDE column problems = five_commented %]
 
-<h3>Ten least recently updated open reports</h3>
+<h3>[% loc('Ten least recently updated open reports') %]</h3>
 [% INCLUDE column problems = ten_oldest %]
 
 [% BLOCK column %]
diff --git a/templates/web/base/dashboard/heatmap.html b/templates/web/base/dashboard/heatmap.html
index ca4d02926..42c601a4c 100755
--- a/templates/web/base/dashboard/heatmap.html
+++ b/templates/web/base/dashboard/heatmap.html
@@ -26,11 +26,11 @@
 <input type="hidden" id="body" name="body" value="[% body.id | html %]">
 
 <p class="report-list-filters" style='padding-top:0.25em'>
-    From <input type="date" id="start_date" name="start_date" class="form-control" value="[% start_date | html %]">
-    To <input type="date" id="end_date" name="end_date" class="form-control" value="[% end_date | html %]">
+    [% loc('From') %] <input type="date" id="start_date" name="start_date" class="form-control" value="[% start_date | html %]">
+    [% loc('To') %] <input type="date" id="end_date" name="end_date" class="form-control" value="[% end_date | html %]">
 
 <p class="report-list-filters">
-In wards <select class="form-control js-multiple" multiple id="wards" name="wards">
+[% loc('In wards') %] <select class="form-control js-multiple" multiple id="wards" name="wards">
   [% FOR child IN children.values.sort('name') %]
   [% SET aid = child.id %]
   <option value="[% child.name | html %]"[% ' selected' IF ward_hash.$aid %]>[% child.name %]</option>
@@ -41,9 +41,9 @@ In wards <select class="form-control js-multiple" multiple id="wards" name="ward
 
 <p class="segmented-control segmented-control--radio">
     <input type="radio" name="heatmap" id="heatmap_yes" value="Yes" checked>
-    <label class="btn" for="heatmap_yes">Heatmap</label>
+    <label class="btn" for="heatmap_yes">[% loc('Heatmap') %]</label>
     <input type="radio" name="heatmap" id="heatmap_no" value="No">
-    <label class="btn" for="heatmap_no">Pin map</label>
+    <label class="btn" for="heatmap_no">[% loc('Pin map') %]</label>
 </p>
 
 <div id="js-reports-list">
-- 
cgit v1.2.3


From 3c98b8f4dbe7085d52887deff90681db552fb580 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 29 Jun 2020 13:58:31 +0100
Subject: [BANES] Use HTTPS scheme for bathnes.gov.uk links/search form

---
 templates/web/bathnes/footer_extra.html                  | 2 +-
 templates/web/bathnes/header_site.html                   | 2 +-
 templates/web/fixmystreet-uk-councils/about/privacy.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/web/bathnes/footer_extra.html b/templates/web/bathnes/footer_extra.html
index 4651fdaa5..cfc723498 100644
--- a/templates/web/bathnes/footer_extra.html
+++ b/templates/web/bathnes/footer_extra.html
@@ -12,7 +12,7 @@
                 </div>
 
                 <ul class="footer-list">
-                    <li><a href="http://www.bathnes.gov.uk/contact-us">Contact Us</a></li>
+                    <li><a href="https://www.bathnes.gov.uk/contact-us">Contact Us</a></li>
                     <li><a href="/privacy">Privacy and Cookies</a></li>
                 </ul>
             </div>
diff --git a/templates/web/bathnes/header_site.html b/templates/web/bathnes/header_site.html
index e39882b58..0c56b86e3 100644
--- a/templates/web/bathnes/header_site.html
+++ b/templates/web/bathnes/header_site.html
@@ -18,7 +18,7 @@
             <a href="#main-nav" class="navigation-trigger">Menu</a>
 
             <div class="header-search header-search--desktop">
-                <form id="search" class="site-search" action="http://www.bathnes.gov.uk/search/site/" method="post">
+                <form id="search" class="site-search" action="https://www.bathnes.gov.uk/search/site/" method="post">
                     <label class="form-label visuallyhidden" for="search-site">Search across the site</label>
                     <input class="form-control" id="search-site" type="text" name="search_block_form" placeholder="Search bathnes.gov.uk">
                     <input type="hidden" name="form_id" value="search_block_form">
diff --git a/templates/web/fixmystreet-uk-councils/about/privacy.html b/templates/web/fixmystreet-uk-councils/about/privacy.html
index e7ef6b377..4a5ed9d2c 100644
--- a/templates/web/fixmystreet-uk-councils/about/privacy.html
+++ b/templates/web/fixmystreet-uk-councils/about/privacy.html
@@ -18,7 +18,7 @@ else, for other purposes.
 
 <p>Further information about the Council’s treatment of personal data, and your
 privacy rights, is available in our
-<a href="http://www.bathnes.gov.uk/services/your-council-and-democracy/data-protection-and-freedom-information/council-privacy-notice">Privacy Notice</a>.
+<a href="https://www.bathnes.gov.uk/services/your-council-and-democracy/data-protection-and-freedom-information/council-privacy-notice">Privacy Notice</a>.
 The Council’s Data Protection Officer may be contacted at
 <a href="mailto:data_protection@bathnes.gov.uk">data_protection@bathnes.gov.uk</a>.
 
-- 
cgit v1.2.3


From 51eae76dd663d23c1f4bb1e809e9c258e800cb73 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 10 Jun 2020 14:29:35 +0100
Subject: Only show access tokens once, and store hashed.

---
 CHANGELOG.md                                       |  2 ++
 .../Authentication/Credential/AccessToken.pm       | 34 ++++++++++------------
 perllib/FixMyStreet/App.pm                         |  3 --
 perllib/FixMyStreet/App/Controller/Auth/Profile.pm |  7 +++--
 perllib/FixMyStreet/DB/Result/User.pm              |  5 ++++
 t/app/controller/auth.t                            | 11 +++----
 t/app/controller/auth_profile.t                    | 12 ++++----
 t/app/controller/dashboard.t                       |  5 ++--
 templates/web/base/auth/generate_token.html        | 13 ++++-----
 9 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f8fc5ef0..decfa2b5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## Releases
 
 * Unreleased
+    - Security:
+        - Store personal access tokens hashed, and only show once, upon generation.
     - New features:
         - Add Open Location Codes support to search box. #3047
     - Front end improvements:
diff --git a/perllib/Catalyst/Authentication/Credential/AccessToken.pm b/perllib/Catalyst/Authentication/Credential/AccessToken.pm
index 7827c936d..24398823d 100644
--- a/perllib/Catalyst/Authentication/Credential/AccessToken.pm
+++ b/perllib/Catalyst/Authentication/Credential/AccessToken.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use base 'Class::Accessor::Fast';
 
-__PACKAGE__->mk_accessors(qw(token_field token_lookup));
+__PACKAGE__->mk_accessors(qw(token_field));
 
 our $VERSION = "0.01";
 
@@ -23,21 +23,23 @@ sub authenticate {
     $token ||= $c->get_param('access_token');
     return unless $token;
 
-    my $field = $self->token_field || 'access_token';
+    my $id;
+    ($id, $token) = split /-/, $token, 2;
+    return unless $id =~ /^[1-9]\d*$/;
 
-    my $value = $token;
-    if (my $lookup = $self->token_lookup) {
-        $value = {};
-        foreach (keys %$lookup) {
-            my $v = $lookup->{$_};
-            $v =~ s/TOKEN/$token/;
-            $value->{$_} = $v;
-        }
-    }
-    my $user_obj = $realm->find_user({ $field => $value }, $c);
-    if (ref $user_obj) {
+    my $user_obj = $realm->find_user({ id => $id }, $c);
+    if (ref($user_obj) && $self->check_token($user_obj, $token)) {
         return $user_obj;
     }
+    return;
+}
+
+sub check_token {
+    my ($self, $user, $token) = @_;
+
+    my $field = $self->token_field || 'access_token';
+    my $value = $user->$field;
+    return $user->_column_encoders->{password}->($token, $value) eq $value;
 }
 
 __PACKAGE__;
@@ -102,12 +104,6 @@ depending on the storage class used, but is most likely something like
 'access_token'. In fact, this is so common that if this is left out of the
 config, it defaults to 'access_token'.
 
-=item token_lookup
-
-If the token isn't a field on its own, but contained within another field, you
-can provide a custom lookup here, where the string TOKEN in a value will be
-replaced by the access token.
-
 =back
 
 =head1 USAGE
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 4ca6f23cb..638fcc4e4 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -101,9 +101,6 @@ __PACKAGE__->config(
             use_session => 0,
             credential => {
                 class => 'AccessToken',
-                token_field => 'extra',
-                # This means the token has to be 18 characters long (as generated by AuthToken)
-                token_lookup => { like => "%access_token,T18:TOKEN,%" },
             },
             store => $store,
         },
diff --git a/perllib/FixMyStreet/App/Controller/Auth/Profile.pm b/perllib/FixMyStreet/App/Controller/Auth/Profile.pm
index a89c6f539..a5dc5d3e7 100644
--- a/perllib/FixMyStreet/App/Controller/Auth/Profile.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth/Profile.pm
@@ -188,9 +188,10 @@ sub generate_token : Path('/auth/generate_token') {
 
         if ($c->get_param('generate_token')) {
             my $token = mySociety::AuthToken::random_token();
-            $c->user->set_extra_metadata('access_token', $token);
+            my $u = FixMyStreet::DB->resultset("User")->new({ password => $token });
+            $c->user->set_extra_metadata('access_token', $u->password);
             $c->user->update;
-            $c->stash->{token_generated} = 1;
+            $c->stash->{token_generated} = $c->user->id . '-' . $token;
         }
 
         my $action = $c->get_param('2fa_action') || '';
@@ -224,7 +225,7 @@ sub generate_token : Path('/auth/generate_token') {
     }
 
     $c->stash->{has_2fa} = $has_2fa ? 1 : 0;
-    $c->stash->{existing_token} = $c->user->get_extra_metadata('access_token');
+    $c->stash->{existing_token} = $c->user->get_extra_metadata('access_token') ? 1 : 0;
 }
 
 __PACKAGE__->meta->make_immutable;
diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm
index 49338f245..e5be14abf 100644
--- a/perllib/FixMyStreet/DB/Result/User.pm
+++ b/perllib/FixMyStreet/DB/Result/User.pm
@@ -179,6 +179,11 @@ sub check_password {
     }
 }
 
+sub access_token {
+    my $self = shift;
+    return $self->get_extra_metadata('access_token');
+}
+
 around password => sub {
     my ($orig, $self) = (shift, shift);
     if (@_) {
diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t
index 24deb8cab..8b4b772fc 100644
--- a/t/app/controller/auth.t
+++ b/t/app/controller/auth.t
@@ -245,19 +245,20 @@ subtest "check logging in with token" => sub {
 
     my $user =  FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
     # token needs to be 18 characters
-    $user->set_extra_metadata('access_token', '1234567890abcdefgh');
+    my $u = FixMyStreet::DB->resultset("User")->new({ password => '1234567890abcdefgh' });
+    $user->set_extra_metadata('access_token', $u->password);
     $user->update();
 
-    $mech->add_header('Authorization', 'Bearer 1234567890abcdefgh');
+    $mech->add_header('Authorization', 'Bearer ' . $user->id . '-1234567890abcdefgh');
     $mech->logged_in_ok;
 
     $mech->delete_header('Authorization');
     $mech->not_logged_in_ok;
 
-    $mech->get_ok('/auth/check_auth?access_token=1234567890abcdefgh');
+    $mech->get_ok('/auth/check_auth?access_token=' . $user->id . '-1234567890abcdefgh');
 
-    $mech->add_header('Authorization', 'Bearer 1234567890abcdefgh');
-    $user->set_extra_metadata('access_token', 'XXXXXXXXXXXXXXXXXX');
+    $mech->add_header('Authorization', 'Bearer ' . $user->id . '-1234567890abcdefgh');
+    $user->set_extra_metadata('access_token', '$2a$08$HNslSx7Uic7q6Ti5WYT5JOT6npYPwrwLnDMJMJoD22LIqG5TfDIKf');
     $user->update();
     $mech->not_logged_in_ok;
 
diff --git a/t/app/controller/auth_profile.t b/t/app/controller/auth_profile.t
index e5dfe2764..230e02d2b 100644
--- a/t/app/controller/auth_profile.t
+++ b/t/app/controller/auth_profile.t
@@ -417,16 +417,16 @@ subtest "Test generate token page" => sub {
         "submit generate token form"
     );
     $mech->content_contains( 'Your token has been generated', "token generated" );
+    my ($token) = $mech->content =~ /<span>(.*?)<\/span>/;
+    my @parts = split /-/, $token, 2;
+    is $parts[0], $user->id, 'token has user ID at start';
 
     $user->discard_changes();
-    my $token = $user->get_extra_metadata('access_token');
-    ok $token, 'access token set';
-
-    $mech->content_contains($token, 'access token displayed');
+    $user->password($user->get_extra_metadata('access_token'), 1);
+    ok $user->check_password($parts[1]), 'access token set';
 
     $mech->get_ok('/auth/generate_token');
-    $mech->content_contains('Current token:');
-    $mech->content_contains($token, 'access token displayed');
+    $mech->content_lacks($parts[1], 'access token not displayed');
     $mech->content_contains('If you generate a new token');
 
     $mech->log_out_ok;
diff --git a/t/app/controller/dashboard.t b/t/app/controller/dashboard.t
index c62ada89a..0f07bcae0 100644
--- a/t/app/controller/dashboard.t
+++ b/t/app/controller/dashboard.t
@@ -236,14 +236,15 @@ FixMyStreet::override_config {
     subtest 'export as csv using token' => sub {
         $mech->log_out_ok;
 
-        $counciluser->set_extra_metadata('access_token', '1234567890abcdefgh');
+        my $u = FixMyStreet::DB->resultset("User")->new({ password => '1234567890abcdefgh' });
+        $counciluser->set_extra_metadata('access_token', $u->password);
         $counciluser->update();
 
         $mech->get_ok('/dashboard?export=1');
         like $mech->res->header('Content-type'), qr'text/html';
         $mech->content_lacks('Report ID');
 
-        $mech->add_header('Authorization', 'Bearer 1234567890abcdefgh');
+        $mech->add_header('Authorization', 'Bearer ' . $counciluser->id . '-1234567890abcdefgh');
         $mech->get_ok('/dashboard?export=1');
         like $mech->res->header('Content-type'), qr'text/csv';
         $mech->content_contains('Report ID');
diff --git a/templates/web/base/auth/generate_token.html b/templates/web/base/auth/generate_token.html
index 9152d0cb3..7654e11eb 100644
--- a/templates/web/base/auth/generate_token.html
+++ b/templates/web/base/auth/generate_token.html
@@ -9,7 +9,11 @@ INCLUDE 'header.html', title = loc('Security'), bodyclass = 'fullwidthpage'
 
     <p>
         <strong>[% loc('Token') %]:</strong>
-        <span>[% existing_token | html %]</span>
+        <span>[% token_generated %]</span>
+    </p>
+
+    <p>
+        [% loc('This will be the only time this token is visible, so please make a note of it now.') %]
     </p>
 
     <p><a href="/my">[% loc('Your account') %]</a></p>
@@ -67,13 +71,6 @@ INCLUDE 'header.html', title = loc('Security'), bodyclass = 'fullwidthpage'
 
     <input type="hidden" name="token" value="[% csrf_token %]">
 
-    [% IF existing_token %]
-        <p>
-            <strong>[% loc('Current token:') %]</strong>
-            <span>[% existing_token | html %]</span>
-        </p>
-    [% END %]
-
     <p>
     <input name="generate_token" type="submit" class="btn" value="[% existing_token ? loc('Replace token') : loc('Generate token') %]">
     </p>
-- 
cgit v1.2.3


From 1909028b0956cbd0bf4ed17d8be942bd6f77e78c Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 25 Jun 2020 16:00:36 +0100
Subject: [Docker] Specify MAPIT_URL.

Letting the code pick a default MAPIT_URL means it picks port 8000,
which will not work with the current Docker container setup.
---
 conf/general.yml-docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/general.yml-docker b/conf/general.yml-docker
index 33dcad67b..0b6cd5c33 100644
--- a/conf/general.yml-docker
+++ b/conf/general.yml-docker
@@ -110,7 +110,7 @@ PHOTO_STORAGE_OPTIONS:
 #   MAPIT_URL: 'http://global.mapit.mysociety.org/'
 # And then specify whichever type code have the boundaries you want:
 #   MAPIT_TYPES: [ 'O06' ]
-MAPIT_URL: ''
+MAPIT_URL: 'http://localhost:9000/fakemapit/'
 MAPIT_TYPES: [ 'ZZZ' ]
 
 # If the MapIt you're using in MAPIT_URL requires an API key
-- 
cgit v1.2.3


From e623594f10d74a8dfb5eaea801c43f4996b15a1e Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 30 Jun 2020 16:43:29 +0100
Subject: Include file extensions in Dropzone acceptedFiles.

In my Firefox on Windows, .jpeg files are not otherwise shown.
---
 CHANGELOG.md                            | 1 +
 web/cobrands/fixmystreet/fixmystreet.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index decfa2b5e..d0b56165b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
         - Fix double encoding of per-category templates.
         - Return reports in all closed states through Open311.
         - Skip accounts without email when sending inactive emails.
+        - Include file extensions in Dropzone accepted photo config.
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index cd98b233b..d79f17049 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -705,7 +705,7 @@ $.extend(fixmystreet.set_up, {
         resizeWidth: 2048,
         resizeHeight: 2048,
         resizeQuality: 0.6,
-        acceptedFiles: 'image/jpeg,image/pjpeg,image/gif,image/tiff,image/png',
+        acceptedFiles: 'image/jpeg,image/pjpeg,image/gif,image/tiff,image/png,.png,.tiff,.tif,.gif,.jpeg,.jpg',
         dictDefaultMessage: default_message,
         dictCancelUploadConfirmation: translation_strings.upload_cancel_confirmation,
         dictInvalidFileType: translation_strings.upload_invalid_file_type,
-- 
cgit v1.2.3


From 47df99daf6371eb3d7cdbe1ac9170a7f88749dc1 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 30 Jun 2020 16:46:29 +0100
Subject: Fix photo orientation in modern browsers.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We use Dropzone (the photo upload library) to shrink photos client-side
before uploading in the background and display thumbnails. For the
resized upload, Dropzone restores the original Exif data, including
orientation, so it can be correctly oriented server-side; for a
thumbnail, it orients the image itself for immediate display.

Recently, browsers have started honouring Exif orientation much more
widely (Chrome 81+ and Firefox 77+ both now do it by default). This
means the data Dropzone gets from a resize has already been oriented
according to the Exif orientation data. Then Dropzone either looks at
the orientation to correct for display (thumbnail), or adds back the
Exif orientation data (upload) – in both cases, this leads to a double
implementation of the orientation, and an incorrect display.

To fix this, if we detect we are on a modern browser, we do not try and
fix orientation ourself [1], and in all cases we do not add any Exif
data back in (we only strip it server-side anyway). Conversely, that
means on a non-modern browser, we always perform a manual orientation
because no Exif data will be being sent server-side.

Also includes a fix to the orientation code [2] which wouldn't be
noticed in thumbnail generation as they are square, but could be now we
may be orienting full size photos.

[1] https://gitlab.com/meno/dropzone/-/merge_requests/80
[2] https://gitlab.com/meno/dropzone/-/merge_requests/45
---
 CHANGELOG.md               |   1 +
 web/js/dropzone.js.patch   | 287 +++++++++++++++++++++++++++++++++++++++------
 web/vendor/dropzone.min.js |  67 ++++++++++-
 3 files changed, 315 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0b56165b..93292785c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
         - Return reports in all closed states through Open311.
         - Skip accounts without email when sending inactive emails.
         - Include file extensions in Dropzone accepted photo config.
+        - Fix photo orientation in modern browsers.
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/web/js/dropzone.js.patch b/web/js/dropzone.js.patch
index b325b45d8..60a82709a 100644
--- a/web/js/dropzone.js.patch
+++ b/web/js/dropzone.js.patch
@@ -1,17 +1,92 @@
---- dropzone.5.1.1.js	2017-06-30 09:46:43.000000000 +0100
-+++ dropzone.exiffixes.js	2017-06-30 18:25:27.000000000 +0100
-@@ -1175,9 +1175,7 @@
-           };
-           if ((typeof EXIF !== "undefined" && EXIF !== null) && fixOrientation) {
-             loadExif = function(callback) {
+--- dropzone.5.1.1.js	2020-06-30 15:56:05.557790000 +0100
++++ dropzone.exiffixes.js	2020-06-30 16:40:22.794951100 +0100
+@@ -26,7 +26,7 @@
+  */
+ 
+ (function() {
+-  var Dropzone, Emitter, ExifRestore, camelize, contentLoaded, detectVerticalSquash, drawImageIOSFix, noop, without,
++  var Dropzone, Emitter, camelize, contentLoaded, detectVerticalSquash, drawImageIOSFix, noop, without,
+     slice = [].slice,
+     extend1 = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+     hasProp = {}.hasOwnProperty;
+@@ -1123,7 +1123,7 @@
+     };
+ 
+     Dropzone.prototype.resizeImage = function(file, width, height, resizeMethod, callback) {
+-      return this.createThumbnail(file, width, height, resizeMethod, false, (function(_this) {
++      return this.createThumbnail(file, width, height, resizeMethod, true, (function(_this) {
+         return function(dataUrl, canvas) {
+           var resizeMimeType, resizedDataURL;
+           if (canvas === null) {
+@@ -1134,9 +1134,6 @@
+               resizeMimeType = file.type;
+             }
+             resizedDataURL = canvas.toDataURL(resizeMimeType, _this.options.resizeQuality);
+-            if (resizeMimeType === 'image/jpeg' || resizeMimeType === 'image/jpg') {
+-              resizedDataURL = ExifRestore.restore(file.dataURL, resizedDataURL);
+-            }
+             return callback(Dropzone.dataURItoBlob(resizedDataURL));
+           }
+         };
+@@ -1164,23 +1161,17 @@
+     Dropzone.prototype.createThumbnailFromUrl = function(file, width, height, resizeMethod, fixOrientation, callback, crossOrigin) {
+       var img;
+       img = document.createElement("img");
++
++      // FixOrientation not needed anymore with browsers handling imageOrientation
++      fixOrientation = (getComputedStyle(document.body)['imageOrientation'] == 'from-image') ? false : fixOrientation;
++
+       if (crossOrigin) {
+         img.crossOrigin = crossOrigin;
+       }
+       img.onload = (function(_this) {
+         return function() {
+-          var loadExif;
+-          loadExif = function(callback) {
+-            return callback(1);
+-          };
+-          if ((typeof EXIF !== "undefined" && EXIF !== null) && fixOrientation) {
+-            loadExif = function(callback) {
 -              return EXIF.getData(img, function() {
 -                return callback(EXIF.getTag(this, 'Orientation'));
 -              });
-+              return callback(EXIF.getData(img));
-             };
-           }
-           return loadExif(function(orientation) {
-@@ -1601,7 +1599,7 @@
+-            };
+-          }
+-          return loadExif(function(orientation) {
++          var orientation = fixOrientation ? EXIF.getData(img) : 1;
++
+             var canvas, ctx, ref, ref1, ref2, ref3, resizeInfo, thumbnail;
+             file.width = img.width;
+             file.height = img.height;
+@@ -1212,23 +1203,23 @@
+                 break;
+               case 6:
+                 ctx.rotate(0.5 * Math.PI);
+-                ctx.translate(0, -canvas.height);
++                ctx.translate(0, -canvas.width);
+                 break;
+               case 7:
+                 ctx.rotate(0.5 * Math.PI);
+-                ctx.translate(canvas.width, -canvas.height);
++                ctx.translate(canvas.height, -canvas.width);
+                 ctx.scale(-1, 1);
+                 break;
+               case 8:
+                 ctx.rotate(-0.5 * Math.PI);
+-                ctx.translate(-canvas.width, 0);
++                ctx.translate(-canvas.height, 0);
+             }
+             drawImageIOSFix(ctx, img, (ref = resizeInfo.srcX) != null ? ref : 0, (ref1 = resizeInfo.srcY) != null ? ref1 : 0, resizeInfo.srcWidth, resizeInfo.srcHeight, (ref2 = resizeInfo.trgX) != null ? ref2 : 0, (ref3 = resizeInfo.trgY) != null ? ref3 : 0, resizeInfo.trgWidth, resizeInfo.trgHeight);
+             thumbnail = canvas.toDataURL("image/png");
+             if (callback != null) {
+               return callback(thumbnail, canvas);
+             }
+-          });
++
+         };
+       })(this);
+       if (callback != null) {
+@@ -1601,7 +1592,7 @@
      return results;
    };
  
@@ -20,31 +95,165 @@
  
    Dropzone.isBrowserSupported = function() {
      var capableBrowser, j, len, ref, regex;
-@@ -1904,6 +1902,27 @@
-       var array, ato, buf, imageData, mae, separatePoint;
-       imageData = resizedFileBase64.replace('data:image/jpeg;base64,', '');
-       buf = this.decode64(imageData);
-+
-+      // Certain browsers (I'm looking at you, Safari) 'helpfully' provide their
-+      // own EXIF data in the JPEG returned from HTMLCanvasElement.toDataURL.
-+      // Dropzone doesn't take this into account when restoring the original
-+      // file's EXIF, meaning the final uploaded file has two sets of EXIF.
-+      // Certain JPEG tools (I'm looking at you, jhead) don't really handle this
-+      // very well, either ignoring the duplicate EXIF, picking the wrong one
-+      // or refusing to process the file entirely.
-+      // Seems like the best way out of this mess is to make sure the uploaded
-+      // JPEG only ever has one EXIF header. In this case, we want to keep the
-+      // EXIF from the original file.
-+      // This little loop inspects the new JPEG from the toDataURL call and
-+      // strips out any existing EXIF headers (technically any APP1 headers,
-+      // but same difference in this case).
-+      for (var i = 0; i < buf.length; i++) {
-+          if (buf[i] === 255 && buf[i+1] === 225) {
-+              var length = buf[i + 2] * 256 + buf[i + 3] + 2;
-+              buf.splice(i, length);
-+          }
-+      }
-+
-       separatePoint = buf.indexOf(255, 3);
-       mae = buf.slice(0, separatePoint);
-       ato = buf.slice(separatePoint);
+@@ -1828,161 +1819,6 @@
+     return ctx.drawImage(img, sx, sy, sw, sh, dx, dy, dw, dh / vertSquashRatio);
+   };
+ 
+-  ExifRestore = (function() {
+-    function ExifRestore() {}
+-
+-    ExifRestore.KEY_STR = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+-
+-    ExifRestore.encode64 = function(input) {
+-      var chr1, chr2, chr3, enc1, enc2, enc3, enc4, i, output;
+-      output = '';
+-      chr1 = void 0;
+-      chr2 = void 0;
+-      chr3 = '';
+-      enc1 = void 0;
+-      enc2 = void 0;
+-      enc3 = void 0;
+-      enc4 = '';
+-      i = 0;
+-      while (true) {
+-        chr1 = input[i++];
+-        chr2 = input[i++];
+-        chr3 = input[i++];
+-        enc1 = chr1 >> 2;
+-        enc2 = (chr1 & 3) << 4 | chr2 >> 4;
+-        enc3 = (chr2 & 15) << 2 | chr3 >> 6;
+-        enc4 = chr3 & 63;
+-        if (isNaN(chr2)) {
+-          enc3 = enc4 = 64;
+-        } else if (isNaN(chr3)) {
+-          enc4 = 64;
+-        }
+-        output = output + this.KEY_STR.charAt(enc1) + this.KEY_STR.charAt(enc2) + this.KEY_STR.charAt(enc3) + this.KEY_STR.charAt(enc4);
+-        chr1 = chr2 = chr3 = '';
+-        enc1 = enc2 = enc3 = enc4 = '';
+-        if (!(i < input.length)) {
+-          break;
+-        }
+-      }
+-      return output;
+-    };
+-
+-    ExifRestore.restore = function(origFileBase64, resizedFileBase64) {
+-      var image, rawImage, segments;
+-      if (!origFileBase64.match('data:image/jpeg;base64,')) {
+-        return resizedFileBase64;
+-      }
+-      rawImage = this.decode64(origFileBase64.replace('data:image/jpeg;base64,', ''));
+-      segments = this.slice2Segments(rawImage);
+-      image = this.exifManipulation(resizedFileBase64, segments);
+-      return 'data:image/jpeg;base64,' + this.encode64(image);
+-    };
+-
+-    ExifRestore.exifManipulation = function(resizedFileBase64, segments) {
+-      var aBuffer, exifArray, newImageArray;
+-      exifArray = this.getExifArray(segments);
+-      newImageArray = this.insertExif(resizedFileBase64, exifArray);
+-      aBuffer = new Uint8Array(newImageArray);
+-      return aBuffer;
+-    };
+-
+-    ExifRestore.getExifArray = function(segments) {
+-      var seg, x;
+-      seg = void 0;
+-      x = 0;
+-      while (x < segments.length) {
+-        seg = segments[x];
+-        if (seg[0] === 255 & seg[1] === 225) {
+-          return seg;
+-        }
+-        x++;
+-      }
+-      return [];
+-    };
+-
+-    ExifRestore.insertExif = function(resizedFileBase64, exifArray) {
+-      var array, ato, buf, imageData, mae, separatePoint;
+-      imageData = resizedFileBase64.replace('data:image/jpeg;base64,', '');
+-      buf = this.decode64(imageData);
+-      separatePoint = buf.indexOf(255, 3);
+-      mae = buf.slice(0, separatePoint);
+-      ato = buf.slice(separatePoint);
+-      array = mae;
+-      array = array.concat(exifArray);
+-      array = array.concat(ato);
+-      return array;
+-    };
+-
+-    ExifRestore.slice2Segments = function(rawImageArray) {
+-      var endPoint, head, length, seg, segments;
+-      head = 0;
+-      segments = [];
+-      while (true) {
+-        if (rawImageArray[head] === 255 & rawImageArray[head + 1] === 218) {
+-          break;
+-        }
+-        if (rawImageArray[head] === 255 & rawImageArray[head + 1] === 216) {
+-          head += 2;
+-        } else {
+-          length = rawImageArray[head + 2] * 256 + rawImageArray[head + 3];
+-          endPoint = head + length + 2;
+-          seg = rawImageArray.slice(head, endPoint);
+-          segments.push(seg);
+-          head = endPoint;
+-        }
+-        if (head > rawImageArray.length) {
+-          break;
+-        }
+-      }
+-      return segments;
+-    };
+-
+-    ExifRestore.decode64 = function(input) {
+-      var base64test, buf, chr1, chr2, chr3, enc1, enc2, enc3, enc4, i, output;
+-      output = '';
+-      chr1 = void 0;
+-      chr2 = void 0;
+-      chr3 = '';
+-      enc1 = void 0;
+-      enc2 = void 0;
+-      enc3 = void 0;
+-      enc4 = '';
+-      i = 0;
+-      buf = [];
+-      base64test = /[^A-Za-z0-9\+\/\=]/g;
+-      if (base64test.exec(input)) {
+-        console.warning('There were invalid base64 characters in the input text.\n' + 'Valid base64 characters are A-Z, a-z, 0-9, \'+\', \'/\',and \'=\'\n' + 'Expect errors in decoding.');
+-      }
+-      input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
+-      while (true) {
+-        enc1 = this.KEY_STR.indexOf(input.charAt(i++));
+-        enc2 = this.KEY_STR.indexOf(input.charAt(i++));
+-        enc3 = this.KEY_STR.indexOf(input.charAt(i++));
+-        enc4 = this.KEY_STR.indexOf(input.charAt(i++));
+-        chr1 = enc1 << 2 | enc2 >> 4;
+-        chr2 = (enc2 & 15) << 4 | enc3 >> 2;
+-        chr3 = (enc3 & 3) << 6 | enc4;
+-        buf.push(chr1);
+-        if (enc3 !== 64) {
+-          buf.push(chr2);
+-        }
+-        if (enc4 !== 64) {
+-          buf.push(chr3);
+-        }
+-        chr1 = chr2 = chr3 = '';
+-        enc1 = enc2 = enc3 = enc4 = '';
+-        if (!(i < input.length)) {
+-          break;
+-        }
+-      }
+-      return buf;
+-    };
+-
+-    return ExifRestore;
+-
+-  })();
+-
+-
+   /*
+    * contentloaded.js
+    *
diff --git a/web/vendor/dropzone.min.js b/web/vendor/dropzone.min.js
index dd326fc51..901bd08ee 100644
--- a/web/vendor/dropzone.min.js
+++ b/web/vendor/dropzone.min.js
@@ -1 +1,66 @@
-(function(){var a={};window.EXIF=a;function b(f,d){var l="";for(var e=d;e<d+4;e++){l+=String.fromCharCode(f.getUint8(e))}if(l!="Exif"){return false}var j,m=d+6;if(f.getUint16(m)==18761){j=false}else{if(f.getUint16(m)==19789){j=true}else{return false}}if(f.getUint16(m+2,!j)!=42){return false}var c=f.getUint32(m+4,!j);if(c<8){return false}var p=m+c,h=f.getUint16(p,!j),o={},k,g;for(g=0;g<h;g++){k=p+g*12+2;if(f.getUint16(k,!j)==274){return parseInt(f.getUint16(k+8,!j),10)}}return false}a.getData=function(l){if((l instanceof Image||l instanceof HTMLImageElement)&&!l.complete){return false}var k=l.src;if(k.match(/^http/)){var d=document.createElement("canvas"),q=d.getContext("2d");d.width=l.width;d.height=l.height;q.drawImage(l,0,0);k=d.toDataURL("image/jpeg")}var m=k.replace(/^data\:([^\;]+)\;base64,/gmi,"");var j=atob(m);var n=j.length;var e=new ArrayBuffer(n);var o=new Uint8Array(e);for(var h=0;h<n;h++){o[h]=j.charCodeAt(h)}var p=new DataView(e);if((p.getUint8(0)!=255)||(p.getUint8(1)!=216)){return false}var f=2,c=e.byteLength,g;while(f<c){if(p.getUint8(f)!=255){return false}g=p.getUint8(f+1);if(g==225){return b(p,f+4)}else{f+=2+p.getUint16(f+2)}}}})();(function(){var g,i,f,c,d,b,e,l,k,j=[].slice,a=function(p,n){for(var m in n){if(h.call(n,m)){p[m]=n[m]}}function o(){this.constructor=p}o.prototype=n.prototype;p.prototype=new o();p.__super__=n.prototype;return p},h={}.hasOwnProperty;l=function(){};i=(function(){function m(){}m.prototype.addEventListener=m.prototype.on;m.prototype.on=function(o,n){this._callbacks=this._callbacks||{};if(!this._callbacks[o]){this._callbacks[o]=[]}this._callbacks[o].push(n);return this};m.prototype.emit=function(){var p,s,r,q,o,n;q=arguments[0],p=2<=arguments.length?j.call(arguments,1):[];this._callbacks=this._callbacks||{};r=this._callbacks[q];if(r){for(o=0,n=r.length;o<n;o++){s=r[o];s.apply(this,p)}}return this};m.prototype.removeListener=m.prototype.off;m.prototype.removeAllListeners=m.prototype.off;m.prototype.removeEventListener=m.prototype.off;m.prototype.off=function(s,q){var t,r,p,o,n;if(!this._callbacks||arguments.length===0){this._callbacks={};return this}r=this._callbacks[s];if(!r){return this}if(arguments.length===1){delete this._callbacks[s];return this}for(p=o=0,n=r.length;o<n;p=++o){t=r[p];if(t===q){r.splice(p,1);break}}return this};return m})();g=(function(o){var p,m;a(n,o);n.prototype.Emitter=i;n.prototype.events=["drop","dragstart","dragend","dragenter","dragover","dragleave","addedfile","addedfiles","removedfile","thumbnail","error","errormultiple","processing","processingmultiple","uploadprogress","totaluploadprogress","sending","sendingmultiple","success","successmultiple","canceled","canceledmultiple","complete","completemultiple","reset","maxfilesexceeded","maxfilesreached","queuecomplete"];n.prototype.defaultOptions={url:null,method:"post",withCredentials:false,timeout:30000,parallelUploads:2,uploadMultiple:false,maxFilesize:256,paramName:"file",createImageThumbnails:true,maxThumbnailFilesize:10,thumbnailWidth:120,thumbnailHeight:120,thumbnailMethod:"crop",resizeWidth:null,resizeHeight:null,resizeMimeType:null,resizeQuality:0.8,resizeMethod:"contain",filesizeBase:1000,maxFiles:null,params:{},headers:null,clickable:true,ignoreHiddenFiles:true,acceptedFiles:null,acceptedMimeTypes:null,autoProcessQueue:true,autoQueue:true,addRemoveLinks:false,previewsContainer:null,hiddenInputContainer:"body",capture:null,renameFilename:null,renameFile:null,forceFallback:false,dictDefaultMessage:"Drop files here to upload",dictFallbackMessage:"Your browser does not support drag'n'drop file uploads.",dictFallbackText:"Please use the fallback form below to upload your files like in the olden days.",dictFileTooBig:"File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.",dictInvalidFileType:"You can't upload files of this type.",dictResponseError:"Server responded with {{statusCode}} code.",dictCancelUpload:"Cancel upload",dictCancelUploadConfirmation:"Are you sure you want to cancel this upload?",dictRemoveFile:"Remove file",dictRemoveFileConfirmation:null,dictMaxFilesExceeded:"You can not upload any more files.",dictFileSizeUnits:{tb:"TB",gb:"GB",mb:"MB",kb:"KB",b:"b"},init:function(){return l},accept:function(r,q){return q()},fallback:function(){var v,r,q,s,u,t;this.element.className=this.element.className+" dz-browser-not-supported";u=this.element.getElementsByTagName("div");for(r=0,q=u.length;r<q;r++){v=u[r];if(/(^| )dz-message($| )/.test(v.className)){s=v;v.className="dz-message";continue}}if(!s){s=n.createElement('<div class="dz-message"><span></span></div>');this.element.appendChild(s)}t=s.getElementsByTagName("span")[0];if(t){if(t.textContent!=null){t.textContent=this.options.dictFallbackMessage}else{if(t.innerText!=null){t.innerText=this.options.dictFallbackMessage}}}return this.element.appendChild(this.getFallbackForm())},resize:function(s,u,q,w){var v,t,r;v={srcX:0,srcY:0,srcWidth:s.width,srcHeight:s.height};t=s.width/s.height;if((u==null)&&(q==null)){u=v.srcWidth;q=v.srcHeight}else{if(u==null){u=q*t}else{if(q==null){q=u/t}}}u=Math.min(u,v.srcWidth);q=Math.min(q,v.srcHeight);r=u/q;if(v.srcWidth>u||v.srcHeight>q){if(w==="crop"){if(t>r){v.srcHeight=s.height;v.srcWidth=v.srcHeight*r}else{v.srcWidth=s.width;v.srcHeight=v.srcWidth/r}}else{if(w==="contain"){if(t>r){q=u/t}else{u=q*t}}else{throw new Error("Unknown resizeMethod '"+w+"'")}}}v.srcX=(s.width-v.srcWidth)/2;v.srcY=(s.height-v.srcHeight)/2;v.trgWidth=u;v.trgHeight=q;return v},transformFile:function(r,q){if((this.options.resizeWidth||this.options.resizeHeight)&&r.type.match(/image.*/)){return this.resizeImage(r,this.options.resizeWidth,this.options.resizeHeight,this.options.resizeMethod,q)}else{return q(r)}},previewTemplate:'<div class="dz-preview dz-file-preview">\n  <div class="dz-image"><img data-dz-thumbnail /></div>\n  <div class="dz-details">\n    <div class="dz-size"><span data-dz-size></span></div>\n    <div class="dz-filename"><span data-dz-name></span></div>\n  </div>\n  <div class="dz-progress"><span class="dz-upload" data-dz-uploadprogress></span></div>\n  <div class="dz-error-message"><span data-dz-errormessage></span></div>\n  <div class="dz-success-mark">\n    <svg width="54px" height="54px" viewBox="0 0 54 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">\n      <title>Check</title>\n      <defs></defs>\n      <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">\n        <path d="M23.5,31.8431458 L17.5852419,25.9283877 C16.0248253,24.3679711 13.4910294,24.366835 11.9289322,25.9289322 C10.3700136,27.4878508 10.3665912,30.0234455 11.9283877,31.5852419 L20.4147581,40.0716123 C20.5133999,40.1702541 20.6159315,40.2626649 20.7218615,40.3488435 C22.2835669,41.8725651 24.794234,41.8626202 26.3461564,40.3106978 L43.3106978,23.3461564 C44.8771021,21.7797521 44.8758057,19.2483887 43.3137085,17.6862915 C41.7547899,16.1273729 39.2176035,16.1255422 37.6538436,17.6893022 L23.5,31.8431458 Z M27,53 C41.3594035,53 53,41.3594035 53,27 C53,12.6405965 41.3594035,1 27,1 C12.6405965,1 1,12.6405965 1,27 C1,41.3594035 12.6405965,53 27,53 Z" id="Oval-2" stroke-opacity="0.198794158" stroke="#747474" fill-opacity="0.816519475" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>\n      </g>\n    </svg>\n  </div>\n  <div class="dz-error-mark">\n    <svg width="54px" height="54px" viewBox="0 0 54 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">\n      <title>Error</title>\n      <defs></defs>\n      <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">\n        <g id="Check-+-Oval-2" sketch:type="MSLayerGroup" stroke="#747474" stroke-opacity="0.198794158" fill="#FFFFFF" fill-opacity="0.816519475">\n          <path d="M32.6568542,29 L38.3106978,23.3461564 C39.8771021,21.7797521 39.8758057,19.2483887 38.3137085,17.6862915 C36.7547899,16.1273729 34.2176035,16.1255422 32.6538436,17.6893022 L27,23.3431458 L21.3461564,17.6893022 C19.7823965,16.1255422 17.2452101,16.1273729 15.6862915,17.6862915 C14.1241943,19.2483887 14.1228979,21.7797521 15.6893022,23.3461564 L21.3431458,29 L15.6893022,34.6538436 C14.1228979,36.2202479 14.1241943,38.7516113 15.6862915,40.3137085 C17.2452101,41.8726271 19.7823965,41.8744578 21.3461564,40.3106978 L27,34.6568542 L32.6538436,40.3106978 C34.2176035,41.8744578 36.7547899,41.8726271 38.3137085,40.3137085 C39.8758057,38.7516113 39.8771021,36.2202479 38.3106978,34.6538436 L32.6568542,29 Z M27,53 C41.3594035,53 53,41.3594035 53,27 C53,12.6405965 41.3594035,1 27,1 C12.6405965,1 1,12.6405965 1,27 C1,41.3594035 12.6405965,53 27,53 Z" id="Oval-2" sketch:type="MSShapeGroup"></path>\n        </g>\n      </g>\n    </svg>\n  </div>\n</div>',drop:function(q){return this.element.classList.remove("dz-drag-hover")},dragstart:l,dragend:function(q){return this.element.classList.remove("dz-drag-hover")},dragenter:function(q){return this.element.classList.add("dz-drag-hover")},dragover:function(q){return this.element.classList.add("dz-drag-hover")},dragleave:function(q){return this.element.classList.remove("dz-drag-hover")},paste:l,reset:function(){return this.element.classList.remove("dz-started")},addedfile:function(s){var w,u,t,B,x,v,r,q,C,A,z,D,y;if(this.element===this.previewsContainer){this.element.classList.add("dz-started")}if(this.previewsContainer){s.previewElement=n.createElement(this.options.previewTemplate.trim());s.previewTemplate=s.previewElement;this.previewsContainer.appendChild(s.previewElement);q=s.previewElement.querySelectorAll("[data-dz-name]");for(w=0,B=q.length;w<B;w++){r=q[w];r.textContent=s.name}C=s.previewElement.querySelectorAll("[data-dz-size]");for(u=0,x=C.length;u<x;u++){r=C[u];r.innerHTML=this.filesize(s.size)}if(this.options.addRemoveLinks){s._removeLink=n.createElement('<a class="dz-remove" href="javascript:undefined;" data-dz-remove>'+this.options.dictRemoveFile+"</a>");s.previewElement.appendChild(s._removeLink)}z=(function(E){return function(F){F.preventDefault();F.stopPropagation();if(s.status===n.UPLOADING){return n.confirm(E.options.dictCancelUploadConfirmation,function(){return E.removeFile(s)})}else{if(E.options.dictRemoveFileConfirmation){return n.confirm(E.options.dictRemoveFileConfirmation,function(){return E.removeFile(s)})}else{return E.removeFile(s)}}}})(this);A=s.previewElement.querySelectorAll("[data-dz-remove]");y=[];for(t=0,v=A.length;t<v;t++){D=A[t];y.push(D.addEventListener("click",z))}return y}},removedfile:function(q){var r;if(q.previewElement){if((r=q.previewElement)!=null){r.parentNode.removeChild(q.previewElement)}}return this._updateMaxFilesReachedClass()},thumbnail:function(t,v){var s,q,u,r;if(t.previewElement){t.previewElement.classList.remove("dz-file-preview");u=t.previewElement.querySelectorAll("[data-dz-thumbnail]");for(s=0,q=u.length;s<q;s++){r=u[s];r.alt=t.name;r.src=v}return setTimeout(((function(w){return function(){return t.previewElement.classList.add("dz-image-preview")}})(this)),1)}},error:function(t,w){var r,q,v,u,s;if(t.previewElement){t.previewElement.classList.add("dz-error");if(typeof w!=="String"&&w.error){w=w.error}u=t.previewElement.querySelectorAll("[data-dz-errormessage]");s=[];for(r=0,q=u.length;r<q;r++){v=u[r];s.push(v.textContent=w)}return s}},errormultiple:l,processing:function(q){if(q.previewElement){q.previewElement.classList.add("dz-processing");if(q._removeLink){return q._removeLink.textContent=this.options.dictCancelUpload}}},processingmultiple:l,uploadprogress:function(v,s,u){var r,q,x,w,t;if(v.previewElement){w=v.previewElement.querySelectorAll("[data-dz-uploadprogress]");t=[];for(r=0,q=w.length;r<q;r++){x=w[r];if(x.nodeName==="PROGRESS"){t.push(x.value=s)}else{t.push(x.style.width=s+"%")}}return t}},totaluploadprogress:l,sending:l,sendingmultiple:l,success:function(q){if(q.previewElement){return q.previewElement.classList.add("dz-success")}},successmultiple:l,canceled:function(q){return this.emit("error",q,"Upload canceled.")},canceledmultiple:l,complete:function(q){if(q._removeLink){q._removeLink.textContent=this.options.dictRemoveFile}if(q.previewElement){return q.previewElement.classList.add("dz-complete")}},completemultiple:l,maxfilesexceeded:l,maxfilesreached:l,queuecomplete:l,addedfiles:l};p=function(){var s,t,q,r,u,v,w;v=arguments[0],u=2<=arguments.length?j.call(arguments,1):[];for(s=0,q=u.length;s<q;s++){r=u[s];for(t in r){w=r[t];v[t]=w}}return v};function n(t,r){var q,u,s;this.element=t;this.version=n.version;this.defaultOptions.previewTemplate=this.defaultOptions.previewTemplate.replace(/\n*/g,"");this.clickableElements=[];this.listeners=[];this.files=[];if(typeof this.element==="string"){this.element=document.querySelector(this.element)}if(!(this.element&&(this.element.nodeType!=null))){throw new Error("Invalid dropzone element.")}if(this.element.dropzone){throw new Error("Dropzone already attached.")}n.instances.push(this);this.element.dropzone=this;q=(s=n.optionsForElement(this.element))!=null?s:{};this.options=p({},this.defaultOptions,q,r!=null?r:{});if(this.options.forceFallback||!n.isBrowserSupported()){return this.options.fallback.call(this)}if(this.options.url==null){this.options.url=this.element.getAttribute("action")}if(!this.options.url){throw new Error("No URL provided.")}if(this.options.acceptedFiles&&this.options.acceptedMimeTypes){throw new Error("You can't provide both 'acceptedFiles' and 'acceptedMimeTypes'. 'acceptedMimeTypes' is deprecated.")}if(this.options.acceptedMimeTypes){this.options.acceptedFiles=this.options.acceptedMimeTypes;delete this.options.acceptedMimeTypes}if(this.options.renameFilename!=null){this.options.renameFile=(function(v){return function(w){return v.options.renameFilename.call(v,w.name,w)}})(this)}this.options.method=this.options.method.toUpperCase();if((u=this.getExistingFallback())&&u.parentNode){u.parentNode.removeChild(u)}if(this.options.previewsContainer!==false){if(this.options.previewsContainer){this.previewsContainer=n.getElement(this.options.previewsContainer,"previewsContainer")}else{this.previewsContainer=this.element}}if(this.options.clickable){if(this.options.clickable===true){this.clickableElements=[this.element]}else{this.clickableElements=n.getElements(this.options.clickable,"clickable")}}this.init()}n.prototype.getAcceptedFiles=function(){var t,r,q,u,s;u=this.files;s=[];for(r=0,q=u.length;r<q;r++){t=u[r];if(t.accepted){s.push(t)}}return s};n.prototype.getRejectedFiles=function(){var t,r,q,u,s;u=this.files;s=[];for(r=0,q=u.length;r<q;r++){t=u[r];if(!t.accepted){s.push(t)}}return s};n.prototype.getFilesWithStatus=function(r){var u,s,q,v,t;v=this.files;t=[];for(s=0,q=v.length;s<q;s++){u=v[s];if(u.status===r){t.push(u)}}return t};n.prototype.getQueuedFiles=function(){return this.getFilesWithStatus(n.QUEUED)};n.prototype.getUploadingFiles=function(){return this.getFilesWithStatus(n.UPLOADING)};n.prototype.getAddedFiles=function(){return this.getFilesWithStatus(n.ADDED)};n.prototype.getActiveFiles=function(){var t,r,q,u,s;u=this.files;s=[];for(r=0,q=u.length;r<q;r++){t=u[r];if(t.status===n.UPLOADING||t.status===n.QUEUED){s.push(t)}}return s};n.prototype.init=function(){var s,t,q,w,u,r,v;if(this.element.tagName==="form"){this.element.setAttribute("enctype","multipart/form-data")}if(this.element.classList.contains("dropzone")&&!this.element.querySelector(".dz-message")){this.element.appendChild(n.createElement('<div class="dz-default dz-message"><span>'+this.options.dictDefaultMessage+"</span></div>"))}if(this.clickableElements.length){v=(function(x){return function(){if(x.hiddenFileInput){x.hiddenFileInput.parentNode.removeChild(x.hiddenFileInput)}x.hiddenFileInput=document.createElement("input");x.hiddenFileInput.setAttribute("type","file");if((x.options.maxFiles==null)||x.options.maxFiles>1){x.hiddenFileInput.setAttribute("multiple","multiple")}x.hiddenFileInput.className="dz-hidden-input";if(x.options.acceptedFiles!=null){x.hiddenFileInput.setAttribute("accept",x.options.acceptedFiles)}if(x.options.capture!=null){x.hiddenFileInput.setAttribute("capture",x.options.capture)}x.hiddenFileInput.style.visibility="hidden";x.hiddenFileInput.style.position="absolute";x.hiddenFileInput.style.top="0";x.hiddenFileInput.style.left="0";x.hiddenFileInput.style.height="0";x.hiddenFileInput.style.width="0";document.querySelector(x.options.hiddenInputContainer).appendChild(x.hiddenFileInput);return x.hiddenFileInput.addEventListener("change",function(){var A,B,z,y;B=x.hiddenFileInput.files;if(B.length){for(z=0,y=B.length;z<y;z++){A=B[z];x.addFile(A)}}x.emit("addedfiles",B);return v()})}})(this);v()}this.URL=(u=window.URL)!=null?u:window.webkitURL;r=this.events;for(t=0,q=r.length;t<q;t++){s=r[t];this.on(s,this.options[s])}this.on("uploadprogress",(function(x){return function(){return x.updateTotalUploadProgress()}})(this));this.on("removedfile",(function(x){return function(){return x.updateTotalUploadProgress()}})(this));this.on("canceled",(function(x){return function(y){return x.emit("complete",y)}})(this));this.on("complete",(function(x){return function(y){if(x.getAddedFiles().length===0&&x.getUploadingFiles().length===0&&x.getQueuedFiles().length===0){return setTimeout((function(){return x.emit("queuecomplete")}),0)}}})(this));w=function(x){x.stopPropagation();if(x.preventDefault){return x.preventDefault()}else{return x.returnValue=false}};this.listeners=[{element:this.element,events:{dragstart:(function(x){return function(y){return x.emit("dragstart",y)}})(this),dragenter:(function(x){return function(y){w(y);return x.emit("dragenter",y)}})(this),dragover:(function(x){return function(z){var y;try{y=z.dataTransfer.effectAllowed}catch(A){}z.dataTransfer.dropEffect="move"===y||"linkMove"===y?"move":"copy";w(z);return x.emit("dragover",z)}})(this),dragleave:(function(x){return function(y){return x.emit("dragleave",y)}})(this),drop:(function(x){return function(y){w(y);return x.drop(y)}})(this),dragend:(function(x){return function(y){return x.emit("dragend",y)}})(this)}}];this.clickableElements.forEach((function(x){return function(y){return x.listeners.push({element:y,events:{click:function(z){if((y!==x.element)||(z.target===x.element||n.elementInside(z.target,x.element.querySelector(".dz-message")))){x.hiddenFileInput.click()}return true}}})}})(this));this.enable();return this.options.init.call(this)};n.prototype.destroy=function(){var q;this.disable();this.removeAllFiles(true);if((q=this.hiddenFileInput)!=null?q.parentNode:void 0){this.hiddenFileInput.parentNode.removeChild(this.hiddenFileInput);this.hiddenFileInput=null}delete this.element.dropzone;return n.instances.splice(n.instances.indexOf(this),1)};n.prototype.updateTotalUploadProgress=function(){var t,u,s,r,v,x,q,w;q=0;x=0;t=this.getActiveFiles();if(t.length){v=this.getActiveFiles();for(s=0,r=v.length;s<r;s++){u=v[s];q+=u.upload.bytesSent;x+=u.upload.total}w=100*q/x}else{w=100}return this.emit("totaluploadprogress",w,x,q)};n.prototype._getParamName=function(q){if(typeof this.options.paramName==="function"){return this.options.paramName(q)}else{return""+this.options.paramName+(this.options.uploadMultiple?"["+q+"]":"")}};n.prototype._renameFile=function(q){if(typeof this.options.renameFile!=="function"){return q.name}return this.options.renameFile(q)};n.prototype.getFallbackForm=function(){var r,q,t,s;if(r=this.getExistingFallback()){return r}t='<div class="dz-fallback">';if(this.options.dictFallbackText){t+="<p>"+this.options.dictFallbackText+"</p>"}t+='<input type="file" name="'+(this._getParamName(0))+'" '+(this.options.uploadMultiple?'multiple="multiple"':void 0)+' /><input type="submit" value="Upload!"></div>';q=n.createElement(t);if(this.element.tagName!=="FORM"){s=n.createElement('<form action="'+this.options.url+'" enctype="multipart/form-data" method="'+this.options.method+'"></form>');s.appendChild(q)}else{this.element.setAttribute("enctype","multipart/form-data");this.element.setAttribute("method",this.options.method)}return s!=null?s:q};n.prototype.getExistingFallback=function(){var v,t,r,q,u,s;t=function(z){var y,x,w;for(x=0,w=z.length;x<w;x++){y=z[x];if(/(^| )fallback($| )/.test(y.className)){return y}}};u=["div","form"];for(r=0,q=u.length;r<q;r++){s=u[r];if(v=t(this.element.getElementsByTagName(s))){return v}}};n.prototype.setupEventListeners=function(){var v,u,r,q,w,t,s;t=this.listeners;s=[];for(r=0,q=t.length;r<q;r++){v=t[r];s.push((function(){var x,y;x=v.events;y=[];for(u in x){w=x[u];y.push(v.element.addEventListener(u,w,false))}return y})())}return s};n.prototype.removeEventListeners=function(){var v,u,r,q,w,t,s;t=this.listeners;s=[];for(r=0,q=t.length;r<q;r++){v=t[r];s.push((function(){var x,y;x=v.events;y=[];for(u in x){w=x[u];y.push(v.element.removeEventListener(u,w,false))}return y})())}return s};n.prototype.disable=function(){var t,r,q,u,s;this.clickableElements.forEach(function(v){return v.classList.remove("dz-clickable")});this.removeEventListeners();u=this.files;s=[];for(r=0,q=u.length;r<q;r++){t=u[r];s.push(this.cancelUpload(t))}return s};n.prototype.enable=function(){this.clickableElements.forEach(function(q){return q.classList.add("dz-clickable")});return this.setupEventListeners()};n.prototype.filesize=function(y){var r,u,t,v,s,q,x,w;s=0;q="b";if(y>0){w=["tb","gb","mb","kb","b"];for(u=t=0,v=w.length;t<v;u=++t){x=w[u];r=Math.pow(this.options.filesizeBase,4-u)/10;if(y>=r){s=y/Math.pow(this.options.filesizeBase,4-u);q=x;break}}s=Math.round(10*s)/10}return"<strong>"+s+"</strong> "+this.options.dictFileSizeUnits[q]};n.prototype._updateMaxFilesReachedClass=function(){if((this.options.maxFiles!=null)&&this.getAcceptedFiles().length>=this.options.maxFiles){if(this.getAcceptedFiles().length===this.options.maxFiles){this.emit("maxfilesreached",this.files)}return this.element.classList.add("dz-max-files-reached")}else{return this.element.classList.remove("dz-max-files-reached")}};n.prototype.drop=function(s){var r,q;if(!s.dataTransfer){return}this.emit("drop",s);r=s.dataTransfer.files;this.emit("addedfiles",r);if(r.length){q=s.dataTransfer.items;if(q&&q.length&&(q[0].webkitGetAsEntry!=null)){this._addFilesFromItems(q)}else{this.handleFiles(r)}}};n.prototype.paste=function(s){var q,r;if((s!=null?(r=s.clipboardData)!=null?r.items:void 0:void 0)==null){return}this.emit("paste",s);q=s.clipboardData.items;if(q.length){return this._addFilesFromItems(q)}};n.prototype.handleFiles=function(u){var t,r,q,s;s=[];for(r=0,q=u.length;r<q;r++){t=u[r];s.push(this.addFile(t))}return s};n.prototype._addFilesFromItems=function(r){var v,u,s,q,t;t=[];for(s=0,q=r.length;s<q;s++){u=r[s];if((u.webkitGetAsEntry!=null)&&(v=u.webkitGetAsEntry())){if(v.isFile){t.push(this.addFile(u.getAsFile()))}else{if(v.isDirectory){t.push(this._addFilesFromDirectory(v,v.name))}else{t.push(void 0)}}}else{if(u.getAsFile!=null){if((u.kind==null)||u.kind==="file"){t.push(this.addFile(u.getAsFile()))}else{t.push(void 0)}}else{t.push(void 0)}}}return t};n.prototype._addFilesFromDirectory=function(q,u){var t,s,r;t=q.createReader();s=function(v){return typeof console!=="undefined"&&console!==null?typeof console.log==="function"?console.log(v):void 0:void 0};r=(function(v){return function(){return t.readEntries(function(x){var z,y,w;if(x.length>0){for(y=0,w=x.length;y<w;y++){z=x[y];if(z.isFile){z.file(function(A){if(v.options.ignoreHiddenFiles&&A.name.substring(0,1)==="."){return}A.fullPath=u+"/"+A.name;return v.addFile(A)})}else{if(z.isDirectory){v._addFilesFromDirectory(z,u+"/"+z.name)}}}r()}return null},s)}})(this);return r()};n.prototype.accept=function(r,q){if(r.size>this.options.maxFilesize*1024*1024){return q(this.options.dictFileTooBig.replace("{{filesize}}",Math.round(r.size/1024/10.24)/100).replace("{{maxFilesize}}",this.options.maxFilesize))}else{if(!n.isValidFile(r,this.options.acceptedFiles)){return q(this.options.dictInvalidFileType)}else{if((this.options.maxFiles!=null)&&this.getAcceptedFiles().length>=this.options.maxFiles){q(this.options.dictMaxFilesExceeded.replace("{{maxFiles}}",this.options.maxFiles));return this.emit("maxfilesexceeded",r)}else{return this.options.accept.call(this,r,q)}}}};n.prototype.addFile=function(q){q.upload={progress:0,total:q.size,bytesSent:0,filename:this._renameFile(q)};this.files.push(q);q.status=n.ADDED;this.emit("addedfile",q);this._enqueueThumbnail(q);return this.accept(q,(function(r){return function(s){if(s){q.accepted=false;r._errorProcessing([q],s)}else{q.accepted=true;if(r.options.autoQueue){r.enqueueFile(q)}}return r._updateMaxFilesReachedClass()}})(this))};n.prototype.enqueueFiles=function(t){var s,r,q;for(r=0,q=t.length;r<q;r++){s=t[r];this.enqueueFile(s)}return null};n.prototype.enqueueFile=function(q){if(q.status===n.ADDED&&q.accepted===true){q.status=n.QUEUED;if(this.options.autoProcessQueue){return setTimeout(((function(r){return function(){return r.processQueue()}})(this)),0)}}else{throw new Error("This file can't be queued because it has already been processed or was rejected.")}};n.prototype._thumbnailQueue=[];n.prototype._processingThumbnail=false;n.prototype._enqueueThumbnail=function(q){if(this.options.createImageThumbnails&&q.type.match(/image.*/)&&q.size<=this.options.maxThumbnailFilesize*1024*1024){this._thumbnailQueue.push(q);return setTimeout(((function(r){return function(){return r._processThumbnailQueue()}})(this)),0)}};n.prototype._processThumbnailQueue=function(){var q;if(this._processingThumbnail||this._thumbnailQueue.length===0){return}this._processingThumbnail=true;q=this._thumbnailQueue.shift();return this.createThumbnail(q,this.options.thumbnailWidth,this.options.thumbnailHeight,this.options.thumbnailMethod,true,(function(r){return function(s){r.emit("thumbnail",q,s);r._processingThumbnail=false;return r._processThumbnailQueue()}})(this))};n.prototype.removeFile=function(q){if(q.status===n.UPLOADING){this.cancelUpload(q)}this.files=k(this.files,q);this.emit("removedfile",q);if(this.files.length===0){return this.emit("reset")}};n.prototype.removeAllFiles=function(u){var s,r,q,t;if(u==null){u=false}t=this.files.slice();for(r=0,q=t.length;r<q;r++){s=t[r];if(s.status!==n.UPLOADING||u){this.removeFile(s)}}return null};n.prototype.resizeImage=function(r,s,q,t,u){return this.createThumbnail(r,s,q,t,false,(function(v){return function(z,w){var x,y;if(w===null){return u(r)}else{x=v.options.resizeMimeType;if(x==null){x=r.type}y=w.toDataURL(x,v.options.resizeQuality);if(x==="image/jpeg"||x==="image/jpg"){y=f.restore(r.dataURL,y)}return u(n.dataURItoBlob(y))}}})(this))};n.prototype.createThumbnail=function(t,u,q,v,s,w){var r;r=new FileReader;r.onload=(function(x){return function(){t.dataURL=r.result;if(t.type==="image/svg+xml"){if(w!=null){w(r.result)}return}return x.createThumbnailFromUrl(t,u,q,v,s,w)}})(this);return r.readAsDataURL(t)};n.prototype.createThumbnailFromUrl=function(u,v,q,w,t,x,s){var r;r=document.createElement("img");if(s){r.crossOrigin=s}r.onload=(function(y){return function(){var z;z=function(A){return A(1)};if((typeof EXIF!=="undefined"&&EXIF!==null)&&t){z=function(A){return A(EXIF.getData(r))}}return z(function(B){var C,I,D,G,F,E,H,A;u.width=r.width;u.height=r.height;H=y.options.resize.call(y,u,v,q,w);C=document.createElement("canvas");I=C.getContext("2d");C.width=H.trgWidth;C.height=H.trgHeight;if(B>4){C.width=H.trgHeight;C.height=H.trgWidth}switch(B){case 2:I.translate(C.width,0);I.scale(-1,1);break;case 3:I.translate(C.width,C.height);I.rotate(Math.PI);break;case 4:I.translate(0,C.height);I.scale(1,-1);break;case 5:I.rotate(0.5*Math.PI);I.scale(1,-1);break;case 6:I.rotate(0.5*Math.PI);I.translate(0,-C.height);break;case 7:I.rotate(0.5*Math.PI);I.translate(C.width,-C.height);I.scale(-1,1);break;case 8:I.rotate(-0.5*Math.PI);I.translate(-C.width,0)}e(I,r,(D=H.srcX)!=null?D:0,(G=H.srcY)!=null?G:0,H.srcWidth,H.srcHeight,(F=H.trgX)!=null?F:0,(E=H.trgY)!=null?E:0,H.trgWidth,H.trgHeight);A=C.toDataURL("image/png");if(x!=null){return x(A,C)}})}})(this);if(x!=null){r.onerror=x}return r.src=u.dataURL};n.prototype.processQueue=function(){var r,t,q,s;t=this.options.parallelUploads;q=this.getUploadingFiles().length;r=q;if(q>=t){return}s=this.getQueuedFiles();if(!(s.length>0)){return}if(this.options.uploadMultiple){return this.processFiles(s.slice(0,t-q))}else{while(r<t){if(!s.length){return}this.processFile(s.shift());r++}}};n.prototype.processFile=function(q){return this.processFiles([q])};n.prototype.processFiles=function(t){var s,r,q;for(r=0,q=t.length;r<q;r++){s=t[r];s.processing=true;s.status=n.UPLOADING;this.emit("processing",s)}if(this.options.uploadMultiple){this.emit("processingmultiple",t)}return this.uploadFiles(t)};n.prototype._getFilesWithXhr=function(s){var q,r;return r=(function(){var u,t,w,v;w=this.files;v=[];for(u=0,t=w.length;u<t;u++){q=w[u];if(q.xhr===s){v.push(q)}}return v}).call(this)};n.prototype.cancelUpload=function(w){var r,v,u,s,q,t,x;if(w.status===n.UPLOADING){v=this._getFilesWithXhr(w.xhr);for(u=0,q=v.length;u<q;u++){r=v[u];r.status=n.CANCELED}w.xhr.abort();for(s=0,t=v.length;s<t;s++){r=v[s];this.emit("canceled",r)}if(this.options.uploadMultiple){this.emit("canceledmultiple",v)}}else{if((x=w.status)===n.ADDED||x===n.QUEUED){w.status=n.CANCELED;this.emit("canceled",w);if(this.options.uploadMultiple){this.emit("canceledmultiple",[w])}}}if(this.options.autoProcessQueue){return this.processQueue()}};m=function(){var q,r;r=arguments[0],q=2<=arguments.length?j.call(arguments,1):[];if(typeof r==="function"){return r.apply(this,q)}return r};n.prototype.uploadFile=function(q){return this.uploadFiles([q])};n.prototype.uploadFiles=function(L){var K,O,I,r,aa,M,v,R,Y,q,J,u,X,W,F,V,G,z,y,x,U,Z,S,N,T,P,E,D,C,B,A,s,H,w,t,Q,ab;ab=new XMLHttpRequest();for(X=0,G=L.length;X<G;X++){I=L[X];I.xhr=ab}Z=m(this.options.method,L);t=m(this.options.url,L);ab.open(Z,t,true);ab.timeout=m(this.options.timeout,L);ab.withCredentials=!!this.options.withCredentials;s=null;aa=(function(ac){return function(){var ad,ae,af;af=[];for(ad=0,ae=L.length;ad<ae;ad++){I=L[ad];af.push(ac._errorProcessing(L,s||ac.options.dictResponseError.replace("{{statusCode}}",ab.status),ab))}return af}})(this);w=(function(ac){return function(am){var ae,ai,ag,ak,aj,ah,af,ad,al;if(am!=null){ad=100*am.loaded/am.total;for(ai=0,ak=L.length;ai<ak;ai++){I=L[ai];I.upload.progress=ad;I.upload.total=am.total;I.upload.bytesSent=am.loaded}}else{ae=true;ad=100;for(ag=0,aj=L.length;ag<aj;ag++){I=L[ag];if(!(I.upload.progress===100&&I.upload.bytesSent===I.upload.total)){ae=false}I.upload.progress=ad;I.upload.bytesSent=I.upload.total}if(ae){return}}al=[];for(af=0,ah=L.length;af<ah;af++){I=L[af];al.push(ac.emit("uploadprogress",I,ad,I.upload.bytesSent))}return al}})(this);ab.onload=(function(ac){return function(ae){var af,ad;if(L[0].status===n.CANCELED){return}if(ab.readyState!==4){return}if(ab.responseType!=="arraybuffer"&&ab.responseType!=="blob"){s=ab.responseText;if(ab.getResponseHeader("content-type")&&~ab.getResponseHeader("content-type").indexOf("application/json")){try{s=JSON.parse(s)}catch(af){ae=af;s="Invalid JSON response from server."}}}w();if(!((200<=(ad=ab.status)&&ad<300))){return aa()}else{return ac._finished(L,s,ae)}}})(this);ab.onerror=(function(ac){return function(){if(L[0].status===n.CANCELED){return}return aa()}})(this);T=(P=ab.upload)!=null?P:ab;T.onprogress=w;R={Accept:"application/json","Cache-Control":"no-cache","X-Requested-With":"XMLHttpRequest"};if(this.options.headers){p(R,this.options.headers)}for(M in R){v=R[M];if(v){ab.setRequestHeader(M,v)}}r=new FormData();if(this.options.params){E=this.options.params;for(F in E){Q=E[F];r.append(F,Q)}}for(W=0,z=L.length;W<z;W++){I=L[W];this.emit("sending",I,ab,r)}if(this.options.uploadMultiple){this.emit("sendingmultiple",L,ab,r)}if(this.element.tagName==="FORM"){D=this.element.querySelectorAll("input, textarea, select, button");for(V=0,y=D.length;V<y;V++){q=D[V];J=q.getAttribute("name");u=q.getAttribute("type");if(q.tagName==="SELECT"&&q.hasAttribute("multiple")){C=q.options;for(U=0,x=C.length;U<x;U++){N=C[U];if(N.selected){r.append(J,N.value)}}}else{if(!u||((B=u.toLowerCase())!=="checkbox"&&B!=="radio")||q.checked){r.append(J,q.value)}}}}K=0;H=[];for(Y=S=0,A=L.length-1;0<=A?S<=A:S>=A;Y=0<=A?++S:--S){O=(function(ac){return function(ad,ae,af){return function(ag){r.append(ae,ag,af);if(++K===L.length){return ac.submitRequest(ab,r,L)}}}})(this);H.push(this.options.transformFile.call(this,L[Y],O(L[Y],this._getParamName(Y),L[Y].upload.filename)))}return H};n.prototype.submitRequest=function(s,r,q){return s.send(r)};n.prototype._finished=function(t,u,v){var s,r,q;for(r=0,q=t.length;r<q;r++){s=t[r];s.status=n.SUCCESS;this.emit("success",s,u,v);this.emit("complete",s)}if(this.options.uploadMultiple){this.emit("successmultiple",t,u,v);this.emit("completemultiple",t)}if(this.options.autoProcessQueue){return this.processQueue()}};n.prototype._errorProcessing=function(u,t,v){var s,r,q;for(r=0,q=u.length;r<q;r++){s=u[r];s.status=n.ERROR;this.emit("error",s,t,v);this.emit("complete",s)}if(this.options.uploadMultiple){this.emit("errormultiple",u,t,v);this.emit("completemultiple",u)}if(this.options.autoProcessQueue){return this.processQueue()}};return n})(i);g.version="5.1.1";g.options={};g.optionsForElement=function(m){if(m.getAttribute("id")){return g.options[c(m.getAttribute("id"))]}else{return void 0}};g.instances=[];g.forElement=function(m){if(typeof m==="string"){m=document.querySelector(m)}if((m!=null?m.dropzone:void 0)==null){throw new Error("No Dropzone found for given element. This is probably because you're trying to access it before Dropzone had the time to initialize. Use the `init` option to setup any additional observers on your Dropzone.")}return m.dropzone};g.autoDiscover=true;g.discover=function(){var r,n,q,o,m,p;if(document.querySelectorAll){q=document.querySelectorAll(".dropzone")}else{q=[];r=function(w){var v,t,s,u;u=[];for(t=0,s=w.length;t<s;t++){v=w[t];if(/(^| )dropzone($| )/.test(v.className)){u.push(q.push(v))}else{u.push(void 0)}}return u};r(document.getElementsByTagName("div"));r(document.getElementsByTagName("form"))}p=[];for(o=0,m=q.length;o<m;o++){n=q[o];if(g.optionsForElement(n)!==false){p.push(new g(n))}else{p.push(void 0)}}return p};g.blacklistedBrowsers=[/opera.*(Windows Phone|Macintosh).*version\/12/i];g.isBrowserSupported=function(){var o,n,m,q,p;o=true;if(window.File&&window.FileReader&&window.FileList&&window.Blob&&window.FormData&&document.querySelector){if(!("classList" in document.createElement("a"))){o=false}else{q=g.blacklistedBrowsers;for(n=0,m=q.length;n<m;n++){p=q[n];if(p.test(navigator.userAgent)){o=false;continue}}}}else{o=false}return o};g.dataURItoBlob=function(n){var s,t,q,o,p,m,r;t=atob(n.split(",")[1]);m=n.split(",")[0].split(":")[1].split(";")[0];s=new ArrayBuffer(t.length);o=new Uint8Array(s);for(q=p=0,r=t.length;0<=r?p<=r:p>=r;q=0<=r?++p:--p){o[q]=t.charCodeAt(q)}return new Blob([s],{type:m})};k=function(r,n){var q,o,m,p;p=[];for(o=0,m=r.length;o<m;o++){q=r[o];if(q!==n){p.push(q)}}return p};c=function(m){return m.replace(/[\-_](\w)/g,function(n){return n.charAt(1).toUpperCase()})};g.createElement=function(m){var n;n=document.createElement("div");n.innerHTML=m;return n.childNodes[0]};g.elementInside=function(n,m){if(n===m){return true}while(n=n.parentNode){if(n===m){return true}}return false};g.getElement=function(o,m){var n;if(typeof o==="string"){n=document.querySelector(o)}else{if(o.nodeType!=null){n=o}}if(n==null){throw new Error("Invalid `"+m+"` option provided. Please provide a CSS selector or a plain HTML element.")}return n};g.getElements=function(s,n){var v,o,m,w,t,q,u,r,p;if(s instanceof Array){m=[];try{for(t=0,u=s.length;t<u;t++){o=s[t];m.push(this.getElement(o,n))}}catch(w){v=w;m=null}}else{if(typeof s==="string"){m=[];p=document.querySelectorAll(s);for(q=0,r=p.length;q<r;q++){o=p[q];m.push(o)}}else{if(s.nodeType!=null){m=[s]}}}if(!((m!=null)&&m.length)){throw new Error("Invalid `"+n+"` option provided. Please provide a CSS selector, a plain HTML element or a list of those.")}return m};g.confirm=function(m,o,n){if(window.confirm(m)){return o()}else{if(n!=null){return n()}}};g.isValidFile=function(q,n){var o,p,m,s,r;if(!n){return true}n=n.split(",");s=q.type;o=s.replace(/\/.*$/,"");for(p=0,m=n.length;p<m;p++){r=n[p];r=r.trim();if(r.charAt(0)==="."){if(q.name.toLowerCase().indexOf(r.toLowerCase(),q.name.length-r.length)!==-1){return true}}else{if(/\/\*$/.test(r)){if(o===r.replace(/\/.*$/,"")){return true}}else{if(s===r){return true}}}}return false};if(typeof jQuery!=="undefined"&&jQuery!==null){jQuery.fn.dropzone=function(m){return this.each(function(){return new g(this,m)})}}if(typeof module!=="undefined"&&module!==null){module.exports=g}else{window.Dropzone=g}g.ADDED="added";g.QUEUED="queued";g.ACCEPTED=g.QUEUED;g.UPLOADING="uploading";g.PROCESSING=g.UPLOADING;g.CANCELED="canceled";g.ERROR="error";g.SUCCESS="success";b=function(q){var o,m,w,p,r,v,n,u,s,t;n=q.naturalWidth;v=q.naturalHeight;m=document.createElement("canvas");m.width=1;m.height=v;w=m.getContext("2d");w.drawImage(q,0,0);p=w.getImageData(1,0,1,v).data;t=0;r=v;u=v;while(u>t){o=p[(u-1)*4+3];if(o===0){r=u}else{t=u}u=(r+t)>>1}s=u/v;if(s===0){return 1}else{return s}};e=function(u,n,s,r,t,o,w,v,m,q){var p;p=b(n);return u.drawImage(n,s,r,t,o,w,v,m,q/p)};f=(function(){function m(){}m.KEY_STR="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";m.encode64=function(p){var w,u,s,v,t,r,q,o,n;n="";w=void 0;u=void 0;s="";v=void 0;t=void 0;r=void 0;q="";o=0;while(true){w=p[o++];u=p[o++];s=p[o++];v=w>>2;t=(w&3)<<4|u>>4;r=(u&15)<<2|s>>6;q=s&63;if(isNaN(u)){r=q=64}else{if(isNaN(s)){q=64}}n=n+this.KEY_STR.charAt(v)+this.KEY_STR.charAt(t)+this.KEY_STR.charAt(r)+this.KEY_STR.charAt(q);w=u=s="";v=t=r=q="";if(!(o<p.length)){break}}return n};m.restore=function(n,r){var q,p,o;if(!n.match("data:image/jpeg;base64,")){return r}p=this.decode64(n.replace("data:image/jpeg;base64,",""));o=this.slice2Segments(p);q=this.exifManipulation(r,o);return"data:image/jpeg;base64,"+this.encode64(q)};m.exifManipulation=function(r,p){var q,n,o;n=this.getExifArray(p);o=this.insertExif(r,n);q=new Uint8Array(o);return q};m.getExifArray=function(p){var o,n;o=void 0;n=0;while(n<p.length){o=p[n];if(o[0]===255&o[1]===225){return o}n++}return[]};m.insertExif=function(o,v){var u,w,q,n,t,r;n=o.replace("data:image/jpeg;base64,","");q=this.decode64(n);for(var s=0;s<q.length;s++){if(q[s]===255&&q[s+1]===225){var p=q[s+2]*256+q[s+3]+2;q.splice(s,p)}}r=q.indexOf(255,3);t=q.slice(0,r);w=q.slice(r);u=t;u=u.concat(v);u=u.concat(w);return u};m.slice2Segments=function(o){var r,q,s,n,p;q=0;p=[];while(true){if(o[q]===255&o[q+1]===218){break}if(o[q]===255&o[q+1]===216){q+=2}else{s=o[q+2]*256+o[q+3];r=q+s+2;n=o.slice(q,r);p.push(n);q=r}if(q>o.length){break}}return p};m.decode64=function(r){var n,o,y,w,u,x,v,t,s,q,p;p="";y=void 0;w=void 0;u="";x=void 0;v=void 0;t=void 0;s="";q=0;o=[];n=/[^A-Za-z0-9\+\/\=]/g;if(n.exec(r)){console.warning("There were invalid base64 characters in the input text.\nValid base64 characters are A-Z, a-z, 0-9, '+', '/',and '='\nExpect errors in decoding.")}r=r.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(true){x=this.KEY_STR.indexOf(r.charAt(q++));v=this.KEY_STR.indexOf(r.charAt(q++));t=this.KEY_STR.indexOf(r.charAt(q++));s=this.KEY_STR.indexOf(r.charAt(q++));y=x<<2|v>>4;w=(v&15)<<4|t>>2;u=(t&3)<<6|s;o.push(y);if(t!==64){o.push(w)}if(s!==64){o.push(u)}y=w=u="";x=v=t=s="";if(!(q<r.length)){break}}return o};return m})();d=function(p,t){var x,u,o,w,q,n,v,s,r;o=false;r=true;u=p.document;s=u.documentElement;x=(u.addEventListener?"addEventListener":"attachEvent");v=(u.addEventListener?"removeEventListener":"detachEvent");n=(u.addEventListener?"":"on");w=function(y){if(y.type==="readystatechange"&&u.readyState!=="complete"){return}(y.type==="load"?p:u)[v](n+y.type,w,false);if(!o&&(o=true)){return t.call(p,y.type||y)}};q=function(){var y,z;try{s.doScroll("left")}catch(z){y=z;setTimeout(q,50);return}return w("poll")};if(u.readyState!=="complete"){if(u.createEventObject&&s.doScroll){try{r=!p.frameElement}catch(m){}if(r){q()}}u[x](n+"DOMContentLoaded",w,false);u[x](n+"readystatechange",w,false);return p[x](n+"load",w,false)}};g._autoDiscoverFunction=function(){if(g.autoDiscover){return g.discover()}};d(window,g._autoDiscoverFunction)}).call(this);
\ No newline at end of file
+(function(){function v(n,l){for(var m="",h=l;h<l+4;h++)m+=String.fromCharCode(n.getUint8(h));if("Exif"!=m)return!1;m=l+6;if(18761==n.getUint16(m))l=!1;else if(19789==n.getUint16(m))l=!0;else return!1;if(42!=n.getUint16(m+2,!l))return!1;h=n.getUint32(m+4,!l);if(8>h)return!1;m+=h;h=n.getUint16(m,!l);var q;for(q=0;q<h;q++){var v=m+12*q+2;if(274==n.getUint16(v,!l))return parseInt(n.getUint16(v+8,!l),10)}return!1}var y={};window.EXIF=y;y.getData=function(n){if((n instanceof Image||n instanceof HTMLImageElement)&&
+!n.complete)return!1;var l=n.src;if(l.match(/^http/)){l=document.createElement("canvas");var m=l.getContext("2d");l.width=n.width;l.height=n.height;m.drawImage(n,0,0);l=l.toDataURL("image/jpeg")}n=l.replace(/^data:([^;]+);base64,/gmi,"");l=atob(n);m=l.length;n=new ArrayBuffer(m);for(var h=new Uint8Array(n),q=0;q<m;q++)h[q]=l.charCodeAt(q);l=new DataView(n);if(255!=l.getUint8(0)||216!=l.getUint8(1))return!1;m=2;for(n=n.byteLength;m<n;){if(255!=l.getUint8(m))return!1;h=l.getUint8(m+1);if(225==h)return v(l,
+m+4);m+=2+l.getUint16(m+2)}}})();(function(){var v=[].slice,y=function(d,b){function r(){this.constructor=d}for(var k in b)n.call(b,k)&&(d[k]=b[k]);r.prototype=b.prototype;d.prototype=new r;d.__super__=b.prototype;return d},n={}.hasOwnProperty;var l=function(){};var m=function(){function d(){}d.prototype.addEventListener=d.prototype.on;d.prototype.on=function(b,d){this._callbacks=this._callbacks||{};this._callbacks[b]||(this._callbacks[b]=[]);this._callbacks[b].push(d);return this};d.prototype.emit=function(){var b,d;var k=arguments[0];
+var a=2<=arguments.length?v.call(arguments,1):[];this._callbacks=this._callbacks||{};if(b=this._callbacks[k]){var c=0;for(d=b.length;c<d;c++)k=b[c],k.apply(this,a)}return this};d.prototype.removeListener=d.prototype.off;d.prototype.removeAllListeners=d.prototype.off;d.prototype.removeEventListener=d.prototype.off;d.prototype.off=function(b,d){var k,a;if(!this._callbacks||0===arguments.length)return this._callbacks={},this;var c=this._callbacks[b];if(!c)return this;if(1===arguments.length)return delete this._callbacks[b],
+this;var g=k=0;for(a=c.length;k<a;g=++k){var f=c[g];if(f===d){c.splice(g,1);break}}return this};return d}();var h=function(d){function b(a,c){var g,f;this.element=a;this.version=b.version;this.defaultOptions.previewTemplate=this.defaultOptions.previewTemplate.replace(/\n*/g,"");this.clickableElements=[];this.listeners=[];this.files=[];"string"===typeof this.element&&(this.element=document.querySelector(this.element));if(!this.element||null==this.element.nodeType)throw Error("Invalid dropzone element.");
+if(this.element.dropzone)throw Error("Dropzone already attached.");b.instances.push(this);this.element.dropzone=this;a=null!=(f=b.optionsForElement(this.element))?f:{};this.options=r({},this.defaultOptions,a,null!=c?c:{});if(this.options.forceFallback||!b.isBrowserSupported())return this.options.fallback.call(this);null==this.options.url&&(this.options.url=this.element.getAttribute("action"));if(!this.options.url)throw Error("No URL provided.");if(this.options.acceptedFiles&&this.options.acceptedMimeTypes)throw Error("You can't provide both 'acceptedFiles' and 'acceptedMimeTypes'. 'acceptedMimeTypes' is deprecated.");
+this.options.acceptedMimeTypes&&(this.options.acceptedFiles=this.options.acceptedMimeTypes,delete this.options.acceptedMimeTypes);null!=this.options.renameFilename&&(this.options.renameFile=function(a){return function(c){return a.options.renameFilename.call(a,c.name,c)}}(this));this.options.method=this.options.method.toUpperCase();(g=this.getExistingFallback())&&g.parentNode&&g.parentNode.removeChild(g);!1!==this.options.previewsContainer&&(this.previewsContainer=this.options.previewsContainer?b.getElement(this.options.previewsContainer,
+"previewsContainer"):this.element);this.options.clickable&&(this.clickableElements=!0===this.options.clickable?[this.element]:b.getElements(this.options.clickable,"clickable"));this.init()}y(b,d);b.prototype.Emitter=m;b.prototype.events="drop dragstart dragend dragenter dragover dragleave addedfile addedfiles removedfile thumbnail error errormultiple processing processingmultiple uploadprogress totaluploadprogress sending sendingmultiple success successmultiple canceled canceledmultiple complete completemultiple reset maxfilesexceeded maxfilesreached queuecomplete".split(" ");
+b.prototype.defaultOptions={url:null,method:"post",withCredentials:!1,timeout:3E4,parallelUploads:2,uploadMultiple:!1,maxFilesize:256,paramName:"file",createImageThumbnails:!0,maxThumbnailFilesize:10,thumbnailWidth:120,thumbnailHeight:120,thumbnailMethod:"crop",resizeWidth:null,resizeHeight:null,resizeMimeType:null,resizeQuality:.8,resizeMethod:"contain",filesizeBase:1E3,maxFiles:null,params:{},headers:null,clickable:!0,ignoreHiddenFiles:!0,acceptedFiles:null,acceptedMimeTypes:null,autoProcessQueue:!0,
+autoQueue:!0,addRemoveLinks:!1,previewsContainer:null,hiddenInputContainer:"body",capture:null,renameFilename:null,renameFile:null,forceFallback:!1,dictDefaultMessage:"Drop files here to upload",dictFallbackMessage:"Your browser does not support drag'n'drop file uploads.",dictFallbackText:"Please use the fallback form below to upload your files like in the olden days.",dictFileTooBig:"File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.",dictInvalidFileType:"You can't upload files of this type.",
+dictResponseError:"Server responded with {{statusCode}} code.",dictCancelUpload:"Cancel upload",dictCancelUploadConfirmation:"Are you sure you want to cancel this upload?",dictRemoveFile:"Remove file",dictRemoveFileConfirmation:null,dictMaxFilesExceeded:"You can not upload any more files.",dictFileSizeUnits:{tb:"TB",gb:"GB",mb:"MB",kb:"KB",b:"b"},init:function(){return l},accept:function(a,c){return c()},fallback:function(){var a;this.element.className+=" dz-browser-not-supported";var c=this.element.getElementsByTagName("div");
+var g=0;for(a=c.length;g<a;g++){var f=c[g];if(/(^| )dz-message($| )/.test(f.className)){var e=f;f.className="dz-message"}}e||(e=b.createElement('<div class="dz-message"><span></span></div>'),this.element.appendChild(e));if(f=e.getElementsByTagName("span")[0])null!=f.textContent?f.textContent=this.options.dictFallbackMessage:null!=f.innerText&&(f.innerText=this.options.dictFallbackMessage);return this.element.appendChild(this.getFallbackForm())},resize:function(a,c,g,b){var e={srcX:0,srcY:0,srcWidth:a.width,
+srcHeight:a.height};var f=a.width/a.height;null==c&&null==g?(c=e.srcWidth,g=e.srcHeight):null==c?c=g*f:null==g&&(g=c/f);c=Math.min(c,e.srcWidth);g=Math.min(g,e.srcHeight);var x=c/g;if(e.srcWidth>c||e.srcHeight>g)if("crop"===b)f>x?(e.srcHeight=a.height,e.srcWidth=e.srcHeight*x):(e.srcWidth=a.width,e.srcHeight=e.srcWidth/x);else if("contain"===b)f>x?g=c/f:c=g*f;else throw Error("Unknown resizeMethod '"+b+"'");e.srcX=(a.width-e.srcWidth)/2;e.srcY=(a.height-e.srcHeight)/2;e.trgWidth=c;e.trgHeight=g;return e},
+transformFile:function(a,c){return(this.options.resizeWidth||this.options.resizeHeight)&&a.type.match(/image.*/)?this.resizeImage(a,this.options.resizeWidth,this.options.resizeHeight,this.options.resizeMethod,c):c(a)},previewTemplate:'<div class="dz-preview dz-file-preview">\n  <div class="dz-image"><img data-dz-thumbnail /></div>\n  <div class="dz-details">\n    <div class="dz-size"><span data-dz-size></span></div>\n    <div class="dz-filename"><span data-dz-name></span></div>\n  </div>\n  <div class="dz-progress"><span class="dz-upload" data-dz-uploadprogress></span></div>\n  <div class="dz-error-message"><span data-dz-errormessage></span></div>\n  <div class="dz-success-mark">\n    <svg width="54px" height="54px" viewBox="0 0 54 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">\n      <title>Check</title>\n      <defs></defs>\n      <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">\n        <path d="M23.5,31.8431458 L17.5852419,25.9283877 C16.0248253,24.3679711 13.4910294,24.366835 11.9289322,25.9289322 C10.3700136,27.4878508 10.3665912,30.0234455 11.9283877,31.5852419 L20.4147581,40.0716123 C20.5133999,40.1702541 20.6159315,40.2626649 20.7218615,40.3488435 C22.2835669,41.8725651 24.794234,41.8626202 26.3461564,40.3106978 L43.3106978,23.3461564 C44.8771021,21.7797521 44.8758057,19.2483887 43.3137085,17.6862915 C41.7547899,16.1273729 39.2176035,16.1255422 37.6538436,17.6893022 L23.5,31.8431458 Z M27,53 C41.3594035,53 53,41.3594035 53,27 C53,12.6405965 41.3594035,1 27,1 C12.6405965,1 1,12.6405965 1,27 C1,41.3594035 12.6405965,53 27,53 Z" id="Oval-2" stroke-opacity="0.198794158" stroke="#747474" fill-opacity="0.816519475" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>\n      </g>\n    </svg>\n  </div>\n  <div class="dz-error-mark">\n    <svg width="54px" height="54px" viewBox="0 0 54 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">\n      <title>Error</title>\n      <defs></defs>\n      <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">\n        <g id="Check-+-Oval-2" sketch:type="MSLayerGroup" stroke="#747474" stroke-opacity="0.198794158" fill="#FFFFFF" fill-opacity="0.816519475">\n          <path d="M32.6568542,29 L38.3106978,23.3461564 C39.8771021,21.7797521 39.8758057,19.2483887 38.3137085,17.6862915 C36.7547899,16.1273729 34.2176035,16.1255422 32.6538436,17.6893022 L27,23.3431458 L21.3461564,17.6893022 C19.7823965,16.1255422 17.2452101,16.1273729 15.6862915,17.6862915 C14.1241943,19.2483887 14.1228979,21.7797521 15.6893022,23.3461564 L21.3431458,29 L15.6893022,34.6538436 C14.1228979,36.2202479 14.1241943,38.7516113 15.6862915,40.3137085 C17.2452101,41.8726271 19.7823965,41.8744578 21.3461564,40.3106978 L27,34.6568542 L32.6538436,40.3106978 C34.2176035,41.8744578 36.7547899,41.8726271 38.3137085,40.3137085 C39.8758057,38.7516113 39.8771021,36.2202479 38.3106978,34.6538436 L32.6568542,29 Z M27,53 C41.3594035,53 53,41.3594035 53,27 C53,12.6405965 41.3594035,1 27,1 C12.6405965,1 1,12.6405965 1,27 C1,41.3594035 12.6405965,53 27,53 Z" id="Oval-2" sketch:type="MSShapeGroup"></path>\n        </g>\n      </g>\n    </svg>\n  </div>\n</div>',
+drop:function(a){return this.element.classList.remove("dz-drag-hover")},dragstart:l,dragend:function(a){return this.element.classList.remove("dz-drag-hover")},dragenter:function(a){return this.element.classList.add("dz-drag-hover")},dragover:function(a){return this.element.classList.add("dz-drag-hover")},dragleave:function(a){return this.element.classList.remove("dz-drag-hover")},paste:l,reset:function(){return this.element.classList.remove("dz-started")},addedfile:function(a){var c;this.element===
+this.previewsContainer&&this.element.classList.add("dz-started");if(this.previewsContainer){a.previewElement=b.createElement(this.options.previewTemplate.trim());a.previewTemplate=a.previewElement;this.previewsContainer.appendChild(a.previewElement);var g=a.previewElement.querySelectorAll("[data-dz-name]");var f=0;for(c=g.length;f<c;f++){var e=g[f];e.textContent=a.name}g=a.previewElement.querySelectorAll("[data-dz-size]");f=0;for(c=g.length;f<c;f++)e=g[f],e.innerHTML=this.filesize(a.size);this.options.addRemoveLinks&&
+(a._removeLink=b.createElement('<a class="dz-remove" href="javascript:undefined;" data-dz-remove>'+this.options.dictRemoveFile+"</a>"),a.previewElement.appendChild(a._removeLink));g=function(c){return function(g){g.preventDefault();g.stopPropagation();return a.status===b.UPLOADING?b.confirm(c.options.dictCancelUploadConfirmation,function(){return c.removeFile(a)}):c.options.dictRemoveFileConfirmation?b.confirm(c.options.dictRemoveFileConfirmation,function(){return c.removeFile(a)}):c.removeFile(a)}}(this);
+c=a.previewElement.querySelectorAll("[data-dz-remove]");var p=[];e=0;for(f=c.length;e<f;e++){var x=c[e];p.push(x.addEventListener("click",g))}return p}},removedfile:function(a){var c;a.previewElement&&null!=(c=a.previewElement)&&c.parentNode.removeChild(a.previewElement);return this._updateMaxFilesReachedClass()},thumbnail:function(a,c){var g;if(a.previewElement){a.previewElement.classList.remove("dz-file-preview");var b=a.previewElement.querySelectorAll("[data-dz-thumbnail]");var e=0;for(g=b.length;e<
+g;e++){var p=b[e];p.alt=a.name;p.src=c}return setTimeout(function(c){return function(){return a.previewElement.classList.add("dz-image-preview")}}(this),1)}},error:function(a,c){var g;if(a.previewElement){a.previewElement.classList.add("dz-error");"String"!==typeof c&&c.error&&(c=c.error);var b=a.previewElement.querySelectorAll("[data-dz-errormessage]");var e=[];a=0;for(g=b.length;a<g;a++){var p=b[a];e.push(p.textContent=c)}return e}},errormultiple:l,processing:function(a){if(a.previewElement&&(a.previewElement.classList.add("dz-processing"),
+a._removeLink))return a._removeLink.textContent=this.options.dictCancelUpload},processingmultiple:l,uploadprogress:function(a,c,b){if(a.previewElement){var g=a.previewElement.querySelectorAll("[data-dz-uploadprogress]");var e=[];a=0;for(b=g.length;a<b;a++){var p=g[a];"PROGRESS"===p.nodeName?e.push(p.value=c):e.push(p.style.width=c+"%")}return e}},totaluploadprogress:l,sending:l,sendingmultiple:l,success:function(a){if(a.previewElement)return a.previewElement.classList.add("dz-success")},successmultiple:l,
+canceled:function(a){return this.emit("error",a,"Upload canceled.")},canceledmultiple:l,complete:function(a){a._removeLink&&(a._removeLink.textContent=this.options.dictRemoveFile);if(a.previewElement)return a.previewElement.classList.add("dz-complete")},completemultiple:l,maxfilesexceeded:l,maxfilesreached:l,queuecomplete:l,addedfiles:l};var r=function(){var a,c;var b=arguments[0];var f=2<=arguments.length?v.call(arguments,1):[];var e=0;for(c=f.length;e<c;e++){var p=f[e];for(a in p){var x=p[a];b[a]=
+x}}return b};b.prototype.getAcceptedFiles=function(){var a;var c=this.files;var b=[];var f=0;for(a=c.length;f<a;f++){var e=c[f];e.accepted&&b.push(e)}return b};b.prototype.getRejectedFiles=function(){var a;var c=this.files;var b=[];var f=0;for(a=c.length;f<a;f++){var e=c[f];e.accepted||b.push(e)}return b};b.prototype.getFilesWithStatus=function(a){var c;var b=this.files;var f=[];var e=0;for(c=b.length;e<c;e++){var p=b[e];p.status===a&&f.push(p)}return f};b.prototype.getQueuedFiles=function(){return this.getFilesWithStatus(b.QUEUED)};
+b.prototype.getUploadingFiles=function(){return this.getFilesWithStatus(b.UPLOADING)};b.prototype.getAddedFiles=function(){return this.getFilesWithStatus(b.ADDED)};b.prototype.getActiveFiles=function(){var a;var c=this.files;var g=[];var f=0;for(a=c.length;f<a;f++){var e=c[f];e.status!==b.UPLOADING&&e.status!==b.QUEUED||g.push(e)}return g};b.prototype.init=function(){var a,c;"form"===this.element.tagName&&this.element.setAttribute("enctype","multipart/form-data");this.element.classList.contains("dropzone")&&
+!this.element.querySelector(".dz-message")&&this.element.appendChild(b.createElement('<div class="dz-default dz-message"><span>'+this.options.dictDefaultMessage+"</span></div>"));if(this.clickableElements.length){var g=function(a){return function(){a.hiddenFileInput&&a.hiddenFileInput.parentNode.removeChild(a.hiddenFileInput);a.hiddenFileInput=document.createElement("input");a.hiddenFileInput.setAttribute("type","file");(null==a.options.maxFiles||1<a.options.maxFiles)&&a.hiddenFileInput.setAttribute("multiple",
+"multiple");a.hiddenFileInput.className="dz-hidden-input";null!=a.options.acceptedFiles&&a.hiddenFileInput.setAttribute("accept",a.options.acceptedFiles);null!=a.options.capture&&a.hiddenFileInput.setAttribute("capture",a.options.capture);a.hiddenFileInput.style.visibility="hidden";a.hiddenFileInput.style.position="absolute";a.hiddenFileInput.style.top="0";a.hiddenFileInput.style.left="0";a.hiddenFileInput.style.height="0";a.hiddenFileInput.style.width="0";document.querySelector(a.options.hiddenInputContainer).appendChild(a.hiddenFileInput);
+return a.hiddenFileInput.addEventListener("change",function(){var c;var b=a.hiddenFileInput.files;if(b.length){var e=0;for(c=b.length;e<c;e++){var f=b[e];a.addFile(f)}}a.emit("addedfiles",b);return g()})}}(this);g()}this.URL=null!=(a=window.URL)?a:window.webkitURL;var f=this.events;var e=0;for(c=f.length;e<c;e++)a=f[e],this.on(a,this.options[a]);this.on("uploadprogress",function(a){return function(){return a.updateTotalUploadProgress()}}(this));this.on("removedfile",function(a){return function(){return a.updateTotalUploadProgress()}}(this));
+this.on("canceled",function(a){return function(c){return a.emit("complete",c)}}(this));this.on("complete",function(a){return function(c){if(0===a.getAddedFiles().length&&0===a.getUploadingFiles().length&&0===a.getQueuedFiles().length)return setTimeout(function(){return a.emit("queuecomplete")},0)}}(this));var p=function(a){a.stopPropagation();return a.preventDefault?a.preventDefault():a.returnValue=!1};this.listeners=[{element:this.element,events:{dragstart:function(a){return function(c){return a.emit("dragstart",
+c)}}(this),dragenter:function(a){return function(c){p(c);return a.emit("dragenter",c)}}(this),dragover:function(a){return function(c){try{var b=c.dataTransfer.effectAllowed}catch(F){}c.dataTransfer.dropEffect="move"===b||"linkMove"===b?"move":"copy";p(c);return a.emit("dragover",c)}}(this),dragleave:function(a){return function(c){return a.emit("dragleave",c)}}(this),drop:function(a){return function(c){p(c);return a.drop(c)}}(this),dragend:function(a){return function(c){return a.emit("dragend",c)}}(this)}}];
+this.clickableElements.forEach(function(a){return function(c){return a.listeners.push({element:c,events:{click:function(e){(c!==a.element||e.target===a.element||b.elementInside(e.target,a.element.querySelector(".dz-message")))&&a.hiddenFileInput.click();return!0}}})}}(this));this.enable();return this.options.init.call(this)};b.prototype.destroy=function(){var a;this.disable();this.removeAllFiles(!0);null!=(a=this.hiddenFileInput)&&a.parentNode&&(this.hiddenFileInput.parentNode.removeChild(this.hiddenFileInput),
+this.hiddenFileInput=null);delete this.element.dropzone;return b.instances.splice(b.instances.indexOf(this),1)};b.prototype.updateTotalUploadProgress=function(){var a,c;var b=c=0;if(this.getActiveFiles().length){var f=this.getActiveFiles();var e=0;for(a=f.length;e<a;e++){var p=f[e];c+=p.upload.bytesSent;b+=p.upload.total}p=100*c/b}else p=100;return this.emit("totaluploadprogress",p,b,c)};b.prototype._getParamName=function(a){return"function"===typeof this.options.paramName?this.options.paramName(a):
+""+this.options.paramName+(this.options.uploadMultiple?"["+a+"]":"")};b.prototype._renameFile=function(a){return"function"!==typeof this.options.renameFile?a.name:this.options.renameFile(a)};b.prototype.getFallbackForm=function(){var a;if(a=this.getExistingFallback())return a;a='<div class="dz-fallback">';this.options.dictFallbackText&&(a+="<p>"+this.options.dictFallbackText+"</p>");a+='<input type="file" name="'+this._getParamName(0)+'" '+(this.options.uploadMultiple?'multiple="multiple"':void 0)+
+' /><input type="submit" value="Upload!"></div>';a=b.createElement(a);if("FORM"!==this.element.tagName){var c=b.createElement('<form action="'+this.options.url+'" enctype="multipart/form-data" method="'+this.options.method+'"></form>');c.appendChild(a)}else this.element.setAttribute("enctype","multipart/form-data"),this.element.setAttribute("method",this.options.method);return null!=c?c:a};b.prototype.getExistingFallback=function(){var a;var c=function(a){var c;var b=0;for(c=a.length;b<c;b++){var e=
+a[b];if(/(^| )fallback($| )/.test(e.className))return e}};var b=["div","form"];var f=0;for(a=b.length;f<a;f++){var e=b[f];if(e=c(this.element.getElementsByTagName(e)))return e}};b.prototype.setupEventListeners=function(){var a,c,b;var f=this.listeners;var e=[];var p=0;for(c=f.length;p<c;p++){var d=f[p];e.push(function(){var c=d.events;var e=[];for(a in c)b=c[a],e.push(d.element.addEventListener(a,b,!1));return e}())}return e};b.prototype.removeEventListeners=function(){var a,c,b;var f=this.listeners;
+var e=[];var p=0;for(c=f.length;p<c;p++){var d=f[p];e.push(function(){var c=d.events;var e=[];for(a in c)b=c[a],e.push(d.element.removeEventListener(a,b,!1));return e}())}return e};b.prototype.disable=function(){var a;this.clickableElements.forEach(function(a){return a.classList.remove("dz-clickable")});this.removeEventListeners();var c=this.files;var b=[];var f=0;for(a=c.length;f<a;f++){var e=c[f];b.push(this.cancelUpload(e))}return b};b.prototype.enable=function(){this.clickableElements.forEach(function(a){return a.classList.add("dz-clickable")});
+return this.setupEventListeners()};b.prototype.filesize=function(a){var c,b;var f=0;var e="b";if(0<a){var d=["tb","gb","mb","kb","b"];var k=c=0;for(b=d.length;c<b;k=++c){var r=d[k];var h=Math.pow(this.options.filesizeBase,4-k)/10;if(a>=h){f=a/Math.pow(this.options.filesizeBase,4-k);e=r;break}}f=Math.round(10*f)/10}return"<strong>"+f+"</strong> "+this.options.dictFileSizeUnits[e]};b.prototype._updateMaxFilesReachedClass=function(){return null!=this.options.maxFiles&&this.getAcceptedFiles().length>=
+this.options.maxFiles?(this.getAcceptedFiles().length===this.options.maxFiles&&this.emit("maxfilesreached",this.files),this.element.classList.add("dz-max-files-reached")):this.element.classList.remove("dz-max-files-reached")};b.prototype.drop=function(a){if(a.dataTransfer){this.emit("drop",a);var c=a.dataTransfer.files;this.emit("addedfiles",c);c.length&&((a=a.dataTransfer.items)&&a.length&&null!=a[0].webkitGetAsEntry?this._addFilesFromItems(a):this.handleFiles(c))}};b.prototype.paste=function(a){var c;
+if(null!=(null!=a?null!=(c=a.clipboardData)?c.items:void 0:void 0)&&(this.emit("paste",a),a=a.clipboardData.items,a.length))return this._addFilesFromItems(a)};b.prototype.handleFiles=function(a){var c;var b=[];var f=0;for(c=a.length;f<c;f++){var e=a[f];b.push(this.addFile(e))}return b};b.prototype._addFilesFromItems=function(a){var c,b;var f=[];var e=0;for(b=a.length;e<b;e++){var d=a[e];null!=d.webkitGetAsEntry&&(c=d.webkitGetAsEntry())?c.isFile?f.push(this.addFile(d.getAsFile())):c.isDirectory?f.push(this._addFilesFromDirectory(c,
+c.name)):f.push(void 0):null!=d.getAsFile?null==d.kind||"file"===d.kind?f.push(this.addFile(d.getAsFile())):f.push(void 0):f.push(void 0)}return f};b.prototype._addFilesFromDirectory=function(a,c){var b=a.createReader();var f=function(a){return"undefined"!==typeof console&&null!==console?"function"===typeof console.log?console.log(a):void 0:void 0};var e=function(a){return function(){return b.readEntries(function(b){var f;if(0<b.length){var g=0;for(f=b.length;g<f;g++){var d=b[g];d.isFile?d.file(function(b){if(!a.options.ignoreHiddenFiles||
+"."!==b.name.substring(0,1))return b.fullPath=c+"/"+b.name,a.addFile(b)}):d.isDirectory&&a._addFilesFromDirectory(d,c+"/"+d.name)}e()}return null},f)}}(this);return e()};b.prototype.accept=function(a,c){return a.size>1048576*this.options.maxFilesize?c(this.options.dictFileTooBig.replace("{{filesize}}",Math.round(a.size/1024/10.24)/100).replace("{{maxFilesize}}",this.options.maxFilesize)):b.isValidFile(a,this.options.acceptedFiles)?null!=this.options.maxFiles&&this.getAcceptedFiles().length>=this.options.maxFiles?
+(c(this.options.dictMaxFilesExceeded.replace("{{maxFiles}}",this.options.maxFiles)),this.emit("maxfilesexceeded",a)):this.options.accept.call(this,a,c):c(this.options.dictInvalidFileType)};b.prototype.addFile=function(a){a.upload={progress:0,total:a.size,bytesSent:0,filename:this._renameFile(a)};this.files.push(a);a.status=b.ADDED;this.emit("addedfile",a);this._enqueueThumbnail(a);return this.accept(a,function(c){return function(b){b?(a.accepted=!1,c._errorProcessing([a],b)):(a.accepted=!0,c.options.autoQueue&&
+c.enqueueFile(a));return c._updateMaxFilesReachedClass()}}(this))};b.prototype.enqueueFiles=function(a){var c;var b=0;for(c=a.length;b<c;b++){var f=a[b];this.enqueueFile(f)}return null};b.prototype.enqueueFile=function(a){if(a.status===b.ADDED&&!0===a.accepted){if(a.status=b.QUEUED,this.options.autoProcessQueue)return setTimeout(function(a){return function(){return a.processQueue()}}(this),0)}else throw Error("This file can't be queued because it has already been processed or was rejected.");};b.prototype._thumbnailQueue=
+[];b.prototype._processingThumbnail=!1;b.prototype._enqueueThumbnail=function(a){if(this.options.createImageThumbnails&&a.type.match(/image.*/)&&a.size<=1048576*this.options.maxThumbnailFilesize)return this._thumbnailQueue.push(a),setTimeout(function(a){return function(){return a._processThumbnailQueue()}}(this),0)};b.prototype._processThumbnailQueue=function(){if(!this._processingThumbnail&&0!==this._thumbnailQueue.length){this._processingThumbnail=!0;var a=this._thumbnailQueue.shift();return this.createThumbnail(a,
+this.options.thumbnailWidth,this.options.thumbnailHeight,this.options.thumbnailMethod,!0,function(c){return function(b){c.emit("thumbnail",a,b);c._processingThumbnail=!1;return c._processThumbnailQueue()}}(this))}};b.prototype.removeFile=function(a){a.status===b.UPLOADING&&this.cancelUpload(a);this.files=q(this.files,a);this.emit("removedfile",a);if(0===this.files.length)return this.emit("reset")};b.prototype.removeAllFiles=function(a){var c;null==a&&(a=!1);var g=this.files.slice();var f=0;for(c=
+g.length;f<c;f++){var e=g[f];(e.status!==b.UPLOADING||a)&&this.removeFile(e)}return null};b.prototype.resizeImage=function(a,c,g,f,e){return this.createThumbnail(a,c,g,f,!0,function(c){return function(f,g){if(null===g)return e(a);f=c.options.resizeMimeType;null==f&&(f=a.type);g=g.toDataURL(f,c.options.resizeQuality);return e(b.dataURItoBlob(g))}}(this))};b.prototype.createThumbnail=function(a,c,b,f,e,d){var g=new FileReader;g.onload=function(p){return function(){a.dataURL=g.result;if("image/svg+xml"===
+a.type)null!=d&&d(g.result);else return p.createThumbnailFromUrl(a,c,b,f,e,d)}}(this);return g.readAsDataURL(a)};b.prototype.createThumbnailFromUrl=function(a,c,b,f,e,d,k){var g=document.createElement("img");e="from-image"==getComputedStyle(document.body).imageOrientation?!1:e;k&&(g.crossOrigin=k);g.onload=function(p){return function(){var k=e?EXIF.getData(g):1,r,h,l,x;a.width=g.width;a.height=g.height;var n=p.options.resize.call(p,a,c,b,f);var m=document.createElement("canvas");var t=m.getContext("2d");
+m.width=n.trgWidth;m.height=n.trgHeight;4<k&&(m.width=n.trgHeight,m.height=n.trgWidth);switch(k){case 2:t.translate(m.width,0);t.scale(-1,1);break;case 3:t.translate(m.width,m.height);t.rotate(Math.PI);break;case 4:t.translate(0,m.height);t.scale(1,-1);break;case 5:t.rotate(.5*Math.PI);t.scale(1,-1);break;case 6:t.rotate(.5*Math.PI);t.translate(0,-m.width);break;case 7:t.rotate(.5*Math.PI);t.translate(m.height,-m.width);t.scale(-1,1);break;case 8:t.rotate(-.5*Math.PI),t.translate(-m.height,0)}C(t,
+g,null!=(r=n.srcX)?r:0,null!=(h=n.srcY)?h:0,n.srcWidth,n.srcHeight,null!=(l=n.trgX)?l:0,null!=(x=n.trgY)?x:0,n.trgWidth,n.trgHeight);k=m.toDataURL("image/png");if(null!=d)return d(k,m)}}(this);null!=d&&(g.onerror=d);return g.src=a.dataURL};b.prototype.processQueue=function(){var a;var b=this.options.parallelUploads;var g=a=this.getUploadingFiles().length;if(!(a>=b)){var f=this.getQueuedFiles();if(0<f.length){if(this.options.uploadMultiple)return this.processFiles(f.slice(0,b-a));for(;g<b&&f.length;)this.processFile(f.shift()),
+g++}}};b.prototype.processFile=function(a){return this.processFiles([a])};b.prototype.processFiles=function(a){var c;var g=0;for(c=a.length;g<c;g++){var f=a[g];f.processing=!0;f.status=b.UPLOADING;this.emit("processing",f)}this.options.uploadMultiple&&this.emit("processingmultiple",a);return this.uploadFiles(a)};b.prototype._getFilesWithXhr=function(a){var b;var g=this.files;var f=[];var e=0;for(b=g.length;e<b;e++){var d=g[e];d.xhr===a&&f.push(d)}return f};b.prototype.cancelUpload=function(a){var c;
+if(a.status===b.UPLOADING){var g=this._getFilesWithXhr(a.xhr);var f=0;for(c=g.length;f<c;f++){var e=g[f];e.status=b.CANCELED}a.xhr.abort();a=0;for(f=g.length;a<f;a++)e=g[a],this.emit("canceled",e);this.options.uploadMultiple&&this.emit("canceledmultiple",g)}else if((e=a.status)===b.ADDED||e===b.QUEUED)a.status=b.CANCELED,this.emit("canceled",a),this.options.uploadMultiple&&this.emit("canceledmultiple",[a]);if(this.options.autoProcessQueue)return this.processQueue()};var k=function(){var a=arguments[0];
+var b=2<=arguments.length?v.call(arguments,1):[];return"function"===typeof a?a.apply(this,b):a};b.prototype.uploadFile=function(a){return this.uploadFiles([a])};b.prototype.uploadFiles=function(a){var c,g,f;var e=new XMLHttpRequest;var d=0;for(f=a.length;d<f;d++){var h=a[d];h.xhr=e}d=k(this.options.method,a);f=k(this.options.url,a);e.open(d,f,!0);e.timeout=k(this.options.timeout,a);e.withCredentials=!!this.options.withCredentials;var l=null;var m=function(b){return function(){var c;var f=[];var d=
+0;for(c=a.length;d<c;d++)h=a[d],f.push(b._errorProcessing(a,l||b.options.dictResponseError.replace("{{statusCode}}",e.status),e));return f}}(this);var n=function(b){return function(c){var e;if(null!=c){var f=100*c.loaded/c.total;var d=0;for(e=a.length;d<e;d++)h=a[d],h.upload.progress=f,h.upload.total=c.total,h.upload.bytesSent=c.loaded}else{c=!0;f=100;d=0;for(e=a.length;d<e;d++){h=a[d];if(100!==h.upload.progress||h.upload.bytesSent!==h.upload.total)c=!1;h.upload.progress=f;h.upload.bytesSent=h.upload.total}if(c)return}e=
+[];d=0;for(c=a.length;d<c;d++)h=a[d],e.push(b.emit("uploadprogress",h,f,h.upload.bytesSent));return e}}(this);e.onload=function(c){return function(d){var f;if(a[0].status!==b.CANCELED&&4===e.readyState){if("arraybuffer"!==e.responseType&&"blob"!==e.responseType&&(l=e.responseText,e.getResponseHeader("content-type")&&~e.getResponseHeader("content-type").indexOf("application/json")))try{l=JSON.parse(l)}catch(D){d=D,l="Invalid JSON response from server."}n();return 200<=(f=e.status)&&300>f?c._finished(a,
+l,d):m()}}}(this);e.onerror=function(c){return function(){if(a[0].status!==b.CANCELED)return m()}}(this);(null!=(g=e.upload)?g:e).onprogress=n;d={Accept:"application/json","Cache-Control":"no-cache","X-Requested-With":"XMLHttpRequest"};this.options.headers&&r(d,this.options.headers);for(u in d)(g=d[u])&&e.setRequestHeader(u,g);var q=new FormData;if(this.options.params){var u=this.options.params;for(w in u)g=u[w],q.append(w,g)}var w=0;for(u=a.length;w<u;w++)h=a[w],this.emit("sending",h,e,q);this.options.uploadMultiple&&
+this.emit("sendingmultiple",a,e,q);if("FORM"===this.element.tagName)for(d=this.element.querySelectorAll("input, textarea, select, button"),u=0,g=d.length;u<g;u++){f=d[u];w=f.getAttribute("name");var v=f.getAttribute("type");if("SELECT"===f.tagName&&f.hasAttribute("multiple")){var y=f.options;v=0;for(f=y.length;v<f;v++){var z=y[v];z.selected&&q.append(w,z.value)}}else(!v||"checkbox"!==(c=v.toLowerCase())&&"radio"!==c||f.checked)&&q.append(w,f.value)}var t=0;d=[];w=u=0;for(g=a.length-1;0<=g?u<=g:u>=
+g;w=0<=g?++u:--u)c=function(b){return function(c,d,f){return function(c){q.append(d,c,f);if(++t===a.length)return b.submitRequest(e,q,a)}}}(this),d.push(this.options.transformFile.call(this,a[w],c(a[w],this._getParamName(w),a[w].upload.filename)));return d};b.prototype.submitRequest=function(a,b,d){return a.send(b)};b.prototype._finished=function(a,c,d){var f;var e=0;for(f=a.length;e<f;e++){var g=a[e];g.status=b.SUCCESS;this.emit("success",g,c,d);this.emit("complete",g)}this.options.uploadMultiple&&
+(this.emit("successmultiple",a,c,d),this.emit("completemultiple",a));if(this.options.autoProcessQueue)return this.processQueue()};b.prototype._errorProcessing=function(a,c,d){var f;var e=0;for(f=a.length;e<f;e++){var g=a[e];g.status=b.ERROR;this.emit("error",g,c,d);this.emit("complete",g)}this.options.uploadMultiple&&(this.emit("errormultiple",a,c,d),this.emit("completemultiple",a));if(this.options.autoProcessQueue)return this.processQueue()};return b}(m);h.version="5.1.1";h.options={};h.optionsForElement=
+function(d){if(d.getAttribute("id"))return h.options[A(d.getAttribute("id"))]};h.instances=[];h.forElement=function(d){"string"===typeof d&&(d=document.querySelector(d));if(null==(null!=d?d.dropzone:void 0))throw Error("No Dropzone found for given element. This is probably because you're trying to access it before Dropzone had the time to initialize. Use the `init` option to setup any additional observers on your Dropzone.");return d.dropzone};h.autoDiscover=!0;h.discover=function(){var d;if(document.querySelectorAll)var b=
+document.querySelectorAll(".dropzone");else{b=[];var r=function(a){var c;var d=[];var e=0;for(c=a.length;e<c;e++){var h=a[e];/(^| )dropzone($| )/.test(h.className)?d.push(b.push(h)):d.push(void 0)}return d};r(document.getElementsByTagName("div"));r(document.getElementsByTagName("form"))}var k=[];var a=0;for(d=b.length;a<d;a++)r=b[a],!1!==h.optionsForElement(r)?k.push(new h(r)):k.push(void 0);return k};h.blacklistedBrowsers=[/opera.*(Windows Phone|Macintosh).*version\/12/i];h.isBrowserSupported=function(){var d;
+var b=!0;if(window.File&&window.FileReader&&window.FileList&&window.Blob&&window.FormData&&document.querySelector)if("classList"in document.createElement("a")){var r=h.blacklistedBrowsers;var k=0;for(d=r.length;k<d;k++){var a=r[k];a.test(navigator.userAgent)&&(b=!1)}}else b=!1;else b=!1;return b};h.dataURItoBlob=function(d){var b,h;var k=atob(d.split(",")[1]);var a=d.split(",")[0].split(":")[1].split(";")[0];d=new ArrayBuffer(k.length);var c=new Uint8Array(d);var g=b=0;for(h=k.length;0<=h?b<=h:b>=
+h;g=0<=h?++b:--b)c[g]=k.charCodeAt(g);return new Blob([d],{type:a})};var q=function(d,b){var h;var k=[];var a=0;for(h=d.length;a<h;a++){var c=d[a];c!==b&&k.push(c)}return k};var A=function(d){return d.replace(/[\-_](\w)/g,function(b){return b.charAt(1).toUpperCase()})};h.createElement=function(d){var b=document.createElement("div");b.innerHTML=d;return b.childNodes[0]};h.elementInside=function(d,b){if(d===b)return!0;for(;d=d.parentNode;)if(d===b)return!0;return!1};h.getElement=function(d,b){var h;
+"string"===typeof d?h=document.querySelector(d):null!=d.nodeType&&(h=d);if(null==h)throw Error("Invalid `"+b+"` option provided. Please provide a CSS selector or a plain HTML element.");return h};h.getElements=function(d,b){var h;if(d instanceof Array){var k=[];try{var a=0;for(h=d.length;a<h;a++){var c=d[a];k.push(this.getElement(c,b))}}catch(g){k=null}}else if("string"===typeof d)for(k=[],h=document.querySelectorAll(d),d=0,a=h.length;d<a;d++)c=h[d],k.push(c);else null!=d.nodeType&&(k=[d]);if(null==
+k||!k.length)throw Error("Invalid `"+b+"` option provided. Please provide a CSS selector, a plain HTML element or a list of those.");return k};h.confirm=function(d,b,h){if(window.confirm(d))return b();if(null!=h)return h()};h.isValidFile=function(d,b){var h;if(!b)return!0;b=b.split(",");var k=d.type;var a=k.replace(/\/.*$/,"");var c=0;for(h=b.length;c<h;c++){var g=b[c];g=g.trim();if("."===g.charAt(0)){if(-1!==d.name.toLowerCase().indexOf(g.toLowerCase(),d.name.length-g.length))return!0}else if(/\/\*$/.test(g)){if(a===
+g.replace(/\/.*$/,""))return!0}else if(k===g)return!0}return!1};"undefined"!==typeof jQuery&&null!==jQuery&&(jQuery.fn.dropzone=function(d){return this.each(function(){return new h(this,d)})});"undefined"!==typeof module&&null!==module?module.exports=h:window.Dropzone=h;h.ADDED="added";h.QUEUED="queued";h.ACCEPTED=h.QUEUED;h.UPLOADING="uploading";h.PROCESSING=h.UPLOADING;h.CANCELED="canceled";h.ERROR="error";h.SUCCESS="success";var E=function(d){var b,h;var k=d.naturalHeight;var a=document.createElement("canvas");
+a.width=1;a.height=k;a=a.getContext("2d");a.drawImage(d,0,0);a=a.getImageData(1,0,1,k).data;var c=0;for(h=b=k;h>c;)d=a[4*(h-1)+3],0===d?b=h:c=h,h=b+c>>1;k=h/k;return 0===k?1:k};var C=function(d,b,h,k,a,c,g,f,e,l){var p=E(b);return d.drawImage(b,h,k,a,c,g,f,e,l/p)};h._autoDiscoverFunction=function(){if(h.autoDiscover)return h.discover()};(function(d,b){var h=!1;var k=!0;var a=d.document;var c=a.documentElement;var g=a.addEventListener?"addEventListener":"attachEvent";var f=a.addEventListener?"removeEventListener":
+"detachEvent";var e=a.addEventListener?"":"on";var l=function(c){if("readystatechange"!==c.type||"complete"===a.readyState)if(("load"===c.type?d:a)[f](e+c.type,l,!1),!h&&(h=!0))return b.call(d,c.type||c)};var m=function(){try{c.doScroll("left")}catch(B){setTimeout(m,50);return}return l("poll")};if("complete"!==a.readyState){if(a.createEventObject&&c.doScroll){try{k=!d.frameElement}catch(B){}k&&m()}a[g](e+"DOMContentLoaded",l,!1);a[g](e+"readystatechange",l,!1);return d[g](e+"load",l,!1)}})(window,
+h._autoDiscoverFunction)}).call(this);
-- 
cgit v1.2.3


From 00ad623313b17c9fbf70d0896574cbca599b6dc9 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 11 Jun 2020 13:32:11 +0100
Subject: [Northamptonshire] Factor out code to add multiple Alloy asset layers

---
 web/cobrands/fixmystreet-uk-councils/alloy.js | 22 ++++++++++++++++++++++
 web/cobrands/northamptonshire/assets.js       | 21 +--------------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/web/cobrands/fixmystreet-uk-councils/alloy.js b/web/cobrands/fixmystreet-uk-councils/alloy.js
index ace0062de..f11a3e7bf 100644
--- a/web/cobrands/fixmystreet-uk-councils/alloy.js
+++ b/web/cobrands/fixmystreet-uk-councils/alloy.js
@@ -133,4 +133,26 @@ fixmystreet.alloy_defaults = {
     strategy_class: OpenLayers.Strategy.Alloy
 };
 
+fixmystreet.alloy_add_layers = function(defaults, layers) {
+    $.each(layers, function(index, layer) {
+        if ( layer.categories ) {
+            var options = {
+                http_options: {
+                    layerid: layer.layer,
+                    layerVersion: layer.version,
+                },
+                asset_type: layer.asset_type || 'spot',
+                asset_category: layer.categories,
+                asset_item: layer.item_name || layer.layer_name.toLowerCase(),
+            };
+            if (layer.max_resolution) {
+                options.max_resolution = layer.max_resolution;
+            }
+            if (layer.snap_threshold || layer.snap_threshold === 0) {
+                options.snap_threshold = layer.snap_threshold;
+            }
+            fixmystreet.assets.add(northants_defaults, options);
+        }
+    });
+};
 })();
diff --git a/web/cobrands/northamptonshire/assets.js b/web/cobrands/northamptonshire/assets.js
index 2b6cdeb69..377e1091c 100644
--- a/web/cobrands/northamptonshire/assets.js
+++ b/web/cobrands/northamptonshire/assets.js
@@ -439,26 +439,7 @@ var northants_defaults = $.extend(true, {}, fixmystreet.alloy_defaults, {
   }
 });
 
-$.each(layers, function(index, layer) {
-    if ( layer.categories ) {
-        var options = {
-          http_options: {
-            layerid: layer.layer,
-            layerVersion: layer.version,
-          },
-          asset_type: layer.asset_type || 'spot',
-          asset_category: layer.categories,
-          asset_item: layer.item_name || layer.layer_name.toLowerCase(),
-        };
-        if (layer.max_resolution) {
-          options.max_resolution = layer.max_resolution;
-        }
-        if (layer.snap_threshold || layer.snap_threshold === 0) {
-          options.snap_threshold = layer.snap_threshold;
-        }
-        fixmystreet.assets.add(northants_defaults, options);
-    }
-});
+fixmystreet.alloy_add_layers(northants_defaults, layers);
 
 // NCC roads layers which prevent report submission unless we have selected
 // an asset.
-- 
cgit v1.2.3


From 603cc8c79564cada62a4dfa8d5c12bdd489f02f0 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 7 Nov 2019 11:46:19 +0000
Subject: [Alloy] asset layers for Alloy V2

Mostly inherits from original Alloy code, with addition of a new format
as Alloy no longer returns a native geoJSON collection.
---
 web/cobrands/fixmystreet-uk-councils/alloy.js | 93 +++++++++++++++++++++++----
 1 file changed, 80 insertions(+), 13 deletions(-)

diff --git a/web/cobrands/fixmystreet-uk-councils/alloy.js b/web/cobrands/fixmystreet-uk-councils/alloy.js
index f11a3e7bf..88d0b017f 100644
--- a/web/cobrands/fixmystreet-uk-councils/alloy.js
+++ b/web/cobrands/fixmystreet-uk-councils/alloy.js
@@ -3,6 +3,7 @@
 OpenLayers.Protocol.Alloy = OpenLayers.Class(OpenLayers.Protocol.HTTP, {
     currentRequests: [],
 
+    tileSize: 512,
     abort: function() {
         if (this.currentRequests.length) {
             for (var j = 0; j < this.currentRequests.length; j++) {
@@ -63,8 +64,8 @@ OpenLayers.Protocol.Alloy = OpenLayers.Class(OpenLayers.Protocol.HTTP, {
         var adjustY = reverse ? 0 : 0.5;
         var xFromOrigin = Math.floor((bounds[0] - origin.lon) / resolution + adjustX);
         var yFromOrigin = Math.floor((bounds[1] - origin.lat) / resolution + adjustY);
-        var tileCoordX = Math.floor(xFromOrigin / 512);
-        var tileCoordY = Math.floor(yFromOrigin / 512) * -1;
+        var tileCoordX = Math.floor(xFromOrigin / this.tileSize);
+        var tileCoordY = Math.floor(yFromOrigin / this.tileSize) * -1;
 
         if (reverse) {
             tileCoordX -= 1;
@@ -88,13 +89,18 @@ OpenLayers.Strategy.Alloy = OpenLayers.Class(OpenLayers.Strategy.FixMyStreet, {
       this.failCount = 0;
       this.layer.destroyFeatures();
     },
+    // allow sub classes to override the remote projection for converting the geometry
+    // of the features
+    getRemoteProjection: function() {
+        return this.layer.projection;
+    },
     merge: function(resp) {
         this.count++;
         // This if/else clause lifted from OpenLayers.Strategy.BBOX
         if (resp.success()) {
             var features = resp.features;
             if(features && features.length > 0) {
-                var remote = this.layer.projection;
+                var remote = this.getRemoteProjection();
                 var local = this.layer.map.getProjectionObject();
                 if(!local.equals(remote)) {
                     var geom;
@@ -133,26 +139,87 @@ fixmystreet.alloy_defaults = {
     strategy_class: OpenLayers.Strategy.Alloy
 };
 
+/* for Alloy V2 */
+OpenLayers.Format.AlloyV2 = OpenLayers.Class(OpenLayers.Format.GeoJSON, {
+    read: function(json, type, filter) {
+        var results = null;
+        var obj = null;
+        if (typeof json == "string") {
+            obj = OpenLayers.Format.JSON.prototype.read.apply(this, [json, filter]);
+        } else {
+            obj = json;
+        }
+
+        if(!obj) {
+            OpenLayers.Console.error("Bad JSON: " + json);
+        } else {
+            results = [];
+            for(var i=0, len=obj.results.length; i<len; ++i) {
+                try {
+                    results.push(this.parseFeature(obj.results[i]));
+                } catch(err) {
+                    results = null;
+                    OpenLayers.Console.error(err);
+                }
+            }
+        }
+        return results;
+    }
+});
+
+OpenLayers.Protocol.AlloyV2 = OpenLayers.Class(OpenLayers.Protocol.Alloy, {
+    tileSize: 128,
+    getURL: function(coords, options) {
+        return OpenLayers.String.format(options.base, {'layerid': options.layerid, 'styleid': options.styleid, 'z': 17, 'x': coords[0], 'y': coords[1]});
+    }
+});
+
+OpenLayers.Strategy.AlloyV2 = OpenLayers.Class(OpenLayers.Strategy.Alloy, {
+    initialize: function(name, options) {
+        this.remote = new OpenLayers.Projection("EPSG:4326");
+        OpenLayers.Strategy.Alloy.prototype.initialize.apply(this, arguments);
+    },
+    // the layer uses EPSG:3857 for generating the tile location but the features
+    // use EPSG:4326
+    getRemoteProjection: function() {
+        return this.remote;
+    }
+});
+
+fixmystreet.alloyv2_defaults = {
+    format_class: OpenLayers.Format.AlloyV2,
+    srsName: "EPSG:3857",
+    strategy_class: OpenLayers.Strategy.AlloyV2
+};
+
 fixmystreet.alloy_add_layers = function(defaults, layers) {
     $.each(layers, function(index, layer) {
         if ( layer.categories ) {
             var options = {
-                http_options: {
-                    layerid: layer.layer,
-                    layerVersion: layer.version,
-                },
-                asset_type: layer.asset_type || 'spot',
-                asset_category: layer.categories,
-                asset_item: layer.item_name || layer.layer_name.toLowerCase(),
+              http_options: {
+                layerid: layer.layerid || layer.layer
+              },
+              asset_type: layer.asset_type || "spot",
+              asset_category: layer.categories,
+              asset_item: layer.item_name || layer.layer_name.toLowerCase()
             };
+            // Alloy v2
+            if (layer.styleid) {
+                options.http_options.styleid = layer.styleid;
+            }
+            // Alloy v1
+            if (layer.version) {
+                options.http_options.layerVersion = layer.version;
+            }
             if (layer.max_resolution) {
-                options.max_resolution = layer.max_resolution;
+              options.max_resolution = layer.max_resolution;
             }
             if (layer.snap_threshold || layer.snap_threshold === 0) {
-                options.snap_threshold = layer.snap_threshold;
+              options.snap_threshold = layer.snap_threshold;
             }
-            fixmystreet.assets.add(northants_defaults, options);
+            fixmystreet.assets.add(defaults, options);
         }
     });
 };
+
 })();
-- 
cgit v1.2.3


From d157073eb872a98f9c697a0e3e959f498a922e12 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 23 Apr 2020 15:47:59 +0100
Subject: =?UTF-8?q?Don=E2=80=99t=20show=20`sent=5Fto`=20on=20moderation=20?=
 =?UTF-8?q?diff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm | 2 +-
 t/app/controller/moderate.t                             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm b/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
index 1805e1fd2..6d14e6a9f 100644
--- a/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
+++ b/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
@@ -163,7 +163,7 @@ sub compare_extra {
     my $new = $other->get_extra_metadata;
 
     my $both = { %$old, %$new };
-    my @all_keys = sort keys %$both;
+    my @all_keys = grep { $_ ne 'sent_to' } sort keys %$both;
     my @s;
     foreach (@all_keys) {
         if ($old->{$_} && $new->{$_}) {
diff --git a/t/app/controller/moderate.t b/t/app/controller/moderate.t
index 8e84bd392..43ae1c980 100644
--- a/t/app/controller/moderate.t
+++ b/t/app/controller/moderate.t
@@ -51,7 +51,7 @@ sub create_report {
         longitude          => '0.007831',
         user_id            => $user2->id,
         photo              => '74e3362283b6ef0c48686fb0e161da4043bbcc97.jpeg',
-        extra => { moon => 'waxing full' },
+        extra => { moon => 'waxing full', sent_to => [ 'authority@example.org' ] },
     });
 }
 my $report = create_report();
@@ -115,6 +115,7 @@ subtest 'Problem moderation' => sub {
         }});
         $mech->base_like( qr{\Q$REPORT_URL\E} );
         $mech->content_like(qr/Moderated by Bromley Council/);
+        $mech->content_lacks('sent_to = ARRAY(0x');
 
         $report->discard_changes;
         is $report->title, 'Good good';
-- 
cgit v1.2.3


From 3e9277ed0e81b5d09656bff0aa5dacd87da1e55e Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Wed, 9 Oct 2019 14:02:12 +0100
Subject: [Hackney] Initial cobrand design & privacy policy amendment

Co-Authored-By: Struan Donald <struan@exo.org.uk>

For https://github.com/mysociety/fixmystreet-commercial/issues/1808
---
 .cypress/cypress/integration/hackney.js            |  19 ++
 bin/browser-tests                                  |   4 +-
 bin/fixmystreet.com/fixture                        |   1 +
 perllib/FixMyStreet/Cobrand/Hackney.pm             |  24 +++
 t/Mock/MapIt.pm                                    |   1 +
 t/cobrand/hackney.t                                | 223 +++++++++++++++++++++
 templates/email/hackney/_email_bottom.html         |  28 +++
 .../email/hackney/_email_color_overrides.html      |  25 +++
 .../email/hackney/_email_setting_overrides.html    |   7 +
 templates/email/hackney/signature.txt              |   2 +
 templates/email/hackney/site-name.txt              |   1 +
 .../web/fixmystreet-uk-councils/about/privacy.html |   6 +
 templates/web/hackney/around/intro.html            |   5 +
 templates/web/hackney/footer_extra.html            |  10 +
 templates/web/hackney/header_extra.html            |   2 +
 templates/web/hackney/site-name.html               |   1 +
 templates/web/hackney/tracking_code.html           |   1 +
 web/cobrands/hackney/_colours.scss                 |  45 +++++
 web/cobrands/hackney/base.scss                     | 217 ++++++++++++++++++++
 web/cobrands/hackney/hackney-search-icon.png       | Bin 0 -> 464 bytes
 web/cobrands/hackney/images/hackney-logo-white.png | Bin 0 -> 18214 bytes
 web/cobrands/hackney/layout.scss                   | 143 +++++++++++++
 22 files changed, 763 insertions(+), 2 deletions(-)
 create mode 100644 .cypress/cypress/integration/hackney.js
 create mode 100644 perllib/FixMyStreet/Cobrand/Hackney.pm
 create mode 100644 t/cobrand/hackney.t
 create mode 100644 templates/email/hackney/_email_bottom.html
 create mode 100644 templates/email/hackney/_email_color_overrides.html
 create mode 100644 templates/email/hackney/_email_setting_overrides.html
 create mode 100644 templates/email/hackney/signature.txt
 create mode 100644 templates/email/hackney/site-name.txt
 create mode 100644 templates/web/hackney/around/intro.html
 create mode 100644 templates/web/hackney/footer_extra.html
 create mode 100644 templates/web/hackney/header_extra.html
 create mode 100644 templates/web/hackney/site-name.html
 create mode 100644 templates/web/hackney/tracking_code.html
 create mode 100644 web/cobrands/hackney/_colours.scss
 create mode 100644 web/cobrands/hackney/base.scss
 create mode 100644 web/cobrands/hackney/hackney-search-icon.png
 create mode 100644 web/cobrands/hackney/images/hackney-logo-white.png
 create mode 100644 web/cobrands/hackney/layout.scss

diff --git a/.cypress/cypress/integration/hackney.js b/.cypress/cypress/integration/hackney.js
new file mode 100644
index 000000000..a4293b028
--- /dev/null
+++ b/.cypress/cypress/integration/hackney.js
@@ -0,0 +1,19 @@
+describe('When you look at the Hackney site', function() {
+
+  beforeEach(function() {
+    cy.server();
+    cy.route('/report/new/ajax*').as('report-ajax');
+    cy.visit('http://hackney.localhost:3001/');
+    cy.contains('Hackney Council');
+    cy.should('not.contain', 'Hackney Borough');
+    cy.get('[name=pc]').type('E8 1DY');
+    cy.get('[name=pc]').parents('form').submit();
+  });
+
+  it('uses the correct name', function() {
+    cy.get('#map_box').click();
+    cy.wait('@report-ajax');
+    cy.get('select:eq(4)').select('Potholes');
+    cy.contains('sent to Hackney Council');
+  });
+});
diff --git a/bin/browser-tests b/bin/browser-tests
index 32b844127..e0b9bedfe 100755
--- a/bin/browser-tests
+++ b/bin/browser-tests
@@ -11,7 +11,7 @@ my ($cobrand, $coords, $area_id, $name, $mapit_url, $coverage);
 
 BEGIN {
     $config_file = 'conf/general.yml-example';
-    $cobrand = [ 'borsetshire', 'fixmystreet', 'northamptonshire', 'bathnes', 'buckinghamshire', 'hounslow', 'isleofwight', 'peterborough', 'tfl' ];
+    $cobrand = [ 'borsetshire', 'fixmystreet', 'northamptonshire', 'bathnes', 'buckinghamshire', 'hounslow', 'isleofwight', 'peterborough', 'tfl', 'hackney' ];
     $coords = '51.532851,-2.284277';
     $area_id = 2608;
     $name = 'Borsetshire';
@@ -190,7 +190,7 @@ browser-tests [running options] [fixture options] [cypress options]
    --help           this help message
 
  Fixture option:
-   --cobrand        Cobrand(s) to use, default is fixmystreet,northamptonshire,bathnes,buckinghamshire,isleofwight,peterborough,tfl
+   --cobrand        Cobrand(s) to use, default is fixmystreet,northamptonshire,bathnes,buckinghamshire,isleofwight,peterborough,tfl,hackney
    --coords         Default co-ordinates for created reports
    --area_id        Area ID to use for created body
    --name           Name to use for created body
diff --git a/bin/fixmystreet.com/fixture b/bin/fixmystreet.com/fixture
index 082fc6309..e8dd3f364 100755
--- a/bin/fixmystreet.com/fixture
+++ b/bin/fixmystreet.com/fixture
@@ -99,6 +99,7 @@ if ($opt->test_fixtures) {
         { area_id => 2257, categories => ['Flytipping', 'Graffiti'], name => 'Chiltern District Council' },
         { area_id => 2397, categories => [ 'Graffiti' ], name => 'Northampton Borough Council' },
         { area_id => 2483, categories => [ 'Potholes', 'Other' ], name => 'Hounslow Borough Council' },
+        { area_id => 2508, categories => [ 'Potholes', 'Other' ], name => 'Hackney Council' },
         { area_id => 2636, categories => [ 'Potholes', 'Private', 'Extra' ], name => 'Isle of Wight Council' },
         { area_id => 2566, categories => [ 'Fallen branch', 'Light Out', 'Light Dim', 'Fallen Tree', 'Damaged Tree' ], name => 'Peterborough City Council' },
         { area_id => 2498, categories => [ 'Incorrect timetable', 'Glass broken', 'Mobile Crane Operation' ], name => 'TfL' },
diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
new file mode 100644
index 000000000..e726154b0
--- /dev/null
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -0,0 +1,24 @@
+package FixMyStreet::Cobrand::Hackney;
+use parent 'FixMyStreet::Cobrand::Whitelabel';
+
+use strict;
+use warnings;
+
+sub council_area_id { return 2508; }
+sub council_area { return 'Hackney'; }
+sub council_name { return 'Hackney Council'; }
+sub council_url { return 'hackney'; }
+sub send_questionnaires { 0 }
+
+sub disambiguate_location {
+    my $self    = shift;
+    my $string  = shift;
+
+    return {
+        %{ $self->SUPER::disambiguate_location() },
+        centre => '51.552267,-0.063316',
+        bounds => [ 51.519814, -0.104511, 51.577784, -0.016527 ],
+    };
+}
+
+1;
diff --git a/t/Mock/MapIt.pm b/t/Mock/MapIt.pm
index b54ba0ddb..ed95e71fc 100644
--- a/t/Mock/MapIt.pm
+++ b/t/Mock/MapIt.pm
@@ -44,6 +44,7 @@ my @PLACES = (
     [ 'NN1 2NS', 52.238301, -0.889992, 2234, 'Northamptonshire County Council', 'CTY', 2397, 'Northampton Borough Council', 'DIS' ],
     [ '?', 52.238827, -0.894970, 2234, 'Northamptonshire County Council', 'CTY', 2397, 'Northampton Borough Council', 'DIS' ],
     [ '?', 52.23025, -1.015826, 2234, 'Northamptonshire County Council', 'CTY', 2397, 'Northampton Borough Council', 'DIS' ],
+    [ 'E8 1DY', 51.552267, -0.063316, 2508, 'Hackney Borough Council', 'LBO' ],
     [ 'TW7 5JN', 51.482286, -0.328163, 2483, 'Hounslow Borough Council', 'LBO' ],
     [ '?', 51.48111, -0.327219, 2483, 'Hounslow Borough Council', 'LBO' ],
     [ '?', 51.482045, -0.327219, 2483, 'Hounslow Borough Council', 'LBO' ],
diff --git a/t/cobrand/hackney.t b/t/cobrand/hackney.t
new file mode 100644
index 000000000..519b1b3b8
--- /dev/null
+++ b/t/cobrand/hackney.t
@@ -0,0 +1,223 @@
+use utf8;
+use CGI::Simple;
+use DateTime;
+use Test::MockModule;
+use FixMyStreet::TestMech;
+use Open311;
+use Open311::GetServiceRequests;
+use Open311::GetServiceRequestUpdates;
+use Open311::PostServiceRequestUpdates;
+use FixMyStreet::Script::Alerts;
+use FixMyStreet::Script::Reports;
+
+# disable info logs for this test run
+FixMyStreet::App->log->disable('info');
+END { FixMyStreet::App->log->enable('info'); }
+
+ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' );
+
+my $params = {
+    send_method => 'Open311',
+    send_comments => 1,
+    api_key => 'KEY',
+    endpoint => 'endpoint',
+    jurisdiction => 'home',
+    can_be_devolved => 1,
+};
+
+my $hackney = $mech->create_body_ok(2508, 'Hackney Council', $params);
+my $contact = $mech->create_contact_ok(
+    body_id => $hackney->id,
+    category => 'Potholes',
+    email => 'pothole@example.org',
+);
+$contact->set_extra_fields( ( {
+    code => 'urgent',
+    datatype => 'string',
+    description => 'question',
+    variable => 'true',
+    required => 'false',
+    order => 1,
+    datatype_description => 'datatype',
+} ) );
+$contact->update;
+
+my $user = $mech->create_user_ok('user@example.org', name => 'Test User');
+my $hackney_user = $mech->create_user_ok('hackney_user@example.org', name => 'Hackney User', from_body => $hackney);
+$hackney_user->user_body_permissions->create({
+    body => $hackney,
+    permission_type => 'moderate',
+});
+
+my $contact2 = $mech->create_contact_ok(
+    body_id => $hackney->id,
+    category => 'Roads',
+    email => 'roads@example.org',
+    send_method => 'Triage',
+);
+
+my $admin_user = $mech->create_user_ok('admin-user@example.org', name => 'Admin User', from_body => $hackney);
+
+$admin_user->user_body_permissions->create({
+    body => $hackney,
+    permission_type => 'triage'
+});
+
+my @reports = $mech->create_problems_for_body(1, $hackney->id, 'A Hackney report', {
+    confirmed => '2019-10-25 09:00',
+    lastupdate => '2019-10-25 09:00',
+    latitude => 51.552267,
+    longitude => -0.063316,
+    user => $user,
+    external_id => 101202303
+});
+
+subtest "check clicking all reports link" => sub {
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+        ALLOWED_COBRANDS => ['hackney'],
+    }, sub {
+        $mech->get_ok('/');
+        $mech->follow_link_ok({ text => 'All reports' });
+    };
+
+    $mech->content_contains("A Hackney report", "Hackney report there");
+    $mech->content_contains("Hackney Council", "is still on cobrand");
+};
+
+subtest "check moderation label uses correct name" => sub {
+    my $REPORT_URL = '/report/' . $reports[0]->id;
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+        ALLOWED_COBRANDS => ['hackney'],
+    }, sub {
+        $mech->log_out_ok;
+        $mech->log_in_ok( $hackney_user->email );
+        $mech->get_ok($REPORT_URL);
+        $mech->content_lacks('show-moderation');
+        $mech->follow_link_ok({ text_regex => qr/^Moderate$/ });
+        $mech->content_contains('show-moderation');
+        $mech->submit_form_ok({ with_fields => {
+            problem_title  => 'Good good',
+            problem_detail => 'Good good improved',
+        }});
+        $mech->base_like( qr{\Q$REPORT_URL\E} );
+        $mech->content_like(qr/Moderated by Hackney Council/);
+    };
+};
+
+$_->delete for @reports;
+
+my $system_user = $mech->create_user_ok('system_user@example.org');
+
+my ($p) = $mech->create_problems_for_body(1, $hackney->id, '', { cobrand => 'hackney' });
+my $alert = FixMyStreet::DB->resultset('Alert')->create( {
+    parameter  => $p->id,
+    alert_type => 'new_updates',
+    user       => $user,
+    cobrand    => 'hackney',
+} )->confirm;
+
+subtest "sends branded alert emails" => sub {
+    $mech->create_comment_for_problem($p, $system_user, 'Other User', 'This is some update text', 'f', 'confirmed', undef);
+    $mech->clear_emails_ok;
+
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+        ALLOWED_COBRANDS => ['hackney','fixmystreet'],
+    }, sub {
+        FixMyStreet::Script::Alerts::send();
+    };
+
+    $mech->email_count_is(1);
+    my $email = $mech->get_email;
+    ok $email, "got an email";
+    like $mech->get_text_body_from_email($email), qr/Hackney Council/, "emails are branded";
+};
+
+$p->comments->delete;
+$p->delete;
+
+subtest "sends branded confirmation emails" => sub {
+    $mech->log_out_ok;
+    $mech->clear_emails_ok;
+    $mech->get_ok('/around');
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ 'hackney' ],
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $mech->submit_form_ok( { with_fields => { pc => 'E8 1DY', } },
+            "submit location" );
+
+        # click through to the report page
+        $mech->follow_link_ok( { text_regex => qr/skip this step/i, },
+            "follow 'skip this step' link" );
+
+        $mech->submit_form_ok(
+            {
+                button      => 'submit_register',
+                with_fields => {
+                    title         => 'Test Report',
+                    detail        => 'Test report details.',
+                    photo1        => '',
+                    name          => 'Joe Bloggs',
+                    username      => 'test-1@example.com',
+                    category      => 'Roads',
+                }
+            },
+            "submit good details"
+        );
+
+        $mech->email_count_is(1);
+        my $email = $mech->get_email;
+        ok $email, "got an email";
+        like $mech->get_text_body_from_email($email), qr/Hackney Council/, "emails are branded";
+
+        my $url = $mech->get_link_from_email($email);
+        $mech->get_ok($url);
+        $mech->clear_emails_ok;
+    };
+};
+
+#subtest "sends branded report sent emails" => sub {
+    #$mech->clear_emails_ok;
+    #FixMyStreet::override_config {
+        #STAGING_FLAGS => { send_reports => 1 },
+        #MAPIT_URL => 'http://mapit.uk/',
+        #ALLOWED_COBRANDS => ['hackney','fixmystreet'],
+    #}, sub {
+        #FixMyStreet::Script::Reports::send();
+    #};
+    #$mech->email_count_is(1);
+    #my $email = $mech->get_email;
+    #ok $email, "got an email";
+    #like $mech->get_text_body_from_email($email), qr/Hackney Council/, "emails are branded";
+#};
+
+subtest "check category extra uses correct name" => sub {
+    my @extras = ( {
+            code => 'test',
+            datatype => 'string',
+            description => 'question',
+            variable => 'true',
+            required => 'false',
+            order => 1,
+            datatype_description => 'datatype',
+        } );
+    $contact2->set_extra_fields( @extras );
+    $contact2->update;
+
+    my $extra_details;
+
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+        ALLOWED_COBRANDS => ['hackney','fixmystreet'],
+    }, sub {
+        $extra_details = $mech->get_ok_json('/report/new/category_extras?category=Roads&latitude=51.552267&longitude=-0.063316');
+    };
+
+    like $extra_details->{category_extra}, qr/Hackney Council/, 'correct name in category extras';
+};
+
+
+done_testing();
diff --git a/templates/email/hackney/_email_bottom.html b/templates/email/hackney/_email_bottom.html
new file mode 100644
index 000000000..64936c470
--- /dev/null
+++ b/templates/email/hackney/_email_bottom.html
@@ -0,0 +1,28 @@
+          </tr>
+        </table>
+      </th>
+      <th class="spacer-cell"></th>
+    </tr>
+  </table>
+  <table [% wrapper_table | safe %] style="[% wrapper_style %]">
+    <tr>
+      <th class="spacer-cell"></th>
+      <th width="[% wrapper_max_width %]" style="[% td_style %][% hint_style %]" class="hint">
+        [%~ IF email_footer %]
+          [% email_footer | safe %]
+        [%~ ELSE %]
+          This email was sent automatically, from an unmonitored email account. Please do not reply to it.
+        [%~ END %]
+      </th>
+      <th class="spacer-cell"></th>
+    </tr>
+    <tr>
+      <th class="spacer-cell"></th>
+      <th width="[% wrapper_max_width %]" style="[% td_style %][% hint_style %]">
+        Powered by <a href="http://www.fixmystreet.com">FixMyStreet</a>
+      </th>
+      <th class="spacer-cell"></th>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/templates/email/hackney/_email_color_overrides.html b/templates/email/hackney/_email_color_overrides.html
new file mode 100644
index 000000000..1af818eca
--- /dev/null
+++ b/templates/email/hackney/_email_color_overrides.html
@@ -0,0 +1,25 @@
+[%
+
+color_green = '#00b341'
+color_black = '#000000'
+color_white = '#FFFFFF'
+color_hackney_pale_green = '#f2f7f0'
+color_hackney_dark_green = '#00664f'
+
+body_background_color = color_hackney_pale_green
+body_text_color = color_black
+
+header_background_color = color_black
+header_text_color = color_white
+
+secondary_column_background_color = color_white
+
+button_background_color = color_hackney_dark_green
+button_text_color = color_white
+
+logo_file = 'hackney-logo-white.png'
+logo_width = "200" # pixel measurement, but without 'px' suffix
+logo_height = "36" # pixel measurement, but without 'px' suffix
+header_padding = "20px 30px"
+
+%]
diff --git a/templates/email/hackney/_email_setting_overrides.html b/templates/email/hackney/_email_setting_overrides.html
new file mode 100644
index 000000000..00eeed9cc
--- /dev/null
+++ b/templates/email/hackney/_email_setting_overrides.html
@@ -0,0 +1,7 @@
+[%
+
+only_column_style = "$only_column_style border: 1px solid $column_divider_color; border-top: none;"
+primary_column_style = "$primary_column_style border: 1px solid $column_divider_color; border-top: none;"
+secondary_column_style = "vertical-align: top; width: 50%; background-color: $secondary_column_background_color; color: $secondary_column_text_color; border: 1px solid $column_divider_color; border-top: none; border-left: none;"
+
+%]
diff --git a/templates/email/hackney/signature.txt b/templates/email/hackney/signature.txt
new file mode 100644
index 000000000..78a02659f
--- /dev/null
+++ b/templates/email/hackney/signature.txt
@@ -0,0 +1,2 @@
+
+Hackney Council
diff --git a/templates/email/hackney/site-name.txt b/templates/email/hackney/site-name.txt
new file mode 100644
index 000000000..29d7f1480
--- /dev/null
+++ b/templates/email/hackney/site-name.txt
@@ -0,0 +1 @@
+Report A Problem
diff --git a/templates/web/fixmystreet-uk-councils/about/privacy.html b/templates/web/fixmystreet-uk-councils/about/privacy.html
index 4a5ed9d2c..1290ee7fb 100644
--- a/templates/web/fixmystreet-uk-councils/about/privacy.html
+++ b/templates/web/fixmystreet-uk-councils/about/privacy.html
@@ -231,6 +231,11 @@ When you make a report
 </h2>
 
 <p>
+[% IF c.cobrand.moniker == 'hackney' %]
+    In using FixMyStreet for any of the functions listed above (sending a
+    report, leaving an update, email alerts or site registration), we are
+    processing your data under the legal basis 6(1)(a) – consent.
+[% ELSE %]
     In using FixMyStreet for any of the functions listed above (sending a
     report, leaving an update, email alerts or site registration), we are
     processing your data under the legal basis 6(1)(f) – legitimate interests.
@@ -243,6 +248,7 @@ When you make a report
     communities, so it's easy to see what the common problems are in a given
     area, and how quickly they get fixed. Other local residents can browse, read
     and comment on problems – and perhaps even offer a solution.
+[% END %]
 </p>
 
 <h2>
diff --git a/templates/web/hackney/around/intro.html b/templates/web/hackney/around/intro.html
new file mode 100644
index 000000000..d4510ac9a
--- /dev/null
+++ b/templates/web/hackney/around/intro.html
@@ -0,0 +1,5 @@
+            <div id="postcode-intro">
+                <h1> Report, view, or discuss local problems</h1>
+                <h2> (like potholes, fly tipping, broken paving slabs, or street lighting) </h2>
+            </div>
+
diff --git a/templates/web/hackney/footer_extra.html b/templates/web/hackney/footer_extra.html
new file mode 100644
index 000000000..1e7c53aad
--- /dev/null
+++ b/templates/web/hackney/footer_extra.html
@@ -0,0 +1,10 @@
+ <div class="hackney-footer">
+    <div class="container">
+        <a href="https://hackney.gov.uk/" alt="Hackney.gov.uk" class="hackney-footer__logo">Hackney</a>
+        [% IF NOT bodyclass.match('mappage') %]
+            <p class="footer-powered-by">
+            Powered by <a class="platform-logo" href="https://www.fixmystreet.com/pro/">FixMyStreet Platform</a>
+            </p>
+        [% END %]
+    </div>
+</div>
\ No newline at end of file
diff --git a/templates/web/hackney/header_extra.html b/templates/web/hackney/header_extra.html
new file mode 100644
index 000000000..73d214ae0
--- /dev/null
+++ b/templates/web/hackney/header_extra.html
@@ -0,0 +1,2 @@
+[% INCLUDE 'tracking_code.html' %]
+<link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,600,700&amp;display=swap" rel="stylesheet">
diff --git a/templates/web/hackney/site-name.html b/templates/web/hackney/site-name.html
new file mode 100644
index 000000000..29d7f1480
--- /dev/null
+++ b/templates/web/hackney/site-name.html
@@ -0,0 +1 @@
+Report A Problem
diff --git a/templates/web/hackney/tracking_code.html b/templates/web/hackney/tracking_code.html
new file mode 100644
index 000000000..b01a0178c
--- /dev/null
+++ b/templates/web/hackney/tracking_code.html
@@ -0,0 +1 @@
+[%# awaiting analytics information from Hackney %]
diff --git a/web/cobrands/hackney/_colours.scss b/web/cobrands/hackney/_colours.scss
new file mode 100644
index 000000000..4c0af7b03
--- /dev/null
+++ b/web/cobrands/hackney/_colours.scss
@@ -0,0 +1,45 @@
+/* COLOURS */
+
+$menu-image: 'menu-black';
+
+// Primary
+$white: #fff;
+$green: #00b341;
+$grey: #666664;
+
+
+// Secondary
+$yellow: #ffc845; 
+$blue: #0072ce;
+$pale_green: #f2f7f0;
+$alt_green: #328b15;
+$light_green: #84bd00;
+$dark_green: #00664f;
+$teal :#1e98a7;
+$black: #000;
+$red: #be3a34;
+
+$primary: $green;
+$primary_b: #000;
+$primary_text: $black;
+
+$base_bg: $white;
+$base_fg: $black;
+
+$link-color: $blue;
+$link-visited_color: $dark-green;
+$link-hover-color: $green;
+
+$nav_background_colour: $black;
+$nav_colour: $white;
+$nav_hover_background_colour: $black;
+
+$col_click_map: $green;
+
+$header-top-border: false;
+
+$montserrat: 'Montserrat', Arial, sans-serif;
+
+$heading-font: $montserrat;
+$body-font: $montserrat;
+$meta-font: $montserrat;
\ No newline at end of file
diff --git a/web/cobrands/hackney/base.scss b/web/cobrands/hackney/base.scss
new file mode 100644
index 000000000..a3e41c5d0
--- /dev/null
+++ b/web/cobrands/hackney/base.scss
@@ -0,0 +1,217 @@
+@import "../sass/h5bp";
+@import "./_colours";
+@import "../sass/mixins";
+
+@import "../sass/base";
+
+
+#site-header {
+  box-shadow: 
+    0 0 0 6px $white,
+    0 0 0 10px $dark-green,
+    0 0 0 13px $white,
+    0 0 0 16px $green,
+    0 0 0 19px $white,
+    0 0 0 21px $light-green;
+}
+
+#site-logo {
+    background: transparent url('images/hackney-logo-white.png') 0 50% no-repeat;
+    background-size: 200px 36px;
+    width: 200px;
+    &:focus {
+      outline: 4px solid $yellow;
+    }
+}
+
+.nav-menu--mysoc {
+  a {
+    color: $primary_text;
+    background-color: $primary;
+  }
+}
+
+#front-main {
+    background-color: $white;
+    margin: 0;
+    padding: 1em;
+    text-align: inherit;
+
+    h1 {
+        color: $black;
+    }
+
+    #postcodeForm {
+        margin: 0;
+        padding: 0;
+        background: transparent;
+        color: inherit;
+
+        div {
+            border: none;
+            background: transparent;
+            position: relative;
+            background: #fff;
+            box-shadow: 1px 1px 5px 1px rgba(104, 104, 104, 0.4);
+
+            input#pc {
+                box-sizing: border-box;
+                padding: 10px 22px;
+            }
+
+            input#sub {
+                width: 0;
+                padding-left: 50px;
+                overflow: hidden;
+                @include flex(0 0 auto);
+                background: $black url('hackney-search-icon.png') no-repeat 50% 50%;
+                background-size: 25px 25px;
+                color: $black;
+                &:hover,
+                &:focus {
+                    background: $dark-green url('hackney-search-icon.png') no-repeat 50% 50%;
+                    background-size: 25px 25px;
+                    color: $dark_green;
+                }
+                &:focus {
+                    outline: 4px solid $yellow;
+                }
+            }
+        }
+    }
+
+    a#geolocate_link {
+        background: transparent;
+        display: block;
+        padding: 0;
+        margin-top: 0.5em;
+        font-family: inherit;
+        font-size: 1em;
+        border-radius: 0;
+        color: $dark_green;
+
+        &:hover {
+            background: transparent;
+            text-decoration: underline;
+        }
+    }
+
+    .form-hint {
+        color: inherit;
+    }
+}
+
+.hackney-footer {
+  background-color: $dark_green;
+  color: #fff;
+  padding: 1em 0;
+}
+
+.hackney-footer__logo {
+  background: transparent url('images/hackney-logo-white.png') 0 50% no-repeat;
+  background-size: 200px 36px;
+  width: 200px;
+  height: 54px;
+  text-indent: -999999px;
+  display: inline-block;
+  &:focus {
+    outline: 4px solid $yellow;
+  }
+}
+
+a.platform-logo {
+  color: #fff;
+}
+
+#front_stats {
+  background-color: $dark_green;
+  color: #fff;
+}
+
+.green-btn,
+.btn {
+  border-radius: 4px;
+  font-size: 1.1875em;
+  font-weight: 400;
+  line-height: 1.4375em;
+  vertical-align: top;
+  display: inline-block;
+  position: relative;
+  border: 1px solid $dark_green;
+  box-shadow: inset #003d2f 0 -2px 0 0;
+  &:hover {
+    background: none;
+    background-color: #005a30;
+    color: #fff !important;
+  }
+  
+  &:focus {
+    border-color:#ffdd00;
+    color:#0b0c0c !important;
+    background: none;
+    background-color:#ffdd00;
+    box-shadow: 0 2px 0#0b0c0c;
+  }
+}
+
+.btn--primary,
+.btn-primary,
+.green-btn {
+  background: $dark_green;
+  border: 2px solid transparent;
+  color: #ffffff;
+  box-shadow: 0 2px 0 #002d18;
+}
+
+textarea.form-control,
+.dropzone,
+input.form-control {
+  border: 2px solid #0b0c0c;
+  border-radius: 0;
+  box-shadow: none;
+  &:focus {
+    outline: 3px solid#ffdd00;
+    outline-offset: 0;
+    box-shadow: inset 0 0 0 2px;
+  }
+}
+
+label, legend, .label {
+  font-weight: 300;
+}
+
+.big-green-banner {
+  background-color: $dark_green;
+  text-transform: none;
+}
+
+div.form-error, p.form-error {
+  color: $red;
+  background-color: transparent;
+  padding: 0;
+  width: 100%;
+
+  a {
+    color: $red;
+    text-decoration: underline;
+  }
+}
+
+
+input.form-error, textarea.form-error,
+select.form-error {
+  border-color: $red;
+  border-radius: 0 !important;
+}
+
+.box-warning {
+  background-color: rgba(164, 214, 94, 0.5);
+}
+
+.dz-clickable:hover, .dz-drag-hover {
+  border-color: $light-green;
+}
+
+.dz-clickable:hover .dz-message u, .dz-drag-hover .dz-message u {
+  color: $green;
+}
\ No newline at end of file
diff --git a/web/cobrands/hackney/hackney-search-icon.png b/web/cobrands/hackney/hackney-search-icon.png
new file mode 100644
index 000000000..99305f24a
Binary files /dev/null and b/web/cobrands/hackney/hackney-search-icon.png differ
diff --git a/web/cobrands/hackney/images/hackney-logo-white.png b/web/cobrands/hackney/images/hackney-logo-white.png
new file mode 100644
index 000000000..3a41df786
Binary files /dev/null and b/web/cobrands/hackney/images/hackney-logo-white.png differ
diff --git a/web/cobrands/hackney/layout.scss b/web/cobrands/hackney/layout.scss
new file mode 100644
index 000000000..8b6fa6278
--- /dev/null
+++ b/web/cobrands/hackney/layout.scss
@@ -0,0 +1,143 @@
+@import "_colours";
+@import "../sass/layout";
+
+#main-nav {
+  display: block; // remove flex so nav touches top of parent
+  min-height: 0; // no vertical align, so no need for a height
+  margin-top: 0; // don't bother overlapping the border
+  height: auto;
+  margin-top: 0.5em;
+  .frontpage & {
+    margin-top: 1em;
+  }
+  .ie9 & {
+    position: static;
+    float: $right;
+
+    & > * {
+        position: static;
+        -ms-transform: none;
+    }
+  }
+
+  a {
+    font-weight: 600;
+  }
+}
+
+.nav-menu--mysoc {
+  padding: 0em 0.5em;
+  margin-#{$left}: 0.25em;
+  background-color: $primary;
+  @include border-radius(0 0 0.375em 0.375em);
+  a {
+    background-color: transparent;
+    color: $primary_text;
+    text-transform: uppercase;
+    font-size: 0.6875em;
+    padding: 1.3em 0.7em 1em;
+    &:hover {
+      color: #fff;
+      background-color: transparent;
+    }
+  }
+}
+
+body.frontpage {
+  #site-logo {
+    margin: 0.5em 0 0.5em;
+    width: 200px;
+    height: 54px;
+    background: transparent url('images/hackney-logo-white.png') 0 50% no-repeat;
+    background-size: 200px 36px;
+  }
+}
+
+#site-header {
+  padding: 4px 0;
+  margin-bottom: 2em;
+  .mappage & {
+    margin-bottom: 0;
+  }
+}
+
+#front-main {
+  background-color: $white;
+  padding: 50px 0;
+  border-bottom: 3px solid $light_green;
+  label {
+      font-size: 18px;
+      font-weight: 600;
+  }
+
+  h1 {
+      font-size: 40px;
+      font-weight: 600;
+  }
+
+  #postcodeForm {
+      overflow: visible;
+      margin: 0;
+
+      div {
+          margin: 0;
+      }
+    }
+
+  #front-main-container {
+      padding: 0 1em;
+  }
+}
+
+ol.big-numbers>li:before {
+  color: $dark_green;
+}
+
+.nav-menu--main span {
+  color: $light_green;
+  font-weight: 600;
+}
+
+#front_stats {
+  border-color: $dark_green;
+  big {
+    color: $dark_green;
+  }
+} 
+
+.nav-menu--main a.report-a-problem-btn {
+  background-color: transparent;
+  color: white;
+  &:hover,
+  &:active,
+  &:focus {
+    background-color: transparent;
+    color: white;
+  }
+}
+
+#front-howto h2,
+#front-recently h2 {
+  font-weight: 600;
+}
+
+#front_stats {
+  background-color: transparent;
+}
+
+.big-green-banner {
+  background-color: $dark_green;
+}
+
+.footer-powered-by { 
+  position: relative;
+  top: -40px;
+  right: 0;
+  text-align: right;
+  
+}
+
+a.platform-logo {
+  text-align: left;
+  
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 49805dd6a3ed38f06e355ad3603eb411d9e6dd15 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 28 Feb 2020 14:52:46 +0000
Subject: [Hackney] set extra open311 parameters

---
 perllib/FixMyStreet/Cobrand/Hackney.pm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index e726154b0..a888224d7 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -21,4 +21,26 @@ sub disambiguate_location {
     };
 }
 
+sub open311_config {
+    my ($self, $row, $h, $params) = @_;
+
+    $params->{multi_photos} = 1;
+}
+
+sub open311_extra_data {
+    my ($self, $row, $h, $extra) = @_;
+
+    my $open311_only = [
+        { name => 'report_url',
+          value => $h->{url} },
+        { name => 'title',
+          value => $row->title },
+        { name => 'description',
+          value => $row->detail },
+        { name => 'category',
+          value => $row->category },
+    ];
+
+    return $open311_only;
+}
 1;
-- 
cgit v1.2.3


From 4237159458ce724c42c3952ec48a111f71050beb Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 11 Mar 2020 15:26:47 +0000
Subject: [Hackney] Use OpenStreetMap base map

Also bumps up default zoom level a couple of notches

For https://github.com/mysociety/fixmystreet-commercial/issues/1760
---
 perllib/FixMyStreet/Cobrand/Hackney.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index a888224d7..6af147a16 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -43,4 +43,9 @@ sub open311_extra_data {
 
     return $open311_only;
 }
+
+sub map_type { 'OSM' }
+
+sub default_map_zoom { 5 }
+
 1;
-- 
cgit v1.2.3


From 002057bfedb00ff3cef14783d165a1c5fc3d0c56 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 23 Apr 2020 15:13:08 +0100
Subject: [Hackney] Switch to OSM geocoder

---
 perllib/FixMyStreet/Cobrand/Hackney.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index 6af147a16..eeca31186 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -16,11 +16,16 @@ sub disambiguate_location {
 
     return {
         %{ $self->SUPER::disambiguate_location() },
+        town   => 'Hackney',
         centre => '51.552267,-0.063316',
         bounds => [ 51.519814, -0.104511, 51.577784, -0.016527 ],
     };
 }
 
+sub get_geocoder {
+    return 'OSM'; # default of Bing gives poor results, let's try overriding.
+}
+
 sub open311_config {
     my ($self, $row, $h, $params) = @_;
 
-- 
cgit v1.2.3


From 761afd95fdc7cc98adb87c0ccfbb850e91dccc25 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 7 May 2020 11:32:20 +0100
Subject: [Hackney] Add admin_user_domain

---
 perllib/FixMyStreet/Cobrand/Hackney.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index eeca31186..deb408ab1 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -53,4 +53,6 @@ sub map_type { 'OSM' }
 
 sub default_map_zoom { 5 }
 
+sub admin_user_domain { 'hackney.gov.uk' }
+
 1;
-- 
cgit v1.2.3


From 6a013ddcfeb590863e16989652a0393acceb6e29 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 1 Jun 2020 16:12:57 +0100
Subject: [Hackney] Enable anonymous reporting

---
 perllib/FixMyStreet/Cobrand/Hackney.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index deb408ab1..76cd3f1dd 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -55,4 +55,12 @@ sub default_map_zoom { 5 }
 
 sub admin_user_domain { 'hackney.gov.uk' }
 
+sub anonymous_account {
+    my $self = shift;
+    return {
+        email => $self->feature('anonymous_account') . '@' . $self->admin_user_domain,
+        name => 'Anonymous user',
+    };
+}
+
 1;
-- 
cgit v1.2.3


From 6d07fab1527a18512c560d0b5608dea1143bdb69 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Mon, 2 Mar 2020 17:45:33 +0000
Subject: [Hackney] Add initial asset layers & config

---
 templates/web/hackney/footer_extra_js.html |   7 +
 web/cobrands/hackney/assets.js             | 246 +++++++++++++++++++++++++++++
 2 files changed, 253 insertions(+)
 create mode 100644 templates/web/hackney/footer_extra_js.html
 create mode 100644 web/cobrands/hackney/assets.js

diff --git a/templates/web/hackney/footer_extra_js.html b/templates/web/hackney/footer_extra_js.html
new file mode 100644
index 000000000..fbd33dd11
--- /dev/null
+++ b/templates/web/hackney/footer_extra_js.html
@@ -0,0 +1,7 @@
+[%
+IF bodyclass.match('mappage');
+  scripts.push(
+    version('/cobrands/fixmystreet-uk-councils/alloy.js'),
+  );
+END %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 %]
diff --git a/web/cobrands/hackney/assets.js b/web/cobrands/hackney/assets.js
new file mode 100644
index 000000000..9941594f0
--- /dev/null
+++ b/web/cobrands/hackney/assets.js
@@ -0,0 +1,246 @@
+(function(){
+
+if (!fixmystreet.maps) {
+    return;
+}
+
+/** These layers are from the Hackney WFS feed, for non-Alloy categories: */
+var wfs_defaults = {
+  http_options: {
+    url: "https://map.hackney.gov.uk/geoserver/wfs",
+    params: {
+        SERVICE: "WFS",
+        VERSION: "1.1.0",
+        REQUEST: "GetFeature",
+        SRSNAME: "urn:ogc:def:crs:EPSG::27700"
+    }
+},
+  asset_type: 'spot',
+  max_resolution: 2.388657133579254,
+  asset_id_field: 'id',
+  attributes: {},
+  geometryName: 'geom',
+  srsName: "EPSG:27700",
+  strategy_class: OpenLayers.Strategy.FixMyStreet,
+  body: "Hackney Council",
+  asset_item: "item"
+};
+
+
+fixmystreet.assets.add(wfs_defaults, {
+  http_options: {
+      params: {
+          TYPENAME: "greenspaces:park_bin",
+      }
+  },
+  asset_category: "Overflowing bin",
+  attributes: {}
+});
+
+fixmystreet.assets.add(wfs_defaults, {
+  http_options: {
+      params: {
+          TYPENAME: "amenity:public_toilet",
+      }
+  },
+  asset_category: ["Public toilets", "Toilets"],
+  attributes: {}
+});
+
+fixmystreet.assets.add(wfs_defaults, {
+  http_options: {
+      params: {
+          TYPENAME: "parking:pay_display_machine_liberator",
+      }
+  },
+  asset_category: "Pay & Display Machines",
+  attributes: {}
+});
+
+fixmystreet.assets.add(wfs_defaults, {
+  http_options: {
+      params: {
+          TYPENAME: "recycling:estate_recycling_bin",
+      }
+  },
+  asset_category: "Bin Contamination",
+  attributes: {}
+});
+
+fixmystreet.assets.add(wfs_defaults, {
+  http_options: {
+      params: {
+          TYPENAME: "amenity:sport_facility",
+      }
+  },
+  asset_category: "Sport Area",
+  attributes: {}
+});
+
+fixmystreet.assets.add(wfs_defaults, {
+  http_options: {
+      params: {
+          TYPENAME: "greenspaces:park_bench",
+      }
+  },
+  asset_category: "Park Furniture (bench)",
+  attributes: {}
+});
+
+fixmystreet.assets.add(wfs_defaults, {
+  http_options: {
+      params: {
+          TYPENAME: "greenspaces:park_bin",
+      }
+  },
+  asset_category: "Park Furniture (bin)",
+  attributes: {}
+});
+
+fixmystreet.assets.add(wfs_defaults, {
+  http_options: {
+      params: {
+          TYPENAME: "greenspaces:park_picnic_bench",
+      }
+  },
+  asset_category: "Park Furniture (picnic bench)",
+  attributes: {}
+});
+
+fixmystreet.assets.add(wfs_defaults, {
+  http_options: {
+      params: {
+          TYPENAME: "transport:bike_hangar_scheme",
+      }
+  },
+  asset_category: "Cycle Hangars",
+  attributes: {}
+});
+
+fixmystreet.assets.add(wfs_defaults, {
+  http_options: {
+      params: {
+          TYPENAME: "greenspaces:park_bench",
+      }
+  },
+  asset_category: "Benches",
+  attributes: {}
+});
+
+
+/** These layers are served directly from Alloy: */
+
+// View all layers with something like:
+// curl https://tilma.staging.mysociety.org/resource-proxy/proxy.php\?https://hackney.assets/ | jq '.results[] | .layer.code, ( .layer.styles[] | { id, name } ) '
+var layers = [
+  {
+    "categories": ["Street Lighting", "Lamposts"],
+    "item_name": "street light",
+    "layer_name": "Street Lights",
+    "styleid": "5d308d57fe2ad8046c67cdb5",
+    "layerid": "layers_streetLightingAssets"
+  },
+  {
+    "categories": ["Illuminated Bollards", "Non-illuminated Bollards"],
+    "item_name": "bollard",
+    "layer_name": "Bollards",
+    "styleid": "5d308d57fe2ad8046c67cdb9",
+    "layerid": "layers_streetLightingAssets"
+  },
+  {
+    "categories": ["Benches"],
+    "item_name": "bench",
+    "layer_name": "Bench",
+    "styleid": "5e8b16f0ca31500f60b3f589",
+    "layerid": "layers_bench_5e8b15f0ca31500f60b3f568"
+  },
+  {
+    "categories": ["Potholes"],
+    "item_name": "road",
+    "layer_name": "Carriageway",
+    "styleid": "5d53d28bfe2ad80fc4573184",
+    "layerid": "layers_carriageway_5d53cc74fe2ad80c3403b77d"
+  },
+  {
+    "categories": ["Road Markings / Lines"],
+    "item_name": "road",
+    "layer_name": "Markings",
+    "styleid": "5d308dd7fe2ad8046c67da33",
+    "layerid": "layers_highwayAssets"
+  },
+  {
+    "categories": ["Pavement"],
+    "item_name": "pavement",
+    "layer_name": "Footways",
+    "styleid": "5d308dd6fe2ad8046c67da2a",
+    "layerid": "layers_highwayAssets"
+  },
+  {
+    "categories": ["Cycle Tracks"],
+    "item_name": "cycle track",
+    "layer_name": "Cycle Tracks",
+    "styleid": "5d308dd6fe2ad8046c67da29",
+    "layerid": "layers_highwayAssets"
+  },
+  {
+    "categories": ["Drains and gutters"],
+    "item_name": "drain",
+    "layer_name": "Gullies",
+    "styleid": "5d308dd6fe2ad8046c67da2e",
+    "layerid": "layers_highwayAssets"
+  },
+  {
+    "categories": ["Verges"],
+    "item_name": "verge",
+    "layer_name": "Verges",
+    "styleid": "5d308dd7fe2ad8046c67da36",
+    "layerid": "layers_highwayAssets"
+  },
+  {
+    "categories": ["Road Hump Fault / Damage"],
+    "item_name": "road hump",
+    "layer_name": "Traffic Calming",
+    "styleid": "5d308dd7fe2ad8046c67da35",
+    "layerid": "layers_highwayAssets"
+  },
+  {
+    "categories": ["Broken or Faulty Barrier Gates"],
+    "item_name": "barrier gate",
+    "layer_name": "Gates",
+    "styleid": "5d308dd6fe2ad8046c67da2c",
+    "layerid": "layers_highwayAssets"
+  },
+  {
+    "categories": ["Belisha Beacon"],
+    "item_name": "beacon",
+    "layer_name": "Belisha Beacon",
+    "styleid": "5d308d57fe2ad8046c67cdb6",
+    "layerid": "layers_streetLightingAssets"
+  },
+  {
+    "categories": ["Loose or Damaged Kerb Stones"],
+    "item_name": "kerb",
+    "layer_name": "Kerbs",
+    "styleid": "5d308dd6fe2ad8046c67da30",
+    "layerid": "layers_highwayAssets"
+  }
+];
+
+var hackney_defaults = $.extend(true, {}, fixmystreet.alloyv2_defaults, {
+  class: OpenLayers.Layer.NCCVectorAsset,
+  protocol_class: OpenLayers.Protocol.AlloyV2,
+  http_options: {
+    base: "https://tilma.staging.mysociety.org/resource-proxy/proxy.php?https://hackney.assets/${layerid}/${x}/${y}/${z}/cluster?styleIds=${styleid}"
+  },
+  non_interactive: false,
+  body: "Hackney Council",
+  attributes: {
+    asset_resource_id: function() {
+      return this.fid;
+    }
+  }
+});
+
+fixmystreet.alloy_add_layers(hackney_defaults, layers);
+
+})();
-- 
cgit v1.2.3


From e8627c718732b2cb325530daf7a5b82998e61512 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 13 May 2020 17:02:49 +0100
Subject: [Hackney] Include TfL assets on map

---
 templates/web/hackney/footer_extra_js.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/web/hackney/footer_extra_js.html b/templates/web/hackney/footer_extra_js.html
index fbd33dd11..61b8dacea 100644
--- a/templates/web/hackney/footer_extra_js.html
+++ b/templates/web/hackney/footer_extra_js.html
@@ -4,4 +4,4 @@ IF bodyclass.match('mappage');
     version('/cobrands/fixmystreet-uk-councils/alloy.js'),
   );
 END %]
-[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 tfl=1 cobrand_js=1 validation=1 %]
-- 
cgit v1.2.3


From aa9d3cce479c7b28ba3f5f09cac0231111aeebf8 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 8 Jun 2020 13:05:40 +0100
Subject: [Hackney] Extend open311_protect flag to entire contact, not just
 name/group

---
 perllib/FixMyStreet/Cobrand/Hackney.pm | 17 +++++++++++++++++
 perllib/Open311/PopulateServiceList.pm |  8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index 76cd3f1dd..f08cd0dd9 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -63,4 +63,21 @@ sub anonymous_account {
     };
 }
 
+sub open311_skip_existing_contact {
+    my ($self, $contact) = @_;
+
+    # For Hackney we want the 'protected' flag to prevent any changes to this
+    # contact at all.
+    return $contact->get_extra_metadata("open311_protect") ? 1 : 0;
+}
+
+sub open311_filter_contacts_for_deletion {
+    my ($self, $contacts) = @_;
+
+    # Don't delete open311 protected contacts when importing
+    return $contacts->search({
+        extra => { -not_like => '%T15:open311_protect,I1:1%' },
+    });
+}
+
 1;
diff --git a/perllib/Open311/PopulateServiceList.pm b/perllib/Open311/PopulateServiceList.pm
index 20fca90b3..a3672770c 100644
--- a/perllib/Open311/PopulateServiceList.pm
+++ b/perllib/Open311/PopulateServiceList.pm
@@ -145,6 +145,8 @@ sub _handle_existing_contact {
     my $service_name = $self->_normalize_service_name;
     my $protected = $contact->get_extra_metadata("open311_protect");
 
+    return if $self->_current_body_cobrand && $self->_current_body_cobrand->call_hook(open311_skip_existing_contact => $contact);
+
     print $self->_current_body->id . " already has a contact for service code " . $self->_current_service->{service_code} . "\n" if $self->verbose >= 2;
 
     if ( $contact->state eq 'deleted' || $service_name ne $contact->category || $self->_current_service->{service_code} ne $contact->email ) {
@@ -370,7 +372,11 @@ sub _delete_contacts_not_in_service_list {
 sub _delete_contacts_not_in_service_list_cobrand_overrides {
     my ( $self, $found_contacts ) = @_;
 
-    return $found_contacts;
+    if ($self->_current_body_cobrand && $self->_current_body_cobrand->can('open311_filter_contacts_for_deletion')) {
+        return $self->_current_body_cobrand->open311_filter_contacts_for_deletion($found_contacts);
+    } else {
+        return $found_contacts;
+    }
 }
 
 1;
-- 
cgit v1.2.3


From c3b4b23b378f6d14881675556571e912d1a52ee0 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 13 Mar 2020 13:07:47 +0000
Subject: Improve category import script

Adds ability for categories to be marked as devolved with their own
send_method, and for the open311_protect flag to be set.
---
 bin/import_categories | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/import_categories b/bin/import_categories
index 744759f1f..23a1089f5 100644
--- a/bin/import_categories
+++ b/bin/import_categories
@@ -46,11 +46,10 @@ if (!$opt->commit) {
 my $config = decode_json(path($ARGV[0])->slurp_utf8);
 
 my $body = FixMyStreet::DB->resultset('Body')->find({ name => $opt->body });
+die "Couldn't find body " . $opt->body unless $body;
 
 $body->contacts->delete_all if $opt->delete;
 
-die "Couldn't find body" unless $body;
-
 my $groups = $config->{groups};
 if ($groups) {
     for my $group (keys %$groups) {
@@ -72,12 +71,14 @@ sub make_categories {
             category => $cat->{category}
         });
         $child_cat->email($cat->{email});
+        $child_cat->send_method($cat->{devolved}) if $cat->{devolved};
         $child_cat->state('confirmed');
         $child_cat->editor($0);
         $child_cat->whenedited(\'current_timestamp');
         $child_cat->note($child_cat->in_storage ? 'Updated by import_categories' : 'Created by import_categories');
         say colored("WARNING", 'red') . " " . $child_cat->category . " already exists" if $child_cat->in_storage and $child_cat->category ne 'Other (TfL)';
         $child_cat->extra(undef) if $child_cat->in_storage;
+        $child_cat->set_extra_metadata(open311_protect => 1) if $cat->{open311_protect};
 
         if ($group) {
             my $groups = $child_cat->groups;
-- 
cgit v1.2.3


From 53b9f82cbb7fe81484b8bbf434f0b0acd925b454 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 11 May 2020 12:43:02 +0100
Subject: [Hackney] Special destination handling.

---
 perllib/FixMyStreet/Cobrand/Default.pm       |  3 +-
 perllib/FixMyStreet/Cobrand/Hackney.pm       | 62 +++++++++++++++++++++++-
 perllib/FixMyStreet/Cobrand/UKCouncils.pm    |  2 +-
 perllib/FixMyStreet/Cobrand/Zurich.pm        |  2 +-
 perllib/FixMyStreet/Queue/Item/Report.pm     |  2 +-
 perllib/Open311/PostServiceRequestUpdates.pm |  2 +-
 t/cobrand/get_body_sender.t                  | 18 ++-----
 t/cobrand/hackney.t                          | 71 ++++++++++++++++++++++++----
 8 files changed, 133 insertions(+), 29 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 73340338b..bd8b7e4b4 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -957,9 +957,10 @@ Get stats to display on the council reports page
 sub get_report_stats { return 0; }
 
 sub get_body_sender {
-    my ( $self, $body, $category ) = @_;
+    my ( $self, $body, $problem ) = @_;
 
     # look up via category
+    my $category = $problem->category;
     my $contact = $body->contacts->search( { category => $category } )->first;
     if ( $body->can_be_devolved && $contact && $contact->send_method ) {
         return { method => $contact->send_method, config => $contact, contact => $contact };
diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index f08cd0dd9..dbf070628 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -3,6 +3,7 @@ use parent 'FixMyStreet::Cobrand::Whitelabel';
 
 use strict;
 use warnings;
+use mySociety::EmailUtil qw(is_valid_email);
 
 sub council_area_id { return 2508; }
 sub council_area { return 'Hackney'; }
@@ -33,7 +34,7 @@ sub open311_config {
 }
 
 sub open311_extra_data {
-    my ($self, $row, $h, $extra) = @_;
+    my ($self, $row, $h, $extra, $contact) = @_;
 
     my $open311_only = [
         { name => 'report_url',
@@ -46,6 +47,13 @@ sub open311_extra_data {
           value => $row->category },
     ];
 
+    # Make sure contact 'email' set correctly for Open311
+    if (my $sent_to = $row->get_extra_metadata('sent_to')) {
+        $row->unset_extra_metadata('sent_to');
+        my $code = $sent_to->{$contact->email};
+        $contact->email($code) if $code;
+    }
+
     return $open311_only;
 }
 
@@ -80,4 +88,56 @@ sub open311_filter_contacts_for_deletion {
     });
 }
 
+sub lookup_site_code_config {
+    my ($self, $type) = @_;
+    my $property_map = {
+        park => "greenspaces:hackney_park",
+        estate => "housing:lbh_estate",
+    };
+    {
+        buffer => 3, # metres
+        url => "https://map.hackney.gov.uk/geoserver/wfs",
+        srsname => "urn:ogc:def:crs:EPSG::27700",
+        typename => $property_map->{$type},
+        property => ( $type eq "park" ? "park_id" : "id" ),
+        accept_feature => sub { 1 },
+        accept_types => { Polygon => 1 },
+        outputformat => "json",
+    }
+}
+
+sub get_body_sender {
+    my ( $self, $body, $problem ) = @_;
+
+    my $contact = $body->contacts->search( { category => $problem->category } )->first;
+
+    my $parts = join '\s*', qw(^ park : (.*?) ; estate : (.*?) ; other : (.*?) $);
+    my $regex = qr/$parts/i;
+    if (my ($park, $estate, $other) = $contact->email =~ $regex) {
+        my $to = $other;
+        if (my $park_id = $self->lookup_site_code($problem, 'park')) {
+            $to = $park;
+        } elsif (my $estate_id = $self->lookup_site_code($problem, 'estate')) {
+            $to = $estate;
+        }
+        $problem->set_extra_metadata(sent_to => { $contact->email => $to });
+        if (is_valid_email($to)) {
+            return { method => 'Email', contact => $contact };
+        }
+    }
+    return $self->SUPER::get_body_sender($body, $problem);
+}
+
+# Translate email address to actual delivery address
+sub munge_sendreport_params {
+    my ($self, $row, $h, $params) = @_;
+
+    my $sent_to = $row->get_extra_metadata('sent_to') or return;
+    $row->unset_extra_metadata('sent_to');
+    for my $recip (@{$params->{To}}) {
+        my ($email, $name) = @$recip;
+        $recip->[0] = $sent_to->{$email} if $sent_to->{$email};
+    }
+}
+
 1;
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 21dd2d455..7456d9ddf 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -392,7 +392,7 @@ sub _fetch_features_url {
         SRSNAME => $cfg->{srsname},
         TYPENAME => $cfg->{typename},
         VERSION => "1.1.0",
-        outputformat => "geojson",
+        outputformat => $cfg->{outputformat} || "geojson",
         $cfg->{filter} ? ( Filter => $cfg->{filter} ) : ( BBOX => $cfg->{bbox} ),
     );
 
diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 3cf678f9c..42932ec41 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -217,7 +217,7 @@ sub allow_photo_display {
 }
 
 sub get_body_sender {
-    my ( $self, $body, $category ) = @_;
+    my ( $self, $body, $problem ) = @_;
     return { method => 'Zurich' };
 }
 
diff --git a/perllib/FixMyStreet/Queue/Item/Report.pm b/perllib/FixMyStreet/Queue/Item/Report.pm
index e38987838..60e9ad3dc 100644
--- a/perllib/FixMyStreet/Queue/Item/Report.pm
+++ b/perllib/FixMyStreet/Queue/Item/Report.pm
@@ -172,7 +172,7 @@ sub _create_reporters {
     my @dear;
     my %reporters = ();
     while (my $body = $bodies->next) {
-        my $sender_info = $self->cobrand->get_body_sender( $body, $row->category );
+        my $sender_info = $self->cobrand_handler->get_body_sender( $body, $row );
         my $sender = "FixMyStreet::SendReport::" . $sender_info->{method};
 
         if ( ! exists $self->senders->{ $sender } ) {
diff --git a/perllib/Open311/PostServiceRequestUpdates.pm b/perllib/Open311/PostServiceRequestUpdates.pm
index d7345ea4d..a31bca8f7 100755
--- a/perllib/Open311/PostServiceRequestUpdates.pm
+++ b/perllib/Open311/PostServiceRequestUpdates.pm
@@ -50,7 +50,7 @@ sub open311_params {
     my $conf = $body;
     if ($comment) {
         my $cobrand_logged = $comment->get_cobrand_logged;
-        my $sender = $cobrand_logged->get_body_sender($body, $comment->problem->category);
+        my $sender = $cobrand_logged->get_body_sender($body, $comment->problem);
         $conf = $sender->{config};
     }
 
diff --git a/t/cobrand/get_body_sender.t b/t/cobrand/get_body_sender.t
index 06ffb42a5..a1e8f2320 100644
--- a/t/cobrand/get_body_sender.t
+++ b/t/cobrand/get_body_sender.t
@@ -6,31 +6,21 @@ use_ok 'FixMyStreet::Cobrand';
 
 my $c = FixMyStreet::Cobrand::FixMyStreet->new();
 
-FixMyStreet::DB->resultset('BodyArea')->search( { body_id => 1000 } )->delete;
-FixMyStreet::DB->resultset('Body')->search( { name => 'Body of a Thousand' } )->delete;
-
 my $body = FixMyStreet::DB->resultset('Body')->find_or_create({
     id => 1000,
     name => 'Body of a Thousand',
 });
-my $body_area = $body->body_areas->find_or_create({ area_id => 1000 });
+
+my $problem = FixMyStreet::DB->resultset('Problem')->new({});
 
 FixMyStreet::override_config {
     MAPIT_TYPES => [ 'LBO' ],
     MAPIT_URL => 'http://mapit.uk/',  # Not actually used as no special casing at present
 }, sub {
-    is_deeply $c->get_body_sender( $body ), { method => 'Email', contact => undef }, 'defaults to email';
-    $body_area->update({ area_id => 2481 }); # Croydon LBO
-    is_deeply $c->get_body_sender( $body ), { method => 'Email', contact => undef }, 'still email if London borough';
+    is_deeply $c->get_body_sender( $body, $problem ), { method => 'Email', contact => undef }, 'defaults to email';
 };
 
 $body->send_method( 'TestMethod' );
-is $c->get_body_sender( $body )->{ method }, 'TestMethod', 'uses send_method in preference to London';
-
-$body_area->update({ area_id => 1000 }); # Nothing
-is $c->get_body_sender( $body )->{ method }, 'TestMethod', 'uses send_method in preference to Email';
-
-$body_area->delete;
-$body->delete;
+is $c->get_body_sender( $body, $problem )->{ method }, 'TestMethod', 'uses send_method in preference to Email';
 
 done_testing();
diff --git a/t/cobrand/hackney.t b/t/cobrand/hackney.t
index 519b1b3b8..82fefc15b 100644
--- a/t/cobrand/hackney.t
+++ b/t/cobrand/hackney.t
@@ -53,16 +53,11 @@ my $contact2 = $mech->create_contact_ok(
     body_id => $hackney->id,
     category => 'Roads',
     email => 'roads@example.org',
-    send_method => 'Triage',
+    send_method => 'Email',
 );
 
 my $admin_user = $mech->create_user_ok('admin-user@example.org', name => 'Admin User', from_body => $hackney);
 
-$admin_user->user_body_permissions->create({
-    body => $hackney,
-    permission_type => 'triage'
-});
-
 my @reports = $mech->create_problems_for_body(1, $hackney->id, 'A Hackney report', {
     confirmed => '2019-10-25 09:00',
     lastupdate => '2019-10-25 09:00',
@@ -129,7 +124,6 @@ subtest "sends branded alert emails" => sub {
         FixMyStreet::Script::Alerts::send();
     };
 
-    $mech->email_count_is(1);
     my $email = $mech->get_email;
     ok $email, "got an email";
     like $mech->get_text_body_from_email($email), qr/Hackney Council/, "emails are branded";
@@ -168,7 +162,6 @@ subtest "sends branded confirmation emails" => sub {
             "submit good details"
         );
 
-        $mech->email_count_is(1);
         my $email = $mech->get_email;
         ok $email, "got an email";
         like $mech->get_text_body_from_email($email), qr/Hackney Council/, "emails are branded";
@@ -179,6 +172,67 @@ subtest "sends branded confirmation emails" => sub {
     };
 };
 
+FixMyStreet::override_config {
+    STAGING_FLAGS => { send_reports => 1 },
+    MAPIT_URL => 'http://mapit.uk/',
+    ALLOWED_COBRANDS => ['hackney', 'fixmystreet'],
+}, sub {
+    subtest "special send handling" => sub {
+        my $cbr = Test::MockModule->new('FixMyStreet::Cobrand::Hackney');
+        my $p = FixMyStreet::DB->resultset("Problem")->search(undef, { order_by => { -desc => 'id' } })->first;
+        $contact2->update({ email => 'park:parks@example;estate:estates@example;other:OTHER', send_method => '' });
+
+        subtest 'in a park' => sub {
+            $cbr->mock('_fetch_features', sub {
+                my ($self, $cfg, $x, $y) = @_;
+                return [{
+                    properties => { park_id => 'park' },
+                    geometry => {
+                        type => 'Polygon',
+                        coordinates => [ [ [ $x-1, $y-1 ], [ $x+1, $y+1 ] ] ],
+                    }
+                }] if $cfg->{typename} eq 'greenspaces:hackney_park';
+            });
+            FixMyStreet::Script::Reports::send();
+            my $email = $mech->get_email;
+            is $email->header('To'), '"Hackney Council" <parks@example>';
+            $mech->clear_emails_ok;
+            $p->discard_changes;
+            $p->update({ whensent => undef });
+        };
+
+        subtest 'in an estate' => sub {
+            $cbr->mock('_fetch_features', sub {
+                my ($self, $cfg, $x, $y) = @_;
+                return [{
+                    properties => { id => 'estate' },
+                    geometry => {
+                        type => 'Polygon',
+                        coordinates => [ [ [ $x-1, $y-1 ], [ $x+1, $y+1 ] ] ],
+                    }
+                }] if $cfg->{typename} eq 'housing:lbh_estate';
+            });
+            FixMyStreet::Script::Reports::send();
+            my $email = $mech->get_email;
+            is $email->header('To'), '"Hackney Council" <estates@example>';
+            $mech->clear_emails_ok;
+            $p->discard_changes;
+            $p->update({ whensent => undef });
+        };
+
+        subtest 'elsewhere' => sub {
+            $cbr->mock('_fetch_features', sub {
+                my ($self, $cfg, $x, $y) = @_;
+                return []; # Not in park or estate
+            });
+            my $test_data = FixMyStreet::Script::Reports::send();
+            my $req = $test_data->{test_req_used};
+            my $c = CGI::Simple->new($req->content);
+            is $c->param('service_code'), 'OTHER';
+        };
+    };
+};
+
 #subtest "sends branded report sent emails" => sub {
     #$mech->clear_emails_ok;
     #FixMyStreet::override_config {
@@ -188,7 +242,6 @@ subtest "sends branded confirmation emails" => sub {
     #}, sub {
         #FixMyStreet::Script::Reports::send();
     #};
-    #$mech->email_count_is(1);
     #my $email = $mech->get_email;
     #ok $email, "got an email";
     #like $mech->get_text_body_from_email($email), qr/Hackney Council/, "emails are branded";
-- 
cgit v1.2.3


From 3b958bc30c5ccb6ea3143c08d1ca65dc0bf4b9bc Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 13 May 2020 16:38:09 +0100
Subject: Rename O::L::C::W::Azure to O::L::C::W::AuthCodeFlow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Turns out there’s nothing strictly Azure-specific about it.
---
 perllib/FixMyStreet/App/Controller/Auth/Social.pm  |  4 +--
 perllib/OIDC/Lite/Client/WebServer/AuthCodeFlow.pm | 42 ++++++++++++++++++++++
 perllib/OIDC/Lite/Client/WebServer/Azure.pm        | 39 --------------------
 3 files changed, 44 insertions(+), 41 deletions(-)
 create mode 100644 perllib/OIDC/Lite/Client/WebServer/AuthCodeFlow.pm
 delete mode 100644 perllib/OIDC/Lite/Client/WebServer/Azure.pm

diff --git a/perllib/FixMyStreet/App/Controller/Auth/Social.pm b/perllib/FixMyStreet/App/Controller/Auth/Social.pm
index 06e67573f..54cf35315 100644
--- a/perllib/FixMyStreet/App/Controller/Auth/Social.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth/Social.pm
@@ -6,7 +6,7 @@ BEGIN { extends 'Catalyst::Controller'; }
 
 use Net::Facebook::Oauth2;
 use Net::Twitter::Lite::WithAPIv1_1;
-use OIDC::Lite::Client::WebServer::Azure;
+use OIDC::Lite::Client::WebServer::AuthCodeFlow;
 use URI::Escape;
 
 use mySociety::AuthToken;
@@ -167,7 +167,7 @@ sub oidc : Private {
 
     my $config = $c->cobrand->feature('oidc_login');
 
-    OIDC::Lite::Client::WebServer::Azure->new(
+    OIDC::Lite::Client::WebServer::AuthCodeFlow->new(
         id               => $config->{client_id},
         secret           => $config->{secret},
         authorize_uri    => $config->{auth_uri},
diff --git a/perllib/OIDC/Lite/Client/WebServer/AuthCodeFlow.pm b/perllib/OIDC/Lite/Client/WebServer/AuthCodeFlow.pm
new file mode 100644
index 000000000..33a9a788f
--- /dev/null
+++ b/perllib/OIDC/Lite/Client/WebServer/AuthCodeFlow.pm
@@ -0,0 +1,42 @@
+package OIDC::Lite::Client::WebServer::AuthCodeFlow;
+
+use strict;
+use warnings;
+use parent 'OIDC::Lite::Client::WebServer';
+
+use OIDC::Lite::Client::IDTokenResponseParser;
+
+=head1 NAME
+
+OIDC::Lite::Client::WebServer::AuthCodeFlow - extension to auth against an
+identity provider using the authorization code flow, such as Azure AD B2C or
+Google OAuth 2.0.
+More info: https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowSteps
+
+OIDC::Lite doesn't appear to support the authorisation code flow to get an
+ID token - only an access token. This flow returns all its claims in the id_token
+(and may not support a UserInfo endpoint e.g. Azure AD B2C), so this extension
+adds support for parsing the id_token when calling get_access_token.
+
+=cut
+
+=head2 new
+
+Overrides response_parser so that get_access_token returns a
+L<OIDC::Lite::Model::IDToken> object.
+
+NB this does not perform any verification of the id_token. It's assumed to be
+safe as it's come directly from the OpenID IdP and not an untrusted user's
+browser.
+
+=cut
+
+sub new {
+    my $self = shift->next::method(@_);
+
+    $self->{response_parser} = OIDC::Lite::Client::IDTokenResponseParser->new;
+
+    return $self;
+}
+
+1;
diff --git a/perllib/OIDC/Lite/Client/WebServer/Azure.pm b/perllib/OIDC/Lite/Client/WebServer/Azure.pm
deleted file mode 100644
index b19dce90e..000000000
--- a/perllib/OIDC/Lite/Client/WebServer/Azure.pm
+++ /dev/null
@@ -1,39 +0,0 @@
-package OIDC::Lite::Client::WebServer::Azure;
-
-use strict;
-use warnings;
-use parent 'OIDC::Lite::Client::WebServer';
-
-use OIDC::Lite::Client::IDTokenResponseParser;
-
-=head1 NAME
-
-OIDC::Lite::Client::WebServer::Azure - extension to auth against Azure AD B2C
-
-OIDC::Lite doesn't appear to support the authorisation code flow to get an
-ID token - only an access token. Azure returns all its claims in the id_token
-and doesn't support a UserInfo endpoint, so this extension adds support for
-parsing the id_token when calling get_access_token.
-
-=cut
-
-=head2 new
-
-Overrides response_parser so that get_access_token returns a
-L<OIDC::Lite::Model::IDToken> object.
-
-NB this does not perform any verification of the id_token. It's assumed to be
-safe as it's come directly from the OpenID IdP and not an untrusted user's
-browser.
-
-=cut
-
-sub new {
-    my $self = shift->next::method(@_);
-
-    $self->{response_parser} = OIDC::Lite::Client::IDTokenResponseParser->new;
-
-    return $self;
-}
-
-1;
-- 
cgit v1.2.3


From c505cbca2576f9e658692d8e1c512f645069985a Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 13 May 2020 16:41:26 +0100
Subject: OIDC scope/token parsing improvements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - Cobrand config can now specify custom scope and other params
   e.g. G Suite supports per-domain customisation and the ‘prompt’ param
   to always ask the user to select the account they want to login with.
 - Token may have an ‘name’ claim instead of needing to concat given_/family_name claims
---
 CHANGELOG.md                                      |  1 +
 perllib/FixMyStreet/App/Controller/Auth/Social.pm | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93292785c..e22d3cc63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
         - Skip accounts without email when sending inactive emails.
         - Include file extensions in Dropzone accepted photo config.
         - Fix photo orientation in modern browsers.
+        - Improve compatibility with G Suite OpenID Connect authentication. #3032
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/FixMyStreet/App/Controller/Auth/Social.pm b/perllib/FixMyStreet/App/Controller/Auth/Social.pm
index 54cf35315..2468cfad2 100644
--- a/perllib/FixMyStreet/App/Controller/Auth/Social.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth/Social.pm
@@ -179,7 +179,9 @@ sub oidc_sign_in : Private {
     my ( $self, $c ) = @_;
 
     $c->detach( '/page_error_403_access_denied', [] ) if FixMyStreet->config('SIGNUPS_DISABLED');
-    $c->detach( '/page_error_400_bad_request', [] ) unless $c->cobrand->feature('oidc_login');
+
+    my $cfg = $c->cobrand->feature('oidc_login');
+    $c->detach( '/page_error_400_bad_request', [] ) unless $cfg;
 
     my $oidc = $c->forward('oidc');
     my $nonce = $self->generate_nonce();
@@ -190,6 +192,15 @@ sub oidc_sign_in : Private {
         extra        => {
             response_mode => 'form_post',
             nonce         => $nonce,
+            # auth_extra_params provides a way to pass custom parameters
+            # to the OIDC endpoint for the intial authentication request.
+            # This allows, for example, a custom scope to be used,
+            # or the `hd` parameter which customises the appearance of
+            # the login form.
+            # This is primarily useful for Google G Suite authentication - see
+            # available parameters here:
+            # https://developers.google.com/identity/protocols/oauth2/openid-connect#authenticationuriparameters
+            %{ $cfg->{auth_extra_params} || {} } ,
         },
     );
 
@@ -201,14 +212,14 @@ sub oidc_sign_in : Private {
 
     # The OIDC endpoint may require a specific URI to be called to log the user
     # out when they log out of FMS.
-    if ( my $redirect_uri = $c->cobrand->feature('oidc_login')->{logout_uri} ) {
+    if ( my $redirect_uri = $cfg->{logout_uri} ) {
         $redirect_uri .= "?post_logout_redirect_uri=";
         $redirect_uri .= URI::Escape::uri_escape( $c->uri_for('/auth/sign_out') );
         $oauth{logout_redirect_uri} = $redirect_uri;
     }
 
     # The OIDC endpoint may provide a specific URI for changing the user's password.
-    if ( my $password_change_uri = $c->cobrand->feature('oidc_login')->{password_change_uri} ) {
+    if ( my $password_change_uri = $cfg->{password_change_uri} ) {
         $oauth{change_password_uri} = $oidc->uri_to_redirect(
             uri          => $password_change_uri,
             redirect_uri => $c->uri_for('/auth/OIDC'),
@@ -295,9 +306,9 @@ sub oidc_callback: Path('/auth/OIDC') : Args(0) {
     $c->detach('/page_error_500_internal_error', ['invalid id_token']) unless $id_token->payload->{nonce} eq $c->session->{oauth}{nonce};
 
     # Some claims need parsing into a friendlier format
-    # XXX check how much of this is Westminster/Azure-specific
-    my $name = join(" ", $id_token->payload->{given_name}, $id_token->payload->{family_name});
+    my $name = $id_token->payload->{name} || join(" ", $id_token->payload->{given_name}, $id_token->payload->{family_name});
     my $email = $id_token->payload->{email};
+
     # WCC Azure provides a single email address as an array for some reason
     my $emails = $id_token->payload->{emails};
     if ($emails && @$emails) {
-- 
cgit v1.2.3


From 7e4ebd6568a836683f5f374ce6f0d9ed97d38c54 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 13 May 2020 16:42:04 +0100
Subject: Include redirect URI when fetching OIDC access token

---
 perllib/FixMyStreet/App/Controller/Auth/Social.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/perllib/FixMyStreet/App/Controller/Auth/Social.pm b/perllib/FixMyStreet/App/Controller/Auth/Social.pm
index 2468cfad2..c9e0381a4 100644
--- a/perllib/FixMyStreet/App/Controller/Auth/Social.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth/Social.pm
@@ -290,6 +290,7 @@ sub oidc_callback: Path('/auth/OIDC') : Args(0) {
     eval {
         $id_token = $oidc->get_access_token(
             code => $c->get_param('code'),
+            redirect_uri => $c->uri_for('/auth/OIDC')
         );
     };
     if ($@) {
-- 
cgit v1.2.3


From 41ed9db574ecb77504992f3836ced7f25fe1768d Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 13 May 2020 16:42:47 +0100
Subject: [Hackney] Enable OIDC social login

---
 perllib/FixMyStreet/Cobrand/Hackney.pm |  6 ++++
 t/Mock/OpenIDConnect.pm                | 48 ++++++++++++++++++++++++++
 t/app/controller/auth_social.t         | 62 +++++++++++++++++++++++++++++-----
 3 files changed, 108 insertions(+), 8 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index dbf070628..b0c815d70 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -63,6 +63,12 @@ sub default_map_zoom { 5 }
 
 sub admin_user_domain { 'hackney.gov.uk' }
 
+sub social_auth_enabled {
+    my $self = shift;
+
+    return $self->feature('oidc_login') ? 1 : 0;
+}
+
 sub anonymous_account {
     my $self = shift;
     return {
diff --git a/t/Mock/OpenIDConnect.pm b/t/Mock/OpenIDConnect.pm
index ba7d03b1d..61a67f329 100644
--- a/t/Mock/OpenIDConnect.pm
+++ b/t/Mock/OpenIDConnect.pm
@@ -27,6 +27,11 @@ sub dispatch_request {
         return [ 200, [ 'Content-Type' => 'text/html' ], [ 'OpenID Connect login page' ] ];
     },
 
+    sub (GET + /oauth2/v2.0/authorize_google + ?*) {
+        my ($self) = @_;
+        return [ 200, [ 'Content-Type' => 'text/html' ], [ 'OpenID Connect login page' ] ];
+    },
+
     sub (GET + /oauth2/v2.0/logout + ?*) {
         my ($self) = @_;
         return [ 200, [ 'Content-Type' => 'text/html' ], [ 'OpenID Connect logout page' ] ];
@@ -72,6 +77,49 @@ sub dispatch_request {
         my $json = $self->json->encode($data);
         return [ 200, [ 'Content-Type' => 'application/json' ], [ $json ] ];
     },
+
+    sub (POST + /oauth2/v2.0/token_google + ?*) {
+        my ($self) = @_;
+        my $header = {
+            typ => "JWT",
+            alg => "RS256",
+            kid => "XXXfakeKEY1234",
+        };
+        my $now = DateTime->now->epoch;
+        my $payload = {
+            exp => $now + 3600,
+            nbf => $now,
+            locale => 'en-GB',
+            ver => "1.0",
+            iss => 'https://accounts.google.com',
+            sub => "my_google_user_id",
+            aud => "example_client_id",
+            iat => $now,
+            auth_time => $now,
+            given_name => "Andy",
+            family_name => "Dwyer",
+            name => "Andy Dwyer",
+            nonce => 'MyAwesomeRandomValue',
+            hd => 'example.org',
+        };
+        $payload->{email} = 'pkg-tappcontrollerauth_socialt-oidc_google@example.org' if $self->returns_email;
+        $payload->{email_verified} = JSON->true if $self->returns_email;
+        my $signature = "dummy";
+        my $id_token = join(".", (
+            encode_base64($self->json->encode($header), ''),
+            encode_base64($self->json->encode($payload), ''),
+            encode_base64($signature, '')
+        ));
+        my $data = {
+            id_token => $id_token,
+            token_type => "Bearer",
+            not_before => $now,
+            id_token_expires_in => 3600,
+            profile_info => encode_base64($self->json->encode({}), ''),
+        };
+        my $json = $self->json->encode($data);
+        return [ 200, [ 'Content-Type' => 'application/json' ], [ $json ] ];
+    },
 }
 
 __PACKAGE__->run_if_script;
diff --git a/t/app/controller/auth_social.t b/t/app/controller/auth_social.t
index 200863029..e56fcda98 100644
--- a/t/app/controller/auth_social.t
+++ b/t/app/controller/auth_social.t
@@ -15,9 +15,12 @@ FixMyStreet::App->log->disable('info');
 END { FixMyStreet::App->log->enable('info'); }
 
 my $body = $mech->create_body_ok(2504, 'Westminster City Council');
+my $body2 = $mech->create_body_ok(2508, 'Hackney Council');
 
 my ($report) = $mech->create_problems_for_body(1, $body->id, 'My Test Report');
 my $test_email = $report->user->email;
+my ($report2) = $mech->create_problems_for_body(1, $body2->id, 'My Test Report');
+my $test_email2 = $report->user->email;
 
 my $contact = $mech->create_contact_ok(
     body_id => $body->id, category => 'Damaged bin', email => 'BIN',
@@ -26,11 +29,21 @@ my $contact = $mech->create_contact_ok(
         { code => 'bin_service', description => 'Service needed', required => 'False' },
     ]
 );
+$mech->create_contact_ok(
+    body_id => $body2->id, category => 'Damaged bin', email => 'BIN',
+    extra => [
+        { code => 'bin_type', description => 'Type of bin', required => 'True' },
+        { code => 'bin_service', description => 'Service needed', required => 'False' },
+    ]
+);
 # Two options, incidentally, so that the template "Only one option, select it"
 # code doesn't kick in and make the tests pass
 my $contact2 = $mech->create_contact_ok(
     body_id => $body->id, category => 'Whatever', email => 'WHATEVER',
 );
+$mech->create_contact_ok(
+    body_id => $body2->id, category => 'Whatever', email => 'WHATEVER',
+);
 
 my $resolver = Test::MockModule->new('Email::Valid');
 my $social = Test::MockModule->new('FixMyStreet::App::Controller::Auth::Social');
@@ -88,6 +101,38 @@ for my $test (
     user_extras => [
         [westminster_account_id => "1c304134-ef12-c128-9212-123908123901"],
     ],
+}, {
+    type => 'oidc',
+    config => {
+        ALLOWED_COBRANDS => 'hackney',
+        MAPIT_URL => 'http://mapit.uk/',
+        COBRAND_FEATURES => {
+            anonymous_account => {
+                hackney => 'test',
+            },
+            oidc_login => {
+                hackney => {
+                    client_id => 'example_client_id',
+                    secret => 'example_secret_key',
+                    auth_uri => 'http://oidc.example.org/oauth2/v2.0/authorize_google',
+                    token_uri => 'http://oidc.example.org/oauth2/v2.0/token_google',
+                    allowed_domains => [ 'example.org' ],
+                }
+            }
+        }
+    },
+    email => $mech->uniquify_email('oidc_google@example.org'),
+    uid => "hackney:example_client_id:my_google_user_id",
+    mock => 't::Mock::OpenIDConnect',
+    mock_hosts => ['oidc.example.org'],
+    host => 'oidc.example.org',
+    error_callback => '/auth/OIDC?error=ERROR',
+    success_callback => '/auth/OIDC?code=response-code&state=login',
+    redirect_pattern => qr{oidc\.example\.org/oauth2/v2\.0/authorize_google},
+    pc => 'E8 1DY',
+    # Need to use a different report that's within Hackney
+    report => $report2,
+    report_email => $test_email2,
 }
 ) {
 
@@ -100,6 +145,7 @@ for my $state ( 'refused', 'no email', 'existing UID', 'okay' ) {
         next if $page eq 'update' && !$test->{update};
 
         subtest "test $test->{type} '$state' login for page '$page'" => sub {
+            my $test_report = $test->{report} || $report;
             # Lots of user changes happening here, make sure we don't confuse
             # Catalyst with a cookie session user that no longer exists
             $mech->log_out_ok;
@@ -115,9 +161,9 @@ for my $state ( 'refused', 'no email', 'existing UID', 'okay' ) {
                 $mech->delete_user($test->{email});
             }
             if ($page eq 'my' && $state eq 'existing UID') {
-                $report->update({ user_id => FixMyStreet::DB->resultset( 'User' )->find( { email => $test->{email} } )->id });
+                $test_report->update({ user_id => FixMyStreet::DB->resultset( 'User' )->find( { email => $test->{email} } )->id });
             } else {
-                $report->update({ user_id => FixMyStreet::DB->resultset( 'User' )->find( { email => $test_email } )->id });
+                $test_report->update({ user_id => FixMyStreet::DB->resultset( 'User' )->find( { email => ($report->{test_email} || $test_email) } )->id });
             }
 
             # Set up a mock to catch (most, see below) requests to the OAuth API
@@ -139,7 +185,7 @@ for my $state ( 'refused', 'no email', 'existing UID', 'okay' ) {
                 $mech->get_ok('/my');
             } elsif ($page eq 'report') {
                 $mech->get_ok('/');
-                $mech->submit_form_ok( { with_fields => { pc => 'SW1A1AA' } }, "submit location" );
+                $mech->submit_form_ok( { with_fields => { pc => $test->{pc} || 'SW1A1AA' } }, "submit location" );
                 $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
                 $mech->submit_form(with_fields => {
                     category => 'Damaged bin',
@@ -150,7 +196,7 @@ for my $state ( 'refused', 'no email', 'existing UID', 'okay' ) {
                     bin_type => 'Salt bin',
                 };
             } else {
-                $mech->get_ok('/report/' . $report->id);
+                $mech->get_ok('/report/' . $test_report->id);
                 $fields = {
                     update => 'Test update',
                 };
@@ -243,17 +289,17 @@ for my $state ( 'refused', 'no email', 'existing UID', 'okay' ) {
                     }
                 }
                 if ($state eq 'existing UID') {
-                    my $report_id = $report->id;
-                    $mech->content_contains( $report->title );
+                    my $report_id = $test_report->id;
+                    $mech->content_contains( $test_report->title );
                     $mech->content_contains( "/report/$report_id" );
                 }
-                if ($test->{type} eq 'oidc') {
+                if ($test->{type} eq 'oidc' && $test->{password_change_pattern}) {
                     ok $mech->find_link( text => 'Change password', url_regex => $test->{password_change_pattern} );
                 }
             }
 
             $mech->get('/auth/sign_out');
-            if ($test->{type} eq 'oidc' && $state ne 'refused' && $state ne 'no email') {
+            if ($test->{type} eq 'oidc' && $test->{logout_redirect_pattern} && $state ne 'refused' && $state ne 'no email') {
                 # XXX the 'no email' situation is skipped because of some confusion
                 # with the hosts/sessions that I've not been able to get to the bottom of.
                 # The code does behave as expected when testing manually, however.
-- 
cgit v1.2.3


From c5b0d088eb76dcf7290dae5d4d2d208f7031d13d Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Tue, 19 May 2020 08:39:42 +0100
Subject: [Hackney] Add staff sign-in link to login forms

---
 templates/web/hackney/auth/general.html     | 88 +++++++++++++++++++++++++++++
 templates/web/hackney/report/form/user.html | 29 ++++++++++
 web/cobrands/hackney/base.scss              |  7 ++-
 3 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 templates/web/hackney/auth/general.html
 create mode 100644 templates/web/hackney/report/form/user.html

diff --git a/templates/web/hackney/auth/general.html b/templates/web/hackney/auth/general.html
new file mode 100644
index 000000000..1a9e4a060
--- /dev/null
+++ b/templates/web/hackney/auth/general.html
@@ -0,0 +1,88 @@
+[% INCLUDE 'header.html', bodyclass='authpage', title = loc('Sign in or create an account') %]
+
+<h1>
+    [% loc('Sign in') %]
+    <small>
+        [% tprintf(loc('or <a href="%s">create an account</a>'), '/auth/create') %]
+    </small>
+</h1>
+
+[% TRY %][% INCLUDE 'auth/_general_top.html' %][% CATCH file %][% END %]
+
+[% IF oauth_need_email %]
+    <p class="form-error">[% loc('We need your email address, please give it below.') %]</p>
+[% END %]
+[% IF oauth_failure %]
+    <p class="form-error">[% loc('Sorry, we could not log you in. Please fill in the form below.') %]</p>
+[% END %]
+
+<form action="/auth" method="post" name="general_auth" class="validate">
+    <fieldset>
+
+        <input type="hidden" name="r" value="[% c.req.params.r | html %]">
+
+        [% loc_username_error = INCLUDE 'auth/_username_error.html' default='email' %]
+
+[% IF c.config.SMS_AUTHENTICATION %]
+    [% SET username_label = loc('Your email or mobile') %]
+[% ELSE %]
+    [% SET username_label = loc('Your email') %]
+[% END %]
+
+        <label class="n" for="username">[% username_label %]</label>
+      [% IF loc_username_error %]
+        <div class="form-error">[% loc_username_error %]</div>
+      [% END %]
+        <input type="text" class="form-control required" id="username" name="username" value="[% username | html %]" autocomplete="username"
+        [%~ IF c.cobrand.moniker != 'borsetshire' %] autofocus[% END %]>
+
+        <div id="form_sign_in">
+          [% IF oauth_need_email %]
+            [% INCLUDE form_sign_in_no %]
+            <input type="hidden" name="oauth_need_email" value="1">
+          [% ELSE %]
+            [% INCLUDE form_sign_in_yes %]
+            [% INCLUDE form_sign_in_no %]
+            [% INCLUDE form_sign_in_hackney_staff %]
+          [% END %]
+        </div>
+    </fieldset>
+</form>
+
+[% INCLUDE 'footer.html' %]
+
+[% BLOCK form_sign_in_yes %]
+    <p class="hidden-nojs js-sign-in-password-hide">
+        <input class="btn btn--primary btn--block js-sign-in-password-btn" type="submit" name="sign_in_by_password" value="[% loc('Sign in with a password') %]">
+    </p>
+    <div class="hidden-js js-sign-in-password">
+        <label for="password_sign_in">[% loc('Your password') %]</label>
+
+        <div class="form-txt-submit-box">
+            <input type="password" name="password_sign_in" class="form-control" id="password_sign_in" value="" autocomplete="current-password">
+            <input class="green-btn" type="submit" name="sign_in_by_password" value="[% loc('Sign in') %]">
+        </div>
+
+        <p>
+            <a href="/auth/forgot">[% loc('Forgotten your password?') %]</a>
+        </p>
+    </div>
+[% END %]
+
+[% BLOCK form_sign_in_no %]
+    <p><input class="fake-link" type="submit" name="sign_in_by_code" value="
+      [%~ IF c.config.SMS_AUTHENTICATION %]
+        [%~ loc('Email me a link or text me a code to sign in') %]
+      [%~ ELSE %]
+        [%~ loc('Email me a link to sign in') %]
+      [%~ END ~%]
+      "></p>
+[% END %]
+
+[% BLOCK form_sign_in_hackney_staff %]
+  [% IF c.cobrand.feature('oidc_login') %]
+      <button name="social_sign_in" id="oidc_sign_in" value="oidc" class="fake-link sso-staff-sign-in">
+          Hackney Staff Sign-in
+      </button>
+  [% END %]
+[% END %]
\ No newline at end of file
diff --git a/templates/web/hackney/report/form/user.html b/templates/web/hackney/report/form/user.html
new file mode 100644
index 000000000..bced8c189
--- /dev/null
+++ b/templates/web/hackney/report/form/user.html
@@ -0,0 +1,29 @@
+<!-- report/form/user.html -->
+<div class="js-new-report-user-hidden form-section-preview form-section-preview--next
+    [%~ ' hidden-nojs' IF c.user_exists OR NOT c.cobrand.social_auth_enabled %]">
+    <h2 class="form-section-heading form-section-heading--private hidden-nojs">
+        [% loc('Next:') %] [% loc('Tell us about you') %]
+    </h2>
+  <button type="button" class="btn btn--block hidden-nojs js-new-report-user-show">[% loc('Continue') %]</button>
+[% IF NOT c.user_exists AND c.cobrand.feature('oidc_login') %]
+  <button name="social_sign_in" id="oidc_sign_in" value="oidc" class="fake-link sso-staff-sign-in">
+      Hackney Staff Sign-in
+  </button>
+[% END %]
+  <div class="js-show-if-anonymous
+    [%~ ' hidden-js' UNLESS type == 'report' AND c.cobrand.allow_anonymous_reports == 'button' %]">
+    <small id="or">[% loc('or') %]</small>
+    <button name="report_anonymously" value="yes" class="btn btn--block js-new-report-submit">[% loc('Report anonymously') %]</button>
+    <small>[% loc('No personal details will be stored, and you will not receive updates about this report.') %]</small>
+  </div>
+</div>
+
+[% IF (c.user_exists OR NOT c.cobrand.social_auth_enabled) AND type == 'report' AND c.cobrand.allow_anonymous_reports == 'button' %]
+<div class="form-section-preview form-section-preview--next hidden-js">
+    <button name="report_anonymously" value="yes" class="btn btn--block">[% loc('Report anonymously') %]</button>
+    <small>[% loc('No personal details will be stored, and you will not receive updates about this report.') %]</small>
+    <small id="or">[% loc('or') %]</small>
+</div>
+[% END %]
+
+<!-- /report/form/user.html -->
diff --git a/web/cobrands/hackney/base.scss b/web/cobrands/hackney/base.scss
index a3e41c5d0..4bc3fc8b1 100644
--- a/web/cobrands/hackney/base.scss
+++ b/web/cobrands/hackney/base.scss
@@ -214,4 +214,9 @@ select.form-error {
 
 .dz-clickable:hover .dz-message u, .dz-drag-hover .dz-message u {
   color: $green;
-}
\ No newline at end of file
+}
+
+.sso-staff-sign-in {
+  font-size: 0.9em;
+  margin: 1em 0;
+}
-- 
cgit v1.2.3


From aad79063d6e01f7596da564b274b3bf78413fdfa Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 1 Jun 2020 13:49:52 +0100
Subject: Add allowed_domains OIDC config to limit logins to specific domains

---
 perllib/FixMyStreet/App/Controller/Auth/Social.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/perllib/FixMyStreet/App/Controller/Auth/Social.pm b/perllib/FixMyStreet/App/Controller/Auth/Social.pm
index c9e0381a4..ce94fe256 100644
--- a/perllib/FixMyStreet/App/Controller/Auth/Social.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth/Social.pm
@@ -306,6 +306,14 @@ sub oidc_callback: Path('/auth/OIDC') : Args(0) {
     # check that the nonce matches what we set in the user session
     $c->detach('/page_error_500_internal_error', ['invalid id_token']) unless $id_token->payload->{nonce} eq $c->session->{oauth}{nonce};
 
+    if (my $domains = $c->cobrand->feature('oidc_login')->{allowed_domains}) {
+        # Check that the hd payload is present in the token and matches the
+        # list of allowed domains from the config
+        my $hd = $id_token->payload->{hd};
+        my %allowed_domains = map { $_ => 1} @$domains;
+        $c->detach('oauth_failure') unless $allowed_domains{$hd};
+    }
+
     # Some claims need parsing into a friendlier format
     my $name = $id_token->payload->{name} || join(" ", $id_token->payload->{given_name}, $id_token->payload->{family_name});
     my $email = $id_token->payload->{email};
-- 
cgit v1.2.3


From 832dd8e367b9c83619981bf9828dea405d15ce02 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Tue, 16 Jun 2020 16:23:03 +0100
Subject: Display contents of lists in report extra data in admin

---
 t/app/controller/admin/report_edit.t       | 20 ++++++++++++++++----
 templates/web/base/admin/reports/edit.html | 15 ++++++++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/t/app/controller/admin/report_edit.t b/t/app/controller/admin/report_edit.t
index 01f091412..f8101ab76 100644
--- a/t/app/controller/admin/report_edit.t
+++ b/t/app/controller/admin/report_edit.t
@@ -686,16 +686,28 @@ subtest "Test display of fields extra data" => sub {
     $mech->get_ok("/admin/report_edit/$report_id");
     $mech->content_contains('Extra data: No');
 
-    $report->push_extra_fields( {
-        name => 'report_url',
-        value => 'http://example.com',
-    });
+    $report->push_extra_fields(
+        {
+            name => 'report_url',
+            value => 'http://example.com',
+        },
+        {
+            name => 'sent_to',
+            value => [ 'onerecipient@example.org' ],
+        },
+        {
+            name => 'sent_too',
+            value => [ 'onemorerecipient@example.org', 'another@example.org' ],
+        },
+    );
     $report->update;
 
     $report->discard_changes;
 
     $mech->get_ok("/admin/report_edit/$report_id");
     $mech->content_contains('report_url</strong>: http://example.com');
+    $mech->content_contains('sent_to</strong>: onerecipient@example.org');
+    $mech->content_contains('sent_too</strong>: onemorerecipient@example.org, another@example.org');
 
     $report->set_extra_fields( {
         description => 'Report URL',
diff --git a/templates/web/base/admin/reports/edit.html b/templates/web/base/admin/reports/edit.html
index d2b866d01..6e7cff4cf 100644
--- a/templates/web/base/admin/reports/edit.html
+++ b/templates/web/base/admin/reports/edit.html
@@ -131,7 +131,20 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
 <li><label class="inline-text" for="category">[% loc('Category:') %]</label>
     [% INCLUDE 'admin/report-category.html' %]
 </li>
-<li>[% loc('Extra data:') %] [% IF extra_fields.size %]<ul>[% FOREACH field IN extra_fields %]<li><strong>[% field.name %]</strong>: [% field.val %]</li>[% END %]</ul>[% ELSE %]No[% END %]</li>
+<li>[% loc('Extra data:') ~%]
+    [%~ IF extra_fields.size ~%]
+        <ul>
+        [%~ FOREACH field IN extra_fields ~%]
+            <li><strong>[%~ field.name ~%]</strong>: [% IF field.val.0.defined ~%]
+                    [%~ field.val.list.join(", ") ~%]
+                [%~ ELSE ~%]
+                    [%~ field.val ~%]
+                [%~ END ~%]
+            </li>
+        [%~ END ~%]
+        </ul>
+    [%~ ELSE %] No[% END ~%]
+</li>
 <li><label class="inline-text" for="anonymous">[% loc('Anonymous:') %]</label>
 <select class="form-control" name="anonymous"  id="anonymous">
 <option [% 'selected ' IF problem.anonymous %]value="1">[% loc('Yes') %]</option>
-- 
cgit v1.2.3


From 6c975151915204674ec27f5e0c95dfa6f1273523 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Tue, 16 Jun 2020 19:46:22 +0100
Subject: Allow cobrands to manipulate OSM query params directly

---
 perllib/FixMyStreet/Geocode/OSM.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/perllib/FixMyStreet/Geocode/OSM.pm b/perllib/FixMyStreet/Geocode/OSM.pm
index 20e653cf6..06162d74c 100644
--- a/perllib/FixMyStreet/Geocode/OSM.pm
+++ b/perllib/FixMyStreet/Geocode/OSM.pm
@@ -45,6 +45,7 @@ sub string {
         if $params->{bounds};
     $query_params{countrycodes} = $params->{country}
         if $params->{country};
+    $c->cobrand->call_hook(geocoder_munge_query_params => \%query_params);
     $url .= join('&', map { "$_=$query_params{$_}" } sort keys %query_params);
 
     $c->stash->{geocoder_url} = $url;
-- 
cgit v1.2.3


From ecdd0473e28ffbc3b877cc90ee13208cb97f28ec Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Tue, 16 Jun 2020 19:47:03 +0100
Subject: [Hackney] Refine geocoder results display

---
 perllib/FixMyStreet/Cobrand/Hackney.pm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index b0c815d70..038d9cff3 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -27,6 +27,27 @@ sub get_geocoder {
     return 'OSM'; # default of Bing gives poor results, let's try overriding.
 }
 
+sub geocoder_munge_query_params {
+    my ($self, $params) = @_;
+
+    $params->{addressdetails} = 1;
+}
+
+sub geocoder_munge_results {
+    my ($self, $result) = @_;
+    if (my $a = $result->{address}) {
+        if ($a->{road} && $a->{suburb} && $a->{postcode}) {
+            $result->{display_name} = "$a->{road}, $a->{suburb}, $a->{postcode}";
+            return;
+        }
+    }
+    $result->{display_name} = '' unless $result->{display_name} =~ /Hackney/;
+    $result->{display_name} =~ s/, United Kingdom$//;
+    $result->{display_name} =~ s/, London, Greater London, England//;
+    $result->{display_name} =~ s/, London Borough of Hackney//;
+}
+
+
 sub open311_config {
     my ($self, $row, $h, $params) = @_;
 
-- 
cgit v1.2.3


From 86ba23a6fdc0a9857f7729366d25a0dc124d9c97 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 17 Jun 2020 12:18:36 +0100
Subject: [Hackney] Query WFS server differently when finding park/estate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For some reason the BBOX query would return results that weren’t
actually intersecting the BBOX causing false positives and misdirected
reports.
This change uses the Intersects query instead which is more
accurate.
---
 perllib/FixMyStreet/Cobrand/Hackney.pm | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index 038d9cff3..ed29471b2 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -115,22 +115,27 @@ sub open311_filter_contacts_for_deletion {
     });
 }
 
-sub lookup_site_code_config {
-    my ($self, $type) = @_;
-    my $property_map = {
+sub problem_is_within_area_type {
+    my ($self, $problem, $type) = @_;
+    my $layer_map = {
         park => "greenspaces:hackney_park",
         estate => "housing:lbh_estate",
     };
-    {
-        buffer => 3, # metres
+    my $layer = $layer_map->{$type};
+    return unless $layer;
+
+    my ($x, $y) = $problem->local_coords;
+
+    my $cfg = {
         url => "https://map.hackney.gov.uk/geoserver/wfs",
         srsname => "urn:ogc:def:crs:EPSG::27700",
-        typename => $property_map->{$type},
-        property => ( $type eq "park" ? "park_id" : "id" ),
-        accept_feature => sub { 1 },
-        accept_types => { Polygon => 1 },
+        typename => $layer,
         outputformat => "json",
-    }
+        filter => "<Filter xmlns:gml=\"http://www.opengis.net/gml\"><Intersects><PropertyName>geom</PropertyName><gml:Point srsName=\"27700\"><gml:coordinates>$x,$y</gml:coordinates></gml:Point></Intersects></Filter>",
+    };
+
+    my $features = $self->_fetch_features($cfg, $x, $y) || [];
+    return scalar @$features ? 1 : 0;
 }
 
 sub get_body_sender {
@@ -142,9 +147,9 @@ sub get_body_sender {
     my $regex = qr/$parts/i;
     if (my ($park, $estate, $other) = $contact->email =~ $regex) {
         my $to = $other;
-        if (my $park_id = $self->lookup_site_code($problem, 'park')) {
+        if ($self->problem_is_within_area_type($problem, 'park')) {
             $to = $park;
-        } elsif (my $estate_id = $self->lookup_site_code($problem, 'estate')) {
+        } elsif ($self->problem_is_within_area_type($problem, 'estate')) {
             $to = $estate;
         }
         $problem->set_extra_metadata(sent_to => { $contact->email => $to });
-- 
cgit v1.2.3


From e96deac6ee76f792bc117ccf8096024f3b817c6c Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 17 Jun 2020 13:44:07 +0100
Subject: [Hackney] Add geocoder override for Teale Street

---
 perllib/FixMyStreet/Cobrand/Hackney.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index ed29471b2..c3af134a9 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -15,9 +15,17 @@ sub disambiguate_location {
     my $self    = shift;
     my $string  = shift;
 
+    my $town = 'Hackney';
+
+    # Teale Street is on the boundary with Tower Hamlets and
+    # shows the 'please use fixmystreet.com' message, but Hackney
+    # do provide services on that road.
+    ($string, $town) = ('E2 9AA', '') if $string =~ /^teale\s+st/i;
+
     return {
         %{ $self->SUPER::disambiguate_location() },
-        town   => 'Hackney',
+        string => $string,
+        town   => $town,
         centre => '51.552267,-0.063316',
         bounds => [ 51.519814, -0.104511, 51.577784, -0.016527 ],
     };
-- 
cgit v1.2.3


From b34ce0e405e10ee9f413a78c9c097351695ac29e Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 2 Jul 2020 17:13:26 +0100
Subject: Allow cobrand to provide custom domain for VERP addresses

---
 CHANGELOG.md                            | 1 +
 perllib/FixMyStreet/Email.pm            | 4 +++-
 perllib/FixMyStreet/Script/Alerts.pm    | 2 +-
 perllib/FixMyStreet/SendReport/Email.pm | 5 +++--
 t/email.t                               | 6 ++++++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e22d3cc63..e77fcfa42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
         - Add option to show front end testing code coverage. #3036
         - Add function to fetch user's country from Gaze.
+        - Add cobrand hook to specify custom domain for VERP emails.
     - Open311 improvements:
         - Use devolved data on update sending.
     - UK:
diff --git a/perllib/FixMyStreet/Email.pm b/perllib/FixMyStreet/Email.pm
index 3d7b48539..0cc6a880c 100644
--- a/perllib/FixMyStreet/Email.pm
+++ b/perllib/FixMyStreet/Email.pm
@@ -79,7 +79,9 @@ sub _render_template {
 }
 
 sub unique_verp_id {
-    sprintf('fms-%s@%s', generate_verp_token(@_), FixMyStreet->config('EMAIL_DOMAIN'));
+    my $parts = shift;
+    my $domain = shift || FixMyStreet->config('EMAIL_DOMAIN');
+    sprintf('fms-%s@%s', generate_verp_token(@$parts), $domain);
 }
 
 sub _unique_id {
diff --git a/perllib/FixMyStreet/Script/Alerts.pm b/perllib/FixMyStreet/Script/Alerts.pm
index d07728092..03373a8cc 100644
--- a/perllib/FixMyStreet/Script/Alerts.pm
+++ b/perllib/FixMyStreet/Script/Alerts.pm
@@ -327,7 +327,7 @@ sub _send_aggregated_alert_email(%) {
     } );
     $data{unsubscribe_url} = $cobrand->base_url( $data{cobrand_data} ) . '/A/' . $token->token;
 
-    my $sender = FixMyStreet::Email::unique_verp_id('alert', $data{alert_id});
+    my $sender = FixMyStreet::Email::unique_verp_id([ 'alert', $data{alert_id} ], $cobrand->call_hook('verp_email_domain'));
     my $result = FixMyStreet::Email::send_cron(
         $data{schema},
         "$data{template}.txt",
diff --git a/perllib/FixMyStreet/SendReport/Email.pm b/perllib/FixMyStreet/SendReport/Email.pm
index 81a25f896..2d5e85f3e 100644
--- a/perllib/FixMyStreet/SendReport/Email.pm
+++ b/perllib/FixMyStreet/SendReport/Email.pm
@@ -53,10 +53,11 @@ sub send_from {
 sub envelope_sender {
     my ($self, $row) = @_;
 
+    my $cobrand = $row->get_cobrand_logged;
     if ($row->user->email && $row->user->email_verified) {
-        return FixMyStreet::Email::unique_verp_id('report', $row->id);
+        return FixMyStreet::Email::unique_verp_id([ 'report', $row->id ], $cobrand->call_hook('verp_email_domain'));
     }
-    return $row->get_cobrand_logged->do_not_reply_email;
+    return $cobrand->do_not_reply_email;
 }
 
 sub send {
diff --git a/t/email.t b/t/email.t
index 7e8e60a8a..ec86af288 100644
--- a/t/email.t
+++ b/t/email.t
@@ -14,4 +14,10 @@ my ($type, $id) = FixMyStreet::Email::check_verp_token($token);
 is $type, "report", 'Correct type from token';
 is $id, 123, 'Correct ID from token';
 
+my $verpid = FixMyStreet::Email::unique_verp_id([ "report", 123 ]);
+is $verpid, 'fms-report-123-8fb274c6@example.org', 'VERP id okay';
+
+$verpid = FixMyStreet::Email::unique_verp_id([ "report", 123 ], "example.net");
+is $verpid, 'fms-report-123-8fb274c6@example.net', 'VERP id okay with custom domain';
+
 done_testing();
-- 
cgit v1.2.3


From f4b5a6263b1529003a42787b404952ab28aefeba Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 2 Jul 2020 17:13:50 +0100
Subject: [Hackney] Use cobrand feature config for email envelope domain

---
 perllib/FixMyStreet/Cobrand/Hackney.pm |  4 ++++
 t/app/controller/auth_social.t         |  8 +++++++-
 t/cobrand/hackney.t                    | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index c3af134a9..234573e3e 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -31,6 +31,10 @@ sub disambiguate_location {
     };
 }
 
+sub do_not_reply_email { shift->feature('do_not_reply_email') }
+
+sub verp_email_domain { shift->feature('verp_email_domain') }
+
 sub get_geocoder {
     return 'OSM'; # default of Bing gives poor results, let's try overriding.
 }
diff --git a/t/app/controller/auth_social.t b/t/app/controller/auth_social.t
index e56fcda98..1f6889dcc 100644
--- a/t/app/controller/auth_social.t
+++ b/t/app/controller/auth_social.t
@@ -118,7 +118,13 @@ for my $test (
                     token_uri => 'http://oidc.example.org/oauth2/v2.0/token_google',
                     allowed_domains => [ 'example.org' ],
                 }
-            }
+            },
+            do_not_reply_email => {
+                hackney => 'fms-hackney-DO-NOT-REPLY@hackney-example.com',
+            },
+            verp_email_domain => {
+                hackney => 'hackney-example.com',
+            },
         }
     },
     email => $mech->uniquify_email('oidc_google@example.org'),
diff --git a/t/cobrand/hackney.t b/t/cobrand/hackney.t
index 82fefc15b..b5a629e33 100644
--- a/t/cobrand/hackney.t
+++ b/t/cobrand/hackney.t
@@ -85,6 +85,14 @@ subtest "check moderation label uses correct name" => sub {
     FixMyStreet::override_config {
         MAPIT_URL => 'http://mapit.uk/',
         ALLOWED_COBRANDS => ['hackney'],
+        COBRAND_FEATURES => {
+            do_not_reply_email => {
+                hackney => 'fms-hackney-DO-NOT-REPLY@hackney-example.com',
+            },
+            verp_email_domain => {
+                hackney => 'hackney-example.com',
+            },
+        },
     }, sub {
         $mech->log_out_ok;
         $mech->log_in_ok( $hackney_user->email );
@@ -139,6 +147,14 @@ subtest "sends branded confirmation emails" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ 'hackney' ],
         MAPIT_URL => 'http://mapit.uk/',
+        COBRAND_FEATURES => {
+            do_not_reply_email => {
+                hackney => 'fms-hackney-DO-NOT-REPLY@hackney-example.com',
+            },
+            verp_email_domain => {
+                hackney => 'hackney-example.com',
+            },
+        },
     }, sub {
         $mech->submit_form_ok( { with_fields => { pc => 'E8 1DY', } },
             "submit location" );
-- 
cgit v1.2.3


From 64335826ec42217e1a9a98c0dbc1f13ec034ddb4 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 3 Jul 2020 14:24:18 +0100
Subject: [Hackney] Add Google Analytics

---
 templates/web/hackney/tracking_code.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/templates/web/hackney/tracking_code.html b/templates/web/hackney/tracking_code.html
index b01a0178c..ac9a5bcf4 100644
--- a/templates/web/hackney/tracking_code.html
+++ b/templates/web/hackney/tracking_code.html
@@ -1 +1,11 @@
-[%# awaiting analytics information from Hackney %]
+[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %]
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-171536255-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-171536255-1');
+</script>
+[% END %]
-- 
cgit v1.2.3


From 1e8702dbb972517200b4b1006bbb0440429c84a9 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 3 Jul 2020 22:11:03 +0100
Subject: [Bristol] Ensure categories edited via the admin are visible on
 cobrand

---
 perllib/FixMyStreet/Cobrand/Bristol.pm | 5 ++++-
 t/cobrand/bristol.t                    | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bristol.pm b/perllib/FixMyStreet/Cobrand/Bristol.pm
index 7e85a3315..5e70c9456 100644
--- a/perllib/FixMyStreet/Cobrand/Bristol.pm
+++ b/perllib/FixMyStreet/Cobrand/Bristol.pm
@@ -52,7 +52,10 @@ sub categories_restriction {
     # Email categories with a devolved send_method, so can identify Open311
     # categories as those which have a blank send_method.
     # Also Highways England categories have a blank send_method.
-    return $rs->search( { 'me.send_method' => undef } );
+    return $rs->search( { -or => [
+        'me.send_method' => undef, # Open311 categories
+        'me.send_method' => '', # Open311 categories that have been edited in the admin
+    ] } );
 }
 
 sub open311_config {
diff --git a/t/cobrand/bristol.t b/t/cobrand/bristol.t
index d4770b6ee..eacb65ce9 100644
--- a/t/cobrand/bristol.t
+++ b/t/cobrand/bristol.t
@@ -14,6 +14,12 @@ my $open311_contact = $mech->create_contact_ok(
     category => 'Street Lighting',
     email => 'LIGHT',
 );
+my $open311_edited_contact = $mech->create_contact_ok(
+    body_id => $body->id,
+    category => 'Flooding',
+    email => 'FLOOD',
+    send_method => '',
+);
 my $email_contact = $mech->create_contact_ok(
     body_id => $body->id,
     category => 'Potholes',
@@ -38,6 +44,7 @@ subtest 'Only Open311 categories are shown on Bristol cobrand', sub {
     }, sub {
         $mech->get_ok("/report/new/ajax?latitude=51.494885&longitude=-2.602237");
         $mech->content_contains($open311_contact->category);
+        $mech->content_contains($open311_edited_contact->category);
         $mech->content_lacks($email_contact->category);
     };
 };
@@ -49,6 +56,7 @@ subtest 'All categories are shown on FMS cobrand', sub {
     }, sub {
         $mech->get_ok("/report/new/ajax?latitude=51.494885&longitude=-2.602237");
         $mech->content_contains($open311_contact->category);
+        $mech->content_contains($open311_edited_contact->category);
         $mech->content_contains($email_contact->category);
     };
 };
-- 
cgit v1.2.3


From 7bff609a74c934c2d0a1a2ef05f9b72973c73c33 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 2 Jul 2020 17:48:15 +0100
Subject: [Buckinghamshire] Default unknown types to street light.

---
 web/cobrands/buckinghamshire/assets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js
index 7c8995e41..3130c7fa7 100644
--- a/web/cobrands/buckinghamshire/assets.js
+++ b/web/cobrands/buckinghamshire/assets.js
@@ -63,7 +63,7 @@ var labeled_defaults = $.extend(true, {}, defaults, {
     stylemap: streetlight_stylemap,
     construct_asset_name: function(id) {
         var code = id.replace(/[O0-9]+[A-Z]*/g, '');
-        return {id: id, name: streetlight_code_to_type[code]};
+        return {id: id, name: streetlight_code_to_type[code] || 'street light'};
     },
     actions: {
         asset_found: fixmystreet.assets.named_select_action_found,
-- 
cgit v1.2.3


From d8245e7e9d54c538b674e44d5d5d8cfd796d5676 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 2 Jul 2020 17:49:17 +0100
Subject: Fix duplicate message after dismissing suggestions

If we create one category_meta_message for each category, removing when
not relevant, then duplicat suggestion showing leads to duplicate
messages because the layer is still relevant, just not visible, and so
the old layer message is not removed. Instead, repurpose the ID of any
existing category_meta_message, so there is only ever one in existence.
---
 CHANGELOG.md                       | 1 +
 web/cobrands/fixmystreet/assets.js | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e77fcfa42..e25f0db0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
         - Include file extensions in Dropzone accepted photo config.
         - Fix photo orientation in modern browsers.
         - Improve compatibility with G Suite OpenID Connect authentication. #3032
+        - Fix duplicate asset message after dismissing duplicate suggestions.
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index ffa342e5f..56055ec52 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -419,10 +419,10 @@ function check_zoom_message_visibility() {
             category = $("select#" + select).val() || '',
             prefix = category.replace(/[^a-z]/gi, ''),
             id = "category_meta_message_" + prefix,
-            $p = $('#' + id),
+            $p = $('.category_meta_message'),
             message;
         if ($p.length === 0) {
-            $p = $("<p>").prop("id", id).prop('class', 'category_meta_message');
+            $p = $("<p>").prop('class', 'category_meta_message');
             if ($('html').hasClass('mobile')) {
                 $p.click(function() {
                     $("#mob_ok").trigger('click');
@@ -430,6 +430,7 @@ function check_zoom_message_visibility() {
             }
             $p.prependTo('#js-post-category-messages');
         }
+        $p.prop('id', id);
 
         if (this.getVisibility() && this.inRange) {
             message = get_asset_pick_message.call(this);
@@ -453,6 +454,9 @@ function get_asset_pick_message() {
     return message;
 }
 
+/* This doesn't just use the class because e.g. an unselect event
+ * can fire after a category change event, and that would then
+ * update the new message using the text of the unselected layer. */
 function update_message_display(message) {
     if (this.fixmystreet.asset_group) {
         _update_message(message, this.fixmystreet.asset_group);
-- 
cgit v1.2.3


From c7dbb65e2d01e37f276af3db0372123366b3a1a1 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 22 Jun 2020 17:20:10 +0100
Subject: Rewrite open311-update-reports to share code.

Make GetUpdates and GetServiceRequestUpdates share a common base;
spot all visible states.
---
 CHANGELOG.md                                |   1 +
 bin/open311-update-reports                  |  27 +--
 perllib/FixMyStreet/DB/Result/Problem.pm    |  81 --------
 perllib/Open311.pm                          |   4 +-
 perllib/Open311/GetServiceRequestUpdates.pm | 280 +--------------------------
 perllib/Open311/GetServiceRequests.pm       |   3 +-
 perllib/Open311/GetUpdates.pm               |  76 +++-----
 perllib/Open311/UpdatesBase.pm              | 281 ++++++++++++++++++++++++++++
 t/app/model/problem.t                       |  65 +++----
 t/open311/getupdates.t                      |  31 ++-
 10 files changed, 384 insertions(+), 465 deletions(-)
 create mode 100644 perllib/Open311/UpdatesBase.pm

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e77fcfa42..b5e42de4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
         - Add cobrand hook to specify custom domain for VERP emails.
     - Open311 improvements:
         - Use devolved data on update sending.
+        - Rewrite open311-update-reports to share code and improve functionality.
     - UK:
         - Add option for recaptcha. #3050
 
diff --git a/bin/open311-update-reports b/bin/open311-update-reports
index 2d384b813..b9b4d594d 100755
--- a/bin/open311-update-reports
+++ b/bin/open311-update-reports
@@ -8,6 +8,7 @@
 
 use strict;
 use warnings;
+use v5.14;
 
 BEGIN {
     use File::Basename qw(dirname);
@@ -16,21 +17,21 @@ BEGIN {
     require "$d/../setenv.pl";
 }
 
+use Getopt::Long::Descriptive;
 use Open311::GetUpdates;
-use FixMyStreet;
-use FixMyStreet::DB;
 
-# FIXME - make this configurable and/or better
-my $system_user = FixMyStreet::DB->resultset('User')->find_or_create(
-    {
-        email => FixMyStreet->config('CONTACT_EMAIL'),
-        name => 'System User',
-    }
+my ($opts, $usage) = describe_options(
+    '%c %o',
+    ['body|b:s', 'body name to only fetch this body' ],
+    ['verbose|v', 'more verbose output'],
+    ['help|h', "print usage message and exit" ],
 );
+$usage->die if $opts->help;
 
-my $body_list = FixMyStreet::DB->resultset('Body');
+my %params = (
+    verbose => $opts->verbose,
+    body => $opts->body,
+);
 
-my $update = Open311::GetUpdates->new(
-    body_list => $body_list,
-    system_user  => $system_user
-)->get_updates;
+my $updates = Open311::GetUpdates->new(%params);
+$updates->fetch;
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 42983c9ad..0653de32b 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -838,87 +838,6 @@ sub local_coords {
     }
 }
 
-=head2 update_from_open311_service_request
-
-    $p->update_from_open311_service_request( $request, $body, $system_user );
-
-Updates the problem based on information in the passed in open311 request
-(standard, not the extension that uses GetServiceRequestUpdates) . If the
-request has an older update time than the problem's lastupdate time then
-nothing happens.
-
-Otherwise a comment will be created if there is status update text in the
-open311 request. If the open311 request has a state of closed then the problem
-will be marked as fixed.
-
-NB: a comment will always be created if the problem is being marked as fixed.
-
-Fixed problems will not be re-opened by this method.
-
-=cut
-
-sub update_from_open311_service_request {
-    my ( $self, $request, $body, $system_user ) = @_;
-
-    my ( $updated, $status_notes );
-
-    if ( ! ref $request->{updated_datetime} ) {
-        $updated = $request->{updated_datetime};
-    }
-
-    if ( ! ref $request->{status_notes} ) {
-        $status_notes = $request->{status_notes};
-    }
-
-    my $update = $self->new_related(comments => {
-        state => 'confirmed',
-        created => $updated || \'current_timestamp',
-        confirmed => \'current_timestamp',
-        text => $status_notes,
-        mark_open => 0,
-        mark_fixed => 0,
-        user => $system_user,
-        anonymous => 0,
-        name => $body->name,
-    });
-
-    my $w3c = DateTime::Format::W3CDTF->new;
-    my $req_time = $w3c->parse_datetime( $request->{updated_datetime} );
-
-    # set a timezone here as the $req_time will have one and if we don't
-    # use a timezone then the date comparisons are invalid.
-    # of course if local timezone is not the one that went into the data
-    # base then we're also in trouble
-    my $lastupdate = $self->lastupdate;
-    $lastupdate->set_time_zone( FixMyStreet->local_time_zone );
-
-    # update from open311 is older so skip
-    if ( $req_time < $lastupdate ) {
-        return 0;
-    }
-
-    if ( $request->{status} eq 'closed' ) {
-        if ( $self->state ne 'fixed' ) {
-            $self->state('fixed');
-            $update->mark_fixed(1);
-
-            if ( !$status_notes ) {
-                # FIXME - better text here
-                $status_notes = _('Closed by council');
-            }
-        }
-    }
-
-    if ( $status_notes ) {
-        $update->text( $status_notes );
-        $self->lastupdate( $req_time );
-        $self->update;
-        $update->insert;
-    }
-
-    return 1;
-}
-
 sub update_send_failed {
     my $self = shift;
     my $msg  = shift;
diff --git a/perllib/Open311.pm b/perllib/Open311.pm
index 00e4bae9b..41cd0f1e0 100644
--- a/perllib/Open311.pm
+++ b/perllib/Open311.pm
@@ -14,6 +14,7 @@ use FixMyStreet::Cobrand;
 use FixMyStreet::DB;
 use Utils;
 use Path::Tiny 'path';
+use FixMyStreet::App::Model::PhotoSet;
 
 has jurisdiction => ( is => 'ro', isa => Str );;
 has api_key => ( is => 'ro', isa => Str );
@@ -277,7 +278,8 @@ sub get_service_requests {
     };
 
     my $service_request_xml = $self->_get( $self->endpoints->{requests}, $params || undef );
-    return $self->_get_xml_object( $service_request_xml );
+    my $requests = $self->_get_xml_object( $service_request_xml );
+    return $requests->{request};
 }
 
 sub get_service_request_id_from_token {
diff --git a/perllib/Open311/GetServiceRequestUpdates.pm b/perllib/Open311/GetServiceRequestUpdates.pm
index 9fa81ac9e..b4f3f4430 100644
--- a/perllib/Open311/GetServiceRequestUpdates.pm
+++ b/perllib/Open311/GetServiceRequestUpdates.pm
@@ -1,92 +1,17 @@
 package Open311::GetServiceRequestUpdates;
 
 use Moo;
-use Open311;
-use Parallel::ForkManager;
-use FixMyStreet::DB;
-use FixMyStreet::App::Model::PhotoSet;
+extends 'Open311::UpdatesBase';
+
 use DateTime::Format::W3CDTF;
 
-has system_user => ( is => 'rw' );
+has '+send_comments_flag' => ( default => 1 );
 has start_date => ( is => 'ro', default => sub { undef } );
 has end_date => ( is => 'ro', default => sub { undef } );
-has body => ( is => 'ro', default => sub { undef } );
-has suppress_alerts => ( is => 'rw', default => 0 );
-has verbose => ( is => 'ro', default => 0 );
-has schema => ( is =>'ro', lazy => 1, default => sub { FixMyStreet::DB->schema->connect } );
-has blank_updates_permitted => ( is => 'rw', default => 0 );
-
-has current_body => ( is => 'rw' );
-has current_open311 => ( is => 'rw' );
 
 Readonly::Scalar my $AREA_ID_BROMLEY     => 2482;
 Readonly::Scalar my $AREA_ID_OXFORDSHIRE => 2237;
 
-sub fetch {
-    my ($self, $open311) = @_;
-
-    my $bodies = $self->schema->resultset('Body')->search(
-        {
-            send_method     => 'Open311',
-            send_comments   => 1,
-            comment_user_id => { '!=', undef },
-            endpoint        => { '!=', '' },
-        }
-    );
-
-    if ( $self->body ) {
-        $bodies = $bodies->search( { name => $self->body } );
-    }
-
-    my $procs_min = FixMyStreet->config('FETCH_COMMENTS_PROCESSES_MIN') || 0;
-    my $procs_max = FixMyStreet->config('FETCH_COMMENTS_PROCESSES_MAX');
-    my $procs_timeout = FixMyStreet->config('FETCH_COMMENTS_PROCESS_TIMEOUT');
-
-    my $pm = Parallel::ForkManager->new(FixMyStreet->test_mode ? 0 : $procs_min);
-
-    if ($procs_max && $procs_timeout) {
-        my %workers;
-        $pm->run_on_wait(sub {
-            while (my ($pid, $started_at) = each %workers) {
-                next unless time() - $started_at > $procs_timeout;
-                next if $pm->max_procs == $procs_max;
-                $pm->set_max_procs($pm->max_procs + 1);
-                delete $workers{$pid}; # Only want to increase once per long-running thing
-            }
-        }, 1);
-        $pm->run_on_start(sub { my $pid = shift; $workers{$pid} = time(); });
-        $pm->run_on_finish(sub { my $pid = shift; delete $workers{$pid}; });
-    }
-
-    while ( my $body = $bodies->next ) {
-        $pm->start and next;
-
-        $self->current_body( $body );
-
-        my %open311_conf = (
-            endpoint => $body->endpoint,
-            api_key => $body->api_key,
-            jurisdiction => $body->jurisdiction,
-            extended_statuses => $body->send_extended_statuses,
-        );
-
-        my $cobrand = $body->get_cobrand_handler;
-        $cobrand->call_hook(open311_config_updates => \%open311_conf)
-            if $cobrand;
-
-        $self->current_open311( $open311 || Open311->new(%open311_conf) );
-
-        $self->suppress_alerts( $body->suppress_alerts );
-        $self->blank_updates_permitted( $body->blank_updates_permitted );
-        $self->system_user( $body->comment_user );
-        $self->process_body();
-
-        $pm->finish;
-    }
-
-    $pm->wait_all_children;
-}
-
 sub parse_dates {
     my $self = shift;
     my $body = $self->current_body;
@@ -141,201 +66,12 @@ sub process_body {
     return 1;
 }
 
-sub check_date {
-    my ($self, $request, @args) = @_;
-
-    my $comment_time = eval {
-        DateTime::Format::W3CDTF->parse_datetime( $request->{updated_datetime} || "" )
-            ->set_time_zone(FixMyStreet->local_time_zone);
-    };
-    return if $@;
-    my $updated = DateTime::Format::W3CDTF->format_datetime($comment_time->clone->set_time_zone('UTC'));
-    return if @args && ($updated lt $args[0] || $updated gt $args[1]);
-    $request->{comment_time} = $comment_time;
-    return 1;
-}
-
-sub find_problem {
-    my ($self, $request, @args) = @_;
-
-    $self->check_date($request, @args) or return;
-
-    my $body = $self->current_body;
-    my $request_id = $request->{service_request_id};
-
-    # If there's no request id then we can't work out
-    # what problem it belongs to so just skip
-    return unless $request_id || $request->{fixmystreet_id};
-
-    my $problem;
-    my $criteria = {
-        external_id => $request_id,
-    };
-
-    # in some cases we only have the FMS id and not the request id so use that
-    if ( $request->{fixmystreet_id} ) {
-        unless ( $request->{fixmystreet_id} =~ /^\d+$/ ) {
-            warn "skipping bad fixmystreet id in updates for " . $body->name . ": [" . $request->{fixmystreet_id} . "], external id is $request_id\n";
-            return;
-        }
-
-        $criteria = {
-            id => $request->{fixmystreet_id},
-        };
-    }
-
-    $problem = $self->schema->resultset('Problem')->to_body($body)->search( $criteria );
+sub _find_problem {
+    my ($self, $criteria) = @_;
+    my $problem = $self->schema->resultset('Problem')
+        ->to_body($self->current_body)
+        ->search( $criteria );
     return $problem->first;
 }
 
-sub process_update {
-    my ($self, $request, $p) = @_;
-    my $open311 = $self->current_open311;
-    my $body = $self->current_body;
-
-    my $state = $open311->map_state( $request->{status} );
-    my $old_state = $p->state;
-    my $external_status_code = $request->{external_status_code} || '';
-    my $customer_reference = $request->{customer_reference} || '';
-    my $old_external_status_code = $p->get_extra_metadata('external_status_code') || '';
-    my $comment = $self->schema->resultset('Comment')->new(
-        {
-            problem => $p,
-            user => $self->system_user,
-            external_id => $request->{update_id},
-            text => $self->comment_text_for_request(
-                $request, $p, $state, $old_state,
-                $external_status_code, $old_external_status_code
-            ),
-            mark_fixed => 0,
-            mark_open => 0,
-            anonymous => 0,
-            name => $self->system_user->name,
-            confirmed => $request->{comment_time},
-            created => $request->{comment_time},
-            state => 'confirmed',
-        }
-    );
-
-    # Some Open311 services, e.g. Confirm via open311-adapter, provide
-    # a more fine-grained status code that we use within FMS for
-    # response templates.
-    if ( $external_status_code ) {
-        $comment->set_extra_metadata(external_status_code => $external_status_code);
-        $p->set_extra_metadata(external_status_code => $external_status_code);
-    } else {
-        $p->set_extra_metadata(external_status_code => '');
-    }
-
-    # if the customer reference to display in the report metadata is
-    # not the same as the external_id
-    if ( $customer_reference ) {
-        $p->set_extra_metadata( customer_reference => $customer_reference );
-    }
-
-    $open311->add_media($request->{media_url}, $comment)
-        if $request->{media_url};
-
-    # don't update state unless it's an allowed state
-    if ( FixMyStreet::DB::Result::Problem->visible_states()->{$state} &&
-        # For Oxfordshire, don't allow changes back to Open from other open states
-        !( $body->areas->{$AREA_ID_OXFORDSHIRE} && $state eq 'confirmed' && $p->is_open ) &&
-        # Don't let it change between the (same in the front end) fixed states
-        !( $p->is_fixed && FixMyStreet::DB::Result::Problem->fixed_states()->{$state} ) ) {
-
-        $comment->problem_state($state);
-
-        # we only want to update the problem state if that makes sense. We never want to unhide a problem.
-        # If the update is older than the last update then we also do not want to update the state. This
-        # is largely to avoid the situation where we miss some updates, make more updates and then catch
-        # the updates when we fetch the last 24 hours of updates. The exception to this is the first
-        # comment. This is to catch automated updates which happen faster than we get the external_id
-        # back from the endpoint and hence have an created time before the lastupdate.
-        if ( $p->is_visible && $p->state ne $state &&
-            ( $comment->created >= $p->lastupdate || $p->comments->count == 0 ) ) {
-            $p->state($state);
-        }
-    }
-
-    # If nothing to show (no text, photo, or state change), don't show this update
-    $comment->state('hidden') unless $comment->text || $comment->photo
-        || ($comment->problem_state && $state ne $old_state);
-
-    my $cobrand = $body->get_cobrand_handler;
-    $cobrand->call_hook(open311_get_update_munging => $comment)
-        if $cobrand;
-
-    # As comment->created has been looked at above, its time zone has been shifted
-    # to TIME_ZONE (if set). We therefore need to set it back to local before
-    # insertion. We also then need a clone, otherwise the setting of lastupdate
-    # will *also* reshift comment->created's time zone to TIME_ZONE.
-    my $created = $comment->created->set_time_zone(FixMyStreet->local_time_zone);
-    $p->lastupdate($created->clone);
-    $p->update;
-    $comment->insert();
-
-    if ( $self->suppress_alerts ) {
-        my @alerts = $self->schema->resultset('Alert')->search( {
-            alert_type => 'new_updates',
-            parameter  => $p->id,
-            confirmed  => 1,
-            user_id    => $p->user->id,
-        } );
-
-        for my $alert (@alerts) {
-            my $alerts_sent = $self->schema->resultset('AlertSent')->find_or_create( {
-                alert_id  => $alert->id,
-                parameter => $comment->id,
-            } );
-        }
-    }
-
-    return $comment;
-}
-
-sub comment_text_for_request {
-    my ($self, $request, $problem, $state, $old_state,
-        $ext_code, $old_ext_code) = @_;
-
-    # Response templates are only triggered if the state/external status has changed.
-    # And treat any fixed state as fixed.
-    my $state_changed = $state ne $old_state
-        && !( $problem->is_fixed && FixMyStreet::DB::Result::Problem->fixed_states()->{$state} );
-    my $ext_code_changed = $ext_code ne $old_ext_code;
-    my $template;
-    if ($state_changed || $ext_code_changed) {
-        my $order;
-        my $state_params = {
-            'me.state' => $state
-        };
-        if ($ext_code) {
-            $state_params->{'me.external_status_code'} = $ext_code;
-            # make sure that empty string/nulls come last.
-            $order = { order_by => \"me.external_status_code DESC NULLS LAST" };
-        };
-
-        if (my $t = $problem->response_templates->search({
-            auto_response => 1,
-            -or => $state_params,
-        }, $order )->first) {
-            $template = $t->text;
-        }
-    }
-
-    my $desc = $request->{description} || '';
-    if ($desc && (!$template || $template !~ /\{\{description}}/)) {
-        return $desc;
-    }
-
-    if ($template) {
-        $template =~ s/\{\{description}}/$desc/;
-        return $template;
-    }
-
-    return "" if $self->blank_updates_permitted;
-
-    print STDERR "Couldn't determine update text for $request->{update_id} (report " . $problem->id . ")\n";
-    return "";
-}
-
 1;
diff --git a/perllib/Open311/GetServiceRequests.pm b/perllib/Open311/GetServiceRequests.pm
index e5fd6438e..2545f6f29 100644
--- a/perllib/Open311/GetServiceRequests.pm
+++ b/perllib/Open311/GetServiceRequests.pm
@@ -4,7 +4,6 @@ use Moo;
 use Open311;
 use FixMyStreet::DB;
 use FixMyStreet::MapIt;
-use FixMyStreet::App::Model::PhotoSet;
 use DateTime::Format::W3CDTF;
 
 has system_user => ( is => 'rw' );
@@ -85,7 +84,7 @@ sub create_problems {
         ->active
         ->search( { body_id => $body->id } );
 
-    for my $request (@{$requests->{request}}) {
+    for my $request (@$requests) {
         # no point importing if we can't put it on the map
         unless ($request->{service_request_id} && $request->{lat} && $request->{long}) {
             warn "Not creating request '$request->{description}' for @{[$body->name]} as missing one of id, lat or long"
diff --git a/perllib/Open311/GetUpdates.pm b/perllib/Open311/GetUpdates.pm
index f62acf4a8..352f2f218 100644
--- a/perllib/Open311/GetUpdates.pm
+++ b/perllib/Open311/GetUpdates.pm
@@ -1,67 +1,53 @@
 package Open311::GetUpdates;
 
 use Moo;
-use Open311;
-use FixMyStreet::Cobrand;
-
-has body_list => ( is => 'ro' );
-has system_user => ( is => 'ro' );
+extends 'Open311::UpdatesBase';
 
-sub get_updates {
-    my $self = shift;
+use Open311;
 
-    while ( my $body = $self->body_list->next ) {
-        my $open311 = Open311->new(
-            endpoint     => $body->endpoint,
-            jurisdiction => $body->jurisdiction,
-            api_key      => $body->api_key
-        );
+has '+send_comments_flag' => ( default => 0 );
+has ext_to_int_map => ( is => 'rw' );
 
-        my $reports = $body->result_source->schema->resultset('Problem')->to_body($body)->search(
-            {
-                state => { 'IN', [qw/confirmed fixed/] },
-                -and => [
-                    external_id => { '!=', undef },
-                    external_id => { '!=', '' },
-                ],
-            }
-        );
+has report_criteria => ( is => 'ro', default => sub { {
+        state => [ FixMyStreet::DB::Result::Problem->visible_states() ],
+        external_id => { '!=', '' },
+    } } );
 
-        my @report_ids = ();
-        while ( my $report = $reports->next ) {
-            push @report_ids, $report->external_id;
-        }
+sub process_body {
+    my ($self) = @_;
 
-        next unless @report_ids;
+    my $reports = $self->schema->resultset('Problem')
+        ->to_body($self->current_body)
+        ->search($self->report_criteria);
 
-        $self->update_reports( \@report_ids, $open311, $body );
-    }
+    my @reports = $reports->all;
+    $self->update_reports(\@reports);
 }
 
 sub update_reports {
-    my ( $self, $report_ids, $open311, $body ) = @_;
+    my ( $self, $reports ) = @_;
+    return unless @$reports;
 
-    my $service_requests = $open311->get_service_requests( { report_ids => $report_ids } );
-    my $requests = $service_requests->{request};
+    my $requests = $self->current_open311->get_service_requests( {
+        report_ids => [ map { $_->external_id } @$reports ],
+    } );
 
+    $self->ext_to_int_map({ map { $_->external_id => $_ } @$reports });
     for my $request (@$requests) {
-        # if there's no updated date then we can't
-        # tell if it's newer than what we have so we should skip it
-        next unless $request->{updated_datetime};
-
-        my $request_id = $request->{service_request_id};
+        $request->{description} = $request->{status_notes};
 
-        my $problem = $body->result_source->schema->resultset('Problem')
-          ->search( { external_id => $request_id, } );
+        my $p = $self->find_problem($request) or next;
+        next if $request->{comment_time} < $p->lastupdate;
+        # But what if update at our end later than update their end...
 
-        if (my $p = $problem->first) {
-            my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($p->cobrand)->new();
-            $cobrand->set_lang_and_domain($p->lang, 1, FixMyStreet->path_to('locale')->stringify );
-            $p->update_from_open311_service_request( $request, $body, $self->system_user );
-        }
+        $self->process_update($request, $p);
     }
+}
 
-    return 1;
+sub _find_problem {
+    my ($self, $criteria) = @_;
+    my $problem = $self->ext_to_int_map->{$criteria->{external_id}};
+    return $problem;
 }
 
 1;
diff --git a/perllib/Open311/UpdatesBase.pm b/perllib/Open311/UpdatesBase.pm
new file mode 100644
index 000000000..c6ad3277a
--- /dev/null
+++ b/perllib/Open311/UpdatesBase.pm
@@ -0,0 +1,281 @@
+package Open311::UpdatesBase;
+
+use Moo;
+use Open311;
+use Parallel::ForkManager;
+use FixMyStreet::DB;
+
+has send_comments_flag => ( is => 'ro' );
+
+has system_user => ( is => 'rw' );
+has body => ( is => 'ro', default => sub { undef } );
+has verbose => ( is => 'ro', default => 0 );
+has schema => ( is =>'ro', lazy => 1, default => sub { FixMyStreet::DB->schema->connect } );
+has suppress_alerts => ( is => 'rw', default => 0 );
+has blank_updates_permitted => ( is => 'rw', default => 0 );
+
+has current_body => ( is => 'rw' );
+has current_open311 => ( is => 'rw' );
+
+Readonly::Scalar my $AREA_ID_OXFORDSHIRE => 2237;
+
+sub fetch {
+    my ($self, $open311) = @_;
+
+    my $bodies = $self->schema->resultset('Body')->search(
+        {
+            send_method     => 'Open311',
+            send_comments   => $self->send_comments_flag,
+            comment_user_id => { '!=', undef },
+            endpoint        => { '!=', '' },
+        }
+    );
+
+    if ( $self->body ) {
+        $bodies = $bodies->search( { name => $self->body } );
+    }
+
+    my $procs_min = FixMyStreet->config('FETCH_COMMENTS_PROCESSES_MIN') || 0;
+    my $procs_max = FixMyStreet->config('FETCH_COMMENTS_PROCESSES_MAX');
+    my $procs_timeout = FixMyStreet->config('FETCH_COMMENTS_PROCESS_TIMEOUT');
+
+    my $pm = Parallel::ForkManager->new(FixMyStreet->test_mode ? 0 : $procs_min);
+
+    if ($procs_max && $procs_timeout) {
+        my %workers;
+        $pm->run_on_wait(sub {
+            while (my ($pid, $started_at) = each %workers) {
+                next unless time() - $started_at > $procs_timeout;
+                next if $pm->max_procs == $procs_max;
+                $pm->set_max_procs($pm->max_procs + 1);
+                delete $workers{$pid}; # Only want to increase once per long-running thing
+            }
+        }, 1);
+        $pm->run_on_start(sub { my $pid = shift; $workers{$pid} = time(); });
+        $pm->run_on_finish(sub { my $pid = shift; delete $workers{$pid}; });
+    }
+
+    while ( my $body = $bodies->next ) {
+        $pm->start and next;
+
+        $self->current_body( $body );
+
+        my %open311_conf = (
+            endpoint => $body->endpoint,
+            api_key => $body->api_key,
+            jurisdiction => $body->jurisdiction,
+            extended_statuses => $body->send_extended_statuses,
+        );
+
+        my $cobrand = $body->get_cobrand_handler;
+        $cobrand->call_hook(open311_config_updates => \%open311_conf)
+            if $cobrand;
+
+        $self->current_open311( $open311 || Open311->new(%open311_conf) );
+
+        $self->suppress_alerts( $body->suppress_alerts );
+        $self->blank_updates_permitted( $body->blank_updates_permitted );
+        $self->system_user( $body->comment_user );
+        $self->process_body();
+
+        $pm->finish;
+    }
+
+    $pm->wait_all_children;
+}
+
+sub check_date {
+    my ($self, $request, @args) = @_;
+
+    my $comment_time = eval {
+        DateTime::Format::W3CDTF->parse_datetime( $request->{updated_datetime} || "" )
+            ->set_time_zone(FixMyStreet->local_time_zone);
+    };
+    return if $@;
+    my $updated = DateTime::Format::W3CDTF->format_datetime($comment_time->clone->set_time_zone('UTC'));
+    return if @args && ($updated lt $args[0] || $updated gt $args[1]);
+    $request->{comment_time} = $comment_time;
+    return 1;
+}
+
+sub find_problem {
+    my ($self, $request, @args) = @_;
+
+    $self->check_date($request, @args) or return;
+
+    my $request_id = $request->{service_request_id};
+
+    # If there's no request id then we can't work out
+    # what problem it belongs to so just skip
+    return unless $request_id || $request->{fixmystreet_id};
+
+    my $criteria = {
+        external_id => $request_id,
+    };
+
+    # in some cases we only have the FMS id and not the request id so use that
+    if ( $request->{fixmystreet_id} ) {
+        unless ( $request->{fixmystreet_id} =~ /^\d+$/ ) {
+            warn "skipping bad fixmystreet id in updates for " . $self->current_body->name . ": [" . $request->{fixmystreet_id} . "], external id is $request_id\n";
+            return;
+        }
+
+        $criteria = {
+            id => $request->{fixmystreet_id},
+        };
+    }
+
+    return $self->_find_problem($criteria);
+}
+
+sub process_update {
+    my ($self, $request, $p) = @_;
+    my $open311 = $self->current_open311;
+    my $body = $self->current_body;
+
+    my $state = $open311->map_state( $request->{status} );
+    my $old_state = $p->state;
+    my $external_status_code = $request->{external_status_code} || '';
+    my $customer_reference = $request->{customer_reference} || '';
+    my $old_external_status_code = $p->get_extra_metadata('external_status_code') || '';
+    my $comment = $self->schema->resultset('Comment')->new(
+        {
+            problem => $p,
+            user => $self->system_user,
+            external_id => $request->{update_id},
+            text => $self->comment_text_for_request(
+                $request, $p, $state, $old_state,
+                $external_status_code, $old_external_status_code
+            ),
+            mark_fixed => 0,
+            mark_open => 0,
+            anonymous => 0,
+            name => $self->system_user->name,
+            confirmed => $request->{comment_time},
+            created => $request->{comment_time},
+            state => 'confirmed',
+        }
+    );
+
+    # Some Open311 services, e.g. Confirm via open311-adapter, provide
+    # a more fine-grained status code that we use within FMS for
+    # response templates.
+    if ( $external_status_code ) {
+        $comment->set_extra_metadata(external_status_code => $external_status_code);
+        $p->set_extra_metadata(external_status_code => $external_status_code);
+    } else {
+        $p->set_extra_metadata(external_status_code => '');
+    }
+
+    # if the customer reference to display in the report metadata is
+    # not the same as the external_id
+    if ( $customer_reference ) {
+        $p->set_extra_metadata( customer_reference => $customer_reference );
+    }
+
+    $open311->add_media($request->{media_url}, $comment)
+        if $request->{media_url};
+
+    # don't update state unless it's an allowed state
+    if ( FixMyStreet::DB::Result::Problem->visible_states()->{$state} &&
+        # For Oxfordshire, don't allow changes back to Open from other open states
+        !( $body->areas->{$AREA_ID_OXFORDSHIRE} && $state eq 'confirmed' && $p->is_open ) &&
+        # Don't let it change between the (same in the front end) fixed states
+        !( $p->is_fixed && FixMyStreet::DB::Result::Problem->fixed_states()->{$state} ) ) {
+
+        $comment->problem_state($state);
+
+        # we only want to update the problem state if that makes sense. We never want to unhide a problem.
+        # If the update is older than the last update then we also do not want to update the state. This
+        # is largely to avoid the situation where we miss some updates, make more updates and then catch
+        # the updates when we fetch the last 24 hours of updates. The exception to this is the first
+        # comment. This is to catch automated updates which happen faster than we get the external_id
+        # back from the endpoint and hence have an created time before the lastupdate.
+        if ( $p->is_visible && $p->state ne $state &&
+            ( $comment->created >= $p->lastupdate || $p->comments->count == 0 ) ) {
+            $p->state($state);
+        }
+    }
+
+    # If nothing to show (no text, photo, or state change), don't show this update
+    $comment->state('hidden') unless $comment->text || $comment->photo
+        || ($comment->problem_state && $state ne $old_state);
+
+    my $cobrand = $body->get_cobrand_handler;
+    $cobrand->call_hook(open311_get_update_munging => $comment)
+        if $cobrand;
+
+    # As comment->created has been looked at above, its time zone has been shifted
+    # to TIME_ZONE (if set). We therefore need to set it back to local before
+    # insertion. We also then need a clone, otherwise the setting of lastupdate
+    # will *also* reshift comment->created's time zone to TIME_ZONE.
+    my $created = $comment->created->set_time_zone(FixMyStreet->local_time_zone);
+    $p->lastupdate($created->clone);
+    $p->update;
+    $comment->insert();
+
+    if ( $self->suppress_alerts ) {
+        my @alerts = $self->schema->resultset('Alert')->search( {
+            alert_type => 'new_updates',
+            parameter  => $p->id,
+            confirmed  => 1,
+            user_id    => $p->user->id,
+        } );
+
+        for my $alert (@alerts) {
+            my $alerts_sent = $self->schema->resultset('AlertSent')->find_or_create( {
+                alert_id  => $alert->id,
+                parameter => $comment->id,
+            } );
+        }
+    }
+
+    return $comment;
+}
+
+sub comment_text_for_request {
+    my ($self, $request, $problem, $state, $old_state,
+        $ext_code, $old_ext_code) = @_;
+
+    # Response templates are only triggered if the state/external status has changed.
+    # And treat any fixed state as fixed.
+    my $state_changed = $state ne $old_state
+        && !( $problem->is_fixed && FixMyStreet::DB::Result::Problem->fixed_states()->{$state} );
+    my $ext_code_changed = $ext_code ne $old_ext_code;
+    my $template;
+    if ($state_changed || $ext_code_changed) {
+        my $order;
+        my $state_params = {
+            'me.state' => $state
+        };
+        if ($ext_code) {
+            $state_params->{'me.external_status_code'} = $ext_code;
+            # make sure that empty string/nulls come last.
+            $order = { order_by => \"me.external_status_code DESC NULLS LAST" };
+        };
+
+        if (my $t = $problem->response_templates->search({
+            auto_response => 1,
+            -or => $state_params,
+        }, $order )->first) {
+            $template = $t->text;
+        }
+    }
+
+    my $desc = $request->{description} || '';
+    if ($desc && (!$template || $template !~ /\{\{description}}/)) {
+        return $desc;
+    }
+
+    if ($template) {
+        $template =~ s/\{\{description}}/$desc/;
+        return $template;
+    }
+
+    return "" if $self->blank_updates_permitted;
+
+    print STDERR "Couldn't determine update text for $request->{update_id} (report " . $problem->id . ")\n";
+    return "";
+}
+
+1;
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index 661a8827f..be949054b 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -2,6 +2,7 @@ use FixMyStreet::TestMech;
 use FixMyStreet;
 use FixMyStreet::DB;
 use FixMyStreet::Script::Reports;
+use Open311::GetUpdates;
 use Sub::Override;
 
 my $problem_rs = FixMyStreet::DB->resultset('Problem');
@@ -133,6 +134,7 @@ $problem->anonymous(1);
 $problem->insert;
 
 my $tz_local = DateTime::TimeZone->new( name => 'local' );
+my $comment_time = DateTime->now->set_time_zone( $tz_local );
 
 my $body = FixMyStreet::DB->resultset('Body')->new({
     name => 'Edinburgh City Council'
@@ -140,52 +142,32 @@ my $body = FixMyStreet::DB->resultset('Body')->new({
 
 for my $test (
     {
-        desc => 'request older than problem ignored',
-        lastupdate => '',
+        desc => 'request after problem created',
         request => {
-            updated_datetime => DateTime::Format::W3CDTF->new()->format_datetime( DateTime->now()->set_time_zone( $tz_local )->subtract( days => 2 ) ),
-        },
-        created => 0,
-    },
-    {
-        desc => 'request newer than problem created',
-        lastupdate => '',
-        request => {
-            updated_datetime => DateTime::Format::W3CDTF->new()->format_datetime( DateTime->now()->set_time_zone( $tz_local ) ),
             status => 'open',
-            status_notes => 'this is an update from the council',
+            comment_time => $comment_time,
+            description => 'this is an update from the council',
         },
-        created => 1,
         state => 'confirmed',
-        mark_fixed => 0,
-        mark_open => 0,
     },
     {
         desc => 'update with state of closed fixes problem',
-        lastupdate => '',
         request => {
-            updated_datetime => DateTime::Format::W3CDTF->new()->format_datetime( DateTime->now()->set_time_zone( $tz_local ) ),
+            comment_time => $comment_time,
             status => 'closed',
-            status_notes => 'the council have fixed this',
+            description => 'the council have fixed this',
         },
-        created => 1,
-        state => 'fixed',
-        mark_fixed => 1,
-        mark_open => 0,
+        state => 'fixed - council',
     },
     {
-        desc => 'update with state of open leaves problem as fixed',
-        lastupdate => '',
+        desc => 'update with state of open reopens problem',
         request => {
-            updated_datetime => DateTime::Format::W3CDTF->new()->format_datetime( DateTime->now()->set_time_zone( $tz_local ) ),
+            comment_time => $comment_time,
             status => 'open',
-            status_notes => 'the council do not think this is fixed',
+            description => 'the council do not think this is fixed',
         },
-        created => 1,
-        start_state => 'fixed',
-        state => 'fixed',
-        mark_fixed => 0,
-        mark_open => 0,
+        start_state => 'fixed - council',
+        state => 'confirmed',
     },
 ) {
     subtest $test->{desc} => sub {
@@ -197,23 +179,20 @@ for my $test (
         $problem->update;
         my $w3c = DateTime::Format::W3CDTF->new();
 
-        my $ret = $problem->update_from_open311_service_request( $test->{request}, $body, $user );
-        is $ret, $test->{created}, 'return value';
-
-        return unless $test->{created};
+        my $o = Open311->new( jurisdiction => 'mysociety', endpoint => 'http://example.com', test_mode => 1 );
+        my $updates = Open311::GetUpdates->new(
+            current_open311 => $o,
+            current_body => $body,
+            system_user => $user,
+        );
+        my $update = $updates->process_update($test->{request}, $problem);
 
         $problem->discard_changes;
-        is $problem->lastupdate, $w3c->parse_datetime($test->{request}->{updated_datetime}), 'lastupdate time';
-
-        my $update = $problem->comments->first;
+        is $problem->lastupdate, $test->{request}->{comment_time}, 'lastupdate time';
 
         ok $update, 'updated created';
-
         is $problem->state, $test->{state}, 'problem state';
-
-        is $update->text, $test->{request}->{status_notes}, 'update text';
-        is $update->mark_open, $test->{mark_open}, 'update mark_open flag';
-        is $update->mark_fixed, $test->{mark_fixed}, 'update mark_fixed flag';
+        is $update->text, $test->{request}->{description}, 'update text';
     };
 }
 
diff --git a/t/open311/getupdates.t b/t/open311/getupdates.t
index 351f17f6f..c1e51d380 100644
--- a/t/open311/getupdates.t
+++ b/t/open311/getupdates.t
@@ -18,9 +18,6 @@ my $body = FixMyStreet::DB->resultset('Body')->new( {
     name => 'Test Body',
 } );
 
-my $updates = Open311::GetUpdates->new( system_user => $user );
-ok $updates, 'created object';
-
 my $requests_xml = qq{<?xml version="1.0" encoding="utf-8"?>
 <service_requests>
 <request>
@@ -101,7 +98,12 @@ for my $test (
 
         my $o = Open311->new( jurisdiction => 'mysociety', endpoint => 'http://example.com', test_mode => 1, test_get_returns => { 'requests.xml' => $local_requests_xml } );
 
-        ok $updates->update_reports( [ 638344 ], $o, $body ), 'Updated reports';
+        my $updates = Open311::GetUpdates->new(
+            system_user => $user,
+            current_open311 => $o,
+            current_body => $body,
+        );
+        $updates->update_reports( [ $problem ] );
         my @parts = uri_split($o->test_uri_used);
         is $parts[2], '/requests.xml', 'path matches';
         my @qs = sort split '&', $parts[3];
@@ -179,7 +181,13 @@ subtest 'update with two requests' => sub {
 
     my $o = Open311->new( jurisdiction => 'mysociety', endpoint => 'http://example.com', test_mode => 1, test_get_returns => { 'requests.xml' => $local_requests_xml } );
 
-    ok $updates->update_reports( [ 638344,638345 ], $o, $body ), 'Updated reports';
+    my $updates = Open311::GetUpdates->new(
+        system_user => $user,
+        current_open311 => $o,
+        current_body => $body,
+    );
+
+    $updates->update_reports( [ $problem, $problem2 ] );
     my @parts = uri_split($o->test_uri_used);
     is $parts[2], '/requests.xml', 'path matches';
     my @qs = sort split '&', $parts[3];
@@ -227,7 +235,7 @@ my $problem3 = $problem_rs->create( {
     external_id  => 638346,
 } );
 
-subtest 'test translation of auto-added comment from old-style Open311 update' => sub {
+subtest 'test auto-added comment from old-style Open311 update' => sub {
     my $dt = sprintf( '<updated_datetime>%s</updated_datetime>', DateTime->now );
     $requests_xml =~ s/UPDATED_DATETIME/$dt/;
 
@@ -236,7 +244,13 @@ subtest 'test translation of auto-added comment from old-style Open311 update' =
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ 'fixamingata' ],
     }, sub {
-        ok $updates->update_reports( [ 638346 ], $o, $body ), 'Updated reports';
+        my $updates = Open311::GetUpdates->new(
+            system_user => $user,
+            current_open311 => $o,
+            current_body => $body,
+            blank_updates_permitted => 1,
+        );
+        $updates->update_reports( [ $problem3 ] );
     };
     my @parts = uri_split($o->test_uri_used);
     is $parts[2], '/requests.xml', 'path matches';
@@ -244,7 +258,8 @@ subtest 'test translation of auto-added comment from old-style Open311 update' =
     is_deeply(\@qs, [ 'jurisdiction_id=mysociety', 'service_request_id=638346' ], 'query string matches');
 
     is $problem3->comments->count, 1, 'added a comment';
-    is $problem3->comments->first->text, "Stängd av kommunen", 'correct comment text';
+    is $problem3->comments->first->problem_state, 'fixed - council';
+    is $problem3->comments->first->text, '', 'correct comment text';
 };
 
 END {
-- 
cgit v1.2.3


From da40423aa4877ddc130074cf1834da6d4c7dc38f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 23 Jun 2020 17:22:39 +0100
Subject: Factor out/default Open311 construction object.

This simplifies the code wherever used.
---
 .../FixMyStreet/App/Controller/Open311/Updates.pm  | 17 +---------
 perllib/FixMyStreet/App/Controller/Report/New.pm   | 13 --------
 perllib/Open311/UpdatesBase.pm                     | 37 +++++++++++++---------
 3 files changed, 23 insertions(+), 44 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Open311/Updates.pm b/perllib/FixMyStreet/App/Controller/Open311/Updates.pm
index 105400a8a..d5754bab7 100644
--- a/perllib/FixMyStreet/App/Controller/Open311/Updates.pm
+++ b/perllib/FixMyStreet/App/Controller/Open311/Updates.pm
@@ -3,7 +3,6 @@ package FixMyStreet::App::Controller::Open311::Updates;
 use utf8;
 use Moose;
 use namespace::autoclean;
-use Open311;
 use Open311::GetServiceRequestUpdates;
 
 BEGIN { extends 'Catalyst::Controller'; }
@@ -31,7 +30,6 @@ sub receive : Regex('^open311/v2/servicerequestupdates.(xml|json)$') : Args(0) {
         $body = $c->model('DB::Body')->find({ id => $c->get_param('jurisdiction_id') });
     }
     $c->detach('bad_request', ['jurisdiction_id']) unless $body;
-    my $user = $body->comment_user;
 
     my $key = $c->get_param('api_key') || '';
     my $token = $c->cobrand->feature('open311_token') || '';
@@ -45,21 +43,8 @@ sub receive : Regex('^open311/v2/servicerequestupdates.(xml|json)$') : Args(0) {
         $request->{$_} = $c->get_param($_) || $c->detach('bad_request', [ $_ ]);
     }
 
-    my %open311_conf = (
-        endpoint => $body->endpoint,
-        api_key => $body->api_key,
-        jurisdiction => $body->jurisdiction,
-        extended_statuses => $body->send_extended_statuses,
-    );
-
-    my $cobrand = $body->get_cobrand_handler;
-    $cobrand->call_hook(open311_config_updates => \%open311_conf)
-        if $cobrand;
-
-    my $open311 = Open311->new(%open311_conf);
     my $updates = Open311::GetServiceRequestUpdates->new(
-        system_user => $user,
-        current_open311 => $open311,
+        system_user => $body->comment_user,
         current_body => $body,
     );
 
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index ad324fe60..f5933d754 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -1679,21 +1679,8 @@ sub create_related_things : Private {
     foreach my $body (values %{$problem->bodies}) {
         my $user = $body->comment_user or next;
 
-        my %open311_conf = (
-            endpoint => $body->endpoint || '',
-            api_key => $body->api_key || '',
-            jurisdiction => $body->jurisdiction || '',
-            extended_statuses => $body->send_extended_statuses,
-        );
-
-        my $cobrand = $body->get_cobrand_handler;
-        $cobrand->call_hook(open311_config_updates => \%open311_conf)
-            if $cobrand;
-
-        my $open311 = Open311->new(%open311_conf);
         my $updates = Open311::GetServiceRequestUpdates->new(
             system_user => $user,
-            current_open311 => $open311,
             current_body => $body,
             blank_updates_permitted => 1,
         );
diff --git a/perllib/Open311/UpdatesBase.pm b/perllib/Open311/UpdatesBase.pm
index c6ad3277a..0be324773 100644
--- a/perllib/Open311/UpdatesBase.pm
+++ b/perllib/Open311/UpdatesBase.pm
@@ -15,7 +15,8 @@ has suppress_alerts => ( is => 'rw', default => 0 );
 has blank_updates_permitted => ( is => 'rw', default => 0 );
 
 has current_body => ( is => 'rw' );
-has current_open311 => ( is => 'rw' );
+has current_open311 => ( is => 'rwp', lazy => 1, builder => 1 );
+has open311_config => ( is => 'ro' ); # If we need to pass in a devolved contact
 
 Readonly::Scalar my $AREA_ID_OXFORDSHIRE => 2237;
 
@@ -59,20 +60,7 @@ sub fetch {
         $pm->start and next;
 
         $self->current_body( $body );
-
-        my %open311_conf = (
-            endpoint => $body->endpoint,
-            api_key => $body->api_key,
-            jurisdiction => $body->jurisdiction,
-            extended_statuses => $body->send_extended_statuses,
-        );
-
-        my $cobrand = $body->get_cobrand_handler;
-        $cobrand->call_hook(open311_config_updates => \%open311_conf)
-            if $cobrand;
-
-        $self->current_open311( $open311 || Open311->new(%open311_conf) );
-
+        $self->_set_current_open311( $open311 || $self->_build_current_open311 );
         $self->suppress_alerts( $body->suppress_alerts );
         $self->blank_updates_permitted( $body->blank_updates_permitted );
         $self->system_user( $body->comment_user );
@@ -84,6 +72,25 @@ sub fetch {
     $pm->wait_all_children;
 }
 
+sub _build_current_open311 {
+    my $self = shift;
+
+    my $body = $self->current_body;
+    my $conf = $self->open311_config || $body;
+    my %open311_conf = (
+        endpoint => $conf->endpoint || '',
+        api_key => $conf->api_key || '',
+        jurisdiction => $conf->jurisdiction || '',
+        extended_statuses => $body->send_extended_statuses,
+    );
+
+    my $cobrand = $body->get_cobrand_handler;
+    $cobrand->call_hook(open311_config_updates => \%open311_conf)
+        if $cobrand;
+
+    return Open311->new(%open311_conf);
+}
+
 sub check_date {
     my ($self, $request, @args) = @_;
 
-- 
cgit v1.2.3


From 208935e97fdaa50be69affe176028a8872395c69 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Mon, 6 Jul 2020 17:03:48 +0100
Subject: [Hackney] skip hackney categories for TfL red routes

Because Hackney doesn't have any matching categories for TfL red routes
skip sending the body, otherwise you get a "no contact details" message
when you click on a red route in Hackney
---
 perllib/FixMyStreet/Cobrand/TfL.pm |  7 +++++++
 t/Mock/MapIt.pm                    |  1 +
 t/Mock/Tilma.pm                    |  2 +-
 t/cobrand/tfl.t                    | 28 +++++++++++++++++++++++++++-
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm
index c37b9a0e5..9620c6b9e 100644
--- a/perllib/FixMyStreet/Cobrand/TfL.pm
+++ b/perllib/FixMyStreet/Cobrand/TfL.pm
@@ -437,6 +437,13 @@ sub munge_surrounding_london {
         # Don't send any TfL categories
         %$bodies = map { $_->id => $_ } grep { $_->name ne 'TfL' } values %$bodies;
     }
+
+    # Hackney doesn't have any of the council TfL categories so don't show
+    # any Hackney categories on red routes
+    my %bodies = map { $_->name => $_->id } values %$bodies;
+    if ( $bodies{'Hackney Council'} && $self->report_new_is_on_tlrn ) {
+        delete $bodies->{ $bodies{'Hackney Council'} };
+    }
 }
 
 sub munge_red_route_categories {
diff --git a/t/Mock/MapIt.pm b/t/Mock/MapIt.pm
index ed95e71fc..760e0ba52 100644
--- a/t/Mock/MapIt.pm
+++ b/t/Mock/MapIt.pm
@@ -45,6 +45,7 @@ my @PLACES = (
     [ '?', 52.238827, -0.894970, 2234, 'Northamptonshire County Council', 'CTY', 2397, 'Northampton Borough Council', 'DIS' ],
     [ '?', 52.23025, -1.015826, 2234, 'Northamptonshire County Council', 'CTY', 2397, 'Northampton Borough Council', 'DIS' ],
     [ 'E8 1DY', 51.552267, -0.063316, 2508, 'Hackney Borough Council', 'LBO' ],
+    [ 'E8 2DY', 51.552287, -0.063326, 2508, 'Hackney Council', 'LBO' ],
     [ 'TW7 5JN', 51.482286, -0.328163, 2483, 'Hounslow Borough Council', 'LBO' ],
     [ '?', 51.48111, -0.327219, 2483, 'Hounslow Borough Council', 'LBO' ],
     [ '?', 51.482045, -0.327219, 2483, 'Hounslow Borough Council', 'LBO' ],
diff --git a/t/Mock/Tilma.pm b/t/Mock/Tilma.pm
index 7542b1f5e..b7ef2be2f 100644
--- a/t/Mock/Tilma.pm
+++ b/t/Mock/Tilma.pm
@@ -28,7 +28,7 @@ sub dispatch_request {
     sub (GET + /mapserver/tfl + ?*) {
         my ($self, $args) = @_;
         my $features = [];
-        if ($args->{Filter} =~ /540512,169141/) {
+        if ($args->{Filter} =~ /540512,169141|534371,185488/) {
             $features = [
                 { type => "Feature", properties => { HA_ID => "19" }, geometry => { type => "Polygon", coordinates => [ [
                     [ 539408.94, 170607.58 ],
diff --git a/t/cobrand/tfl.t b/t/cobrand/tfl.t
index f8e0a11c8..cf1ec1c41 100644
--- a/t/cobrand/tfl.t
+++ b/t/cobrand/tfl.t
@@ -23,6 +23,10 @@ FixMyStreet::DB->resultset('BodyArea')->find_or_create({
     area_id => 2457, # Epsom Ewell, outside London, for bus stop test
     body_id => $body->id,
 });
+FixMyStreet::DB->resultset('BodyArea')->find_or_create({
+    area_id => 2508, # Hackney
+    body_id => $body->id,
+});
 my $superuser = $mech->create_user_ok('superuser@example.com', name => 'Super User', is_superuser => 1);
 my $staffuser = $mech->create_user_ok('counciluser@example.com', name => 'Council User', from_body => $body, password => 'password');
 $staffuser->user_body_permissions->create({
@@ -58,6 +62,13 @@ my $bromley_flytipping = $mech->create_contact_ok(
 $bromley_flytipping->set_extra_metadata(group => [ 'Street cleaning' ]);
 $bromley_flytipping->update;
 
+my $hackney = $mech->create_body_ok(2508, 'Hackney Council');
+$mech->create_contact_ok(
+    body_id => $hackney->id,
+    category => 'Abandoned Vehicle',
+    email => 'av-hackney@example.com',
+);
+
 my $contact1 = $mech->create_contact_ok(
     body_id => $body->id,
     category => 'Bus stops',
@@ -748,7 +759,7 @@ subtest 'Test no questionnaire sending' => sub {
 };
 
 FixMyStreet::override_config {
-    ALLOWED_COBRANDS => [ 'tfl', 'bromley', 'fixmystreet' ],
+    ALLOWED_COBRANDS => [ 'tfl', 'bromley', 'fixmystreet', 'hackney' ],
     MAPIT_URL => 'http://mapit.uk/',
     COBRAND_FEATURES => {
         internal_ips => { tfl => [ '127.0.0.1' ] },
@@ -864,6 +875,21 @@ for my $test (
             'Trees'
         ],
     },
+    {
+        host => 'hackney.fixmystreet.com',
+        name => "test no hackney categories on red route",
+        lat => 51.552287,
+        lon => -0.063326,
+        expected => [
+            'Bus stops',
+            'Flooding',
+            'Grit bins',
+            'Pothole',
+            'Timings',
+            'Traffic lights',
+            'Trees'
+        ],
+    },
 ) {
     subtest $test->{name} . ' on ' . $test->{host} => sub {
         $mech->host($test->{host});
-- 
cgit v1.2.3


From 5405b213903785e0c215efcf9c7125bddbd14731 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 7 Jul 2020 13:13:29 +0100
Subject: Better sort admin user table.

Sort the table when showing search results, and show users
without name at the bottom, rather than at the top.
---
 CHANGELOG.md                                      |  1 +
 perllib/FixMyStreet/App/Controller/Admin/Users.pm | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d05be748..e36b2017d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
+        - Better sort admin user table.
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Users.pm b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
index 5bb91341d..c73f1429b 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Users.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
@@ -47,8 +47,8 @@ sub index :Path : Args(0) {
 
     my $search = $c->get_param('search');
     my $role = $c->get_param('role');
+    my $users = $c->cobrand->users;
     if ($search || $role) {
-        my $users = $c->cobrand->users;
         my $isearch;
         if ($search) {
             $search = $self->trim($search);
@@ -78,25 +78,20 @@ sub index :Path : Args(0) {
                 join => 'user_roles',
             });
         }
-
-        my @users = $users->all;
-        $c->stash->{users} = [ @users ];
-        if ($search) {
-            $c->forward('/admin/add_flags', [ { email => { ilike => $isearch } } ]);
-        }
-
     } else {
         $c->forward('/auth/get_csrf_token');
         $c->forward('/admin/fetch_all_bodies');
         $c->cobrand->call_hook('admin_user_edit_extra_data');
 
         # Admin users by default
-        my $users = $c->cobrand->users->search(
-            { from_body => { '!=', undef } },
-            { order_by => 'name' }
-        );
-        my @users = $users->all;
-        $c->stash->{users} = \@users;
+        $users = $users->search({ from_body => { '!=', undef } });
+    }
+
+    $users = $users->search(undef, { order_by => [ \"name = ''", 'name' ] });
+    my @users = $users->all;
+    $c->stash->{users} = \@users;
+    if ($search) {
+        $c->forward('/admin/add_flags', [ { email => { ilike => "%$search%" } } ]);
     }
 
     my $rs;
-- 
cgit v1.2.3


From ee42ae7994e80e716a694dedcc30ad85333ef98a Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 6 Jul 2020 16:59:28 +0100
Subject: Make sure string_diff does not return undef.

As string_diff is used in hash values, it must always return something,
otherwise you could end up with e.g. category => 'extra'.
---
 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm b/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
index 6d14e6a9f..d2059ab9d 100644
--- a/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
+++ b/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
@@ -193,7 +193,7 @@ sub string_diff {
     $new = FixMyStreet::Template::html_filter($new);
 
     if ($options{single}) {
-        return unless $old;
+        return '' unless $old;
         $old = [ $old ];
         $new = [ $new ];
     }
-- 
cgit v1.2.3


From 56ff18a3f9495c41d84cc7c68aea0bc81313b392 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 6 Jul 2020 17:00:25 +0100
Subject: Handle arrayrefs in moderation extra diff display.

---
 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm b/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
index d2059ab9d..0ff61d64f 100644
--- a/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
+++ b/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
@@ -166,6 +166,8 @@ sub compare_extra {
     my @all_keys = grep { $_ ne 'sent_to' } sort keys %$both;
     my @s;
     foreach (@all_keys) {
+        $old->{$_} = join(', ', @{$old->{$_}}) if ref $old->{$_} eq 'ARRAY';
+        $new->{$_} = join(', ', @{$new->{$_}}) if ref $new->{$_} eq 'ARRAY';
         if ($old->{$_} && $new->{$_}) {
             push @s, string_diff("$_ = $old->{$_}", "$_ = $new->{$_}");
         } elsif ($new->{$_}) {
@@ -174,7 +176,7 @@ sub compare_extra {
             push @s, string_diff("$_ = $old->{$_}", "");
         }
     }
-    return join ', ', grep { $_ } @s;
+    return join '; ', grep { $_ } @s;
 }
 
 sub extra_diff {
-- 
cgit v1.2.3


From 743c60c5e5d134d82533526758b4411198efe063 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 6 Jul 2020 17:00:48 +0100
Subject: Only show removed in moderation diff if non-blank.

---
 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm b/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
index 0ff61d64f..b9abb4e40 100644
--- a/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
+++ b/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
@@ -172,7 +172,7 @@ sub compare_extra {
             push @s, string_diff("$_ = $old->{$_}", "$_ = $new->{$_}");
         } elsif ($new->{$_}) {
             push @s, string_diff("", "$_ = $new->{$_}");
-        } else {
+        } elsif ($old->{$_}) {
             push @s, string_diff("$_ = $old->{$_}", "");
         }
     }
-- 
cgit v1.2.3


From 142524462031ff382f122d689bb38908149267b0 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 6 Jul 2020 17:02:11 +0100
Subject: Provide list of keys to ignore in moderation diff.

This is a current full list of extra keys that could be set on a report
that could confuse the moderation diff display.
---
 CHANGELOG.md                                            |  1 +
 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d05be748..5b84100bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
         - Fix photo orientation in modern browsers.
         - Improve compatibility with G Suite OpenID Connect authentication. #3032
         - Fix duplicate asset message after dismissing duplicate suggestions.
+        - Improve moderation diff display in a few small ways. #3105
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm b/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
index b9abb4e40..dd76a52c0 100644
--- a/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
+++ b/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
@@ -156,6 +156,20 @@ sub compare_photo {
     return FixMyStreet::Template::SafeString->new($s);
 }
 
+# This is a list of extra keys that could be set on a report after a moderation
+# has occurred. This can confuse the display of the last moderation entry, as
+# the comparison with the problem's extra will be wrong.
+my @keys_to_ignore = (
+    'sent_to', # SendReport::Email adds this arrayref when sent
+    'closed_updates', # Marked to close a report to updates
+    'closure_alert_sent_at', # Set by alert sending if update closes a report
+    # Can be set/changed by an Open311 update
+    'external_status_code', 'customer_reference',
+    # Can be set by inspectors
+    'traffic_information', 'detailed_information', 'duplicates', 'duplicate_of', 'order',
+);
+my %keys_to_ignore = map { $_ => 1 } @keys_to_ignore;
+
 sub compare_extra {
     my ($self, $other) = @_;
 
@@ -163,7 +177,7 @@ sub compare_extra {
     my $new = $other->get_extra_metadata;
 
     my $both = { %$old, %$new };
-    my @all_keys = grep { $_ ne 'sent_to' } sort keys %$both;
+    my @all_keys = grep { !$keys_to_ignore{$_} } sort keys %$both;
     my @s;
     foreach (@all_keys) {
         $old->{$_} = join(', ', @{$old->{$_}}) if ref $old->{$_} eq 'ARRAY';
-- 
cgit v1.2.3


From 9a12c0dac0b7677938f33f5abb639a296adff9c5 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 25 Jun 2020 16:23:33 +0100
Subject: Add option to check password on Have I Been Pwned.

If switched on, sends first five letters of the SHA1 hash of the entered
password to HIBP's API, which then returns all matching hashes in their
database of breached passwords. If we find a match, tell the user they
need to pick a different password.
---
 CHANGELOG.md                               |  1 +
 conf/general.yml-example                   |  4 +++
 perllib/FixMyStreet/App/Controller/Auth.pm | 54 ++++++++++++++++++++++--------
 t/app/controller/auth.t                    | 17 ++++++++++
 4 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d05be748..d851c5b0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
     - Front end improvements:
         - Add lazy image loading on list items.
         - Improve Bing geocoder results.
+        - Add option of checking passwords against Have I Been Pwned.
     - Changes:
         - Mark user as active when sent an email alert.
     - Bugfixes:
diff --git a/conf/general.yml-example b/conf/general.yml-example
index 26399bb81..e42a1433e 100644
--- a/conf/general.yml-example
+++ b/conf/general.yml-example
@@ -223,6 +223,10 @@ SMTP_PORT: ''
 SMTP_USERNAME: ''
 SMTP_PASSWORD: ''
 
+# Set if you want password setting to be checked (securely) against the
+# Have I Been Pwned dataset
+CHECK_HAVEIBEENPWNED: 0
+
 # Gaze is a world-wide service for population density lookups. You can leave
 # this as is.
 GAZE_URL: 'https://gaze.mysociety.org/gaze'
diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index beba6b235..0d0c2240a 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -460,7 +460,7 @@ sub no_csrf_token : Private {
 
 =item common_password
 
-Returns 1/0 depending on if password is common or not.
+Returns 1/0 depending on if password is common/breached or not.
 
 =cut
 
@@ -469,10 +469,8 @@ sub common_password : Local : Args(0) {
 
     my $password = $c->get_param('password_register');
 
-    my $return = JSON->true;
-    if (!$c->cobrand->call_hook('bypass_password_checks') && found($password)) {
-        $return = _('Please choose a less commonly-used password');
-    }
+    my $pass = $c->forward('test_password', [ $password ]);
+    my $return = $pass ? JSON->true : $c->stash->{field_errors}->{password_register};
 
     my $body = JSON->new->utf8->allow_nonref->encode($return);
     $c->res->content_type('application/json; charset=utf-8');
@@ -491,22 +489,50 @@ sub test_password : Private {
 
     return 1 if $c->cobrand->call_hook('bypass_password_checks');
 
-    my @errors;
-
+    my $error;
     my $min_length = $c->cobrand->password_minimum_length;
-    push @errors, sprintf(_('Please make sure your password is at least %d characters long'), $min_length)
-        if length($password) < $min_length;
-
-    push @errors, _('Please choose a less commonly-used password')
-        if found($password);
+    if (length($password) < $min_length) {
+        $error = sprintf(_('Please make sure your password is at least %d characters long'), $min_length);
+    } elsif (found($password)) {
+        $error = _('Please choose a less commonly-used password');
+    } elsif (hibp($password)) {
+        $error = _('That password has appeared in a known third-party data breach (<a href="https://haveibeenpwned.com/Passwords" target="_blank">more information</a>); please choose another');
+    }
 
-    if (@errors) {
-        $c->stash->{field_errors}->{password_register} = join('<br>', @errors);
+    if ($error) {
+        $c->stash->{field_errors}->{password_register} = $error;
         return 0;
     }
     return 1;
 }
 
+=item hibp
+
+Returns true if we should check Have I Been Pwned and the check
+comes back positive for a password that has been breached.
+
+=cut
+
+use Encode qw(encode);
+use Digest::SHA qw(sha1_hex);
+use LWP::Simple;
+use Unicode::Normalize;
+
+sub hibp : Private {
+    my $password = shift;
+
+    return 0 unless FixMyStreet->config('CHECK_HAVEIBEENPWNED');
+    my $sha1 = uc sha1_hex(encode('UTF-8', NFD($password)));
+    my $url = 'https://api.pwnedpasswords.com/range/' . substr($sha1, 0, 5);
+    my $response = LWP::Simple::get($url);
+    my $remainder = substr($sha1, 5);
+    foreach my $line (split /\r\n/, $response) {
+        my ($part, $count) = split /:/, $line;
+        return $count if $part eq $remainder;
+    }
+    return 0;
+}
+
 =head2 sign_out
 
 Log the user out. Tell them we've done so.
diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t
index 8b4b772fc..0326bbacd 100644
--- a/t/app/controller/auth.t
+++ b/t/app/controller/auth.t
@@ -288,6 +288,23 @@ subtest 'check common password AJAX call' => sub {
     $mech->content_contains("true");
 };
 
+subtest 'check hibp password call' => sub {
+    FixMyStreet::override_config {
+        CHECK_HAVEIBEENPWNED => 1,
+    }, sub {
+        my $lwp = Test::MockModule->new('LWP::Simple');
+        # Switch mock round from live site, so we know we're not testing live site by mistake
+        $lwp->mock(get => sub($) {
+            return '9958D0F0EE6744E7CCAFC84515FCFAD7B1B:10' if $_[0] =~ /6EF4D$/; # squirblewirble
+            return '';
+        });
+        $mech->post_ok('/auth/common_password', { password_register => 'p@ssword2' });
+        $mech->content_contains("true");
+        $mech->post_ok('/auth/common_password', { password_register => 'squirblewirble' });
+        $mech->content_contains("That password has appeared in a known");
+    };
+};
+
 subtest 'test forgotten password page' => sub {
     $mech->get_ok('/auth/forgot');
     $mech->content_contains('Forgot password');
-- 
cgit v1.2.3


From 94d6eb5e670e29bfca4c81c18ec94e79b6cfafd7 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 2 Jul 2020 14:03:06 +0100
Subject: [Buckinghamshire] Handle HE flytipping reports.

We do not want to recategorise a report into the off-road
category if it is going to be sent to Highways England.
---
 perllib/FixMyStreet/Cobrand/Buckinghamshire.pm |  1 +
 t/cobrand/bucks.t                              | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
index 117725273..bd20d77ff 100644
--- a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
@@ -103,6 +103,7 @@ sub report_new_munge_before_insert {
     my ($self, $report) = @_;
 
     return unless $report->category eq 'Flytipping';
+    return unless $self->{c}->stash->{report}->to_body_named('Buckinghamshire');
 
     my $placement = $self->{c}->get_param('road-placement');
     return unless $placement && $placement eq 'off-road';
diff --git a/t/cobrand/bucks.t b/t/cobrand/bucks.t
index 230a52f99..36e149a13 100644
--- a/t/cobrand/bucks.t
+++ b/t/cobrand/bucks.t
@@ -112,7 +112,6 @@ subtest 'pothole on road not sent to extra email, only confirm sent' => sub {
     is $report->external_id, 248, 'Report has right external ID';
 };
 
-
 # report made in Flytipping category off road should get moved to other category
 subtest 'Flytipping not on a road gets recategorised' => sub {
     $mech->log_in_ok($publicuser->email);
@@ -129,6 +128,23 @@ subtest 'Flytipping not on a road gets recategorised' => sub {
     my $report = FixMyStreet::DB->resultset("Problem")->search(undef, { order_by => { -desc => 'id' } })->first;
     ok $report, "Found the report";
     is $report->category, "Flytipping (off-road)", 'Report was recategorised correctly';
+};
+
+subtest 'Flytipping not on a road going to HE does not get recategorised' => sub {
+    $mech->get_ok('/report/new?latitude=51.615559&longitude=-0.556903&category=Flytipping');
+    $mech->submit_form_ok({
+        with_fields => {
+            single_body_only => 'Highways England',
+            title => "Test Report",
+            detail => 'Test report details.',
+            category => 'Flytipping',
+            'road-placement' => 'off-road',
+        }
+    }, "submit details");
+    $mech->content_contains('We don&rsquo;t handle this type of problem');
+    my $report = FixMyStreet::DB->resultset("Problem")->search(undef, { order_by => { -desc => 'id' } })->first;
+    ok $report, "Found the report";
+    is $report->category, "Flytipping", 'Report was not recategorised';
 
     $mech->log_out_ok;
 };
-- 
cgit v1.2.3


From bd92957261cb56961a40e365509c9e65a93ed055 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 2 Jul 2020 14:42:13 +0100
Subject: [UK] More consistent use of open311_extra_data.

Have function call two functions set in subclasses, clearer
and fewer overrides needed.
---
 perllib/FixMyStreet/Cobrand/Bexley.pm           |  2 +-
 perllib/FixMyStreet/Cobrand/Bromley.pm          |  8 ++++--
 perllib/FixMyStreet/Cobrand/Buckinghamshire.pm  | 11 +-------
 perllib/FixMyStreet/Cobrand/CheshireEast.pm     | 34 +------------------------
 perllib/FixMyStreet/Cobrand/Greenwich.pm        |  2 +-
 perllib/FixMyStreet/Cobrand/IsleOfWight.pm      | 11 +-------
 perllib/FixMyStreet/Cobrand/Northamptonshire.pm |  9 +++----
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm      |  2 +-
 perllib/FixMyStreet/Cobrand/Peterborough.pm     | 14 ++--------
 perllib/FixMyStreet/Cobrand/Rutland.pm          |  2 +-
 perllib/FixMyStreet/Cobrand/UKCouncils.pm       |  6 +++++
 perllib/FixMyStreet/Cobrand/Westminster.pm      |  2 +-
 perllib/FixMyStreet/Roles/ConfirmOpen311.pm     |  2 +-
 13 files changed, 27 insertions(+), 78 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bexley.pm b/perllib/FixMyStreet/Cobrand/Bexley.pm
index ad3036711..e29856f31 100644
--- a/perllib/FixMyStreet/Cobrand/Bexley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bexley.pm
@@ -88,7 +88,7 @@ sub open311_config {
     $params->{multi_photos} = 1;
 }
 
-sub open311_extra_data {
+sub open311_extra_data_include {
     my ($self, $row, $h, $extra, $contact) = @_;
 
     my $open311_only;
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index bd229f360..e63d722fd 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -171,7 +171,7 @@ sub open311_config {
     $params->{extended_description} = 0;
 }
 
-sub open311_extra_data {
+sub open311_extra_data_include {
     my ($self, $row, $h, $extra) = @_;
 
     my $title = $row->title;
@@ -207,7 +207,11 @@ sub open311_extra_data {
         push @$open311_only, { name => 'fms_extra_title', value => $row->user->title };
     }
 
-    return ($open311_only, [ 'feature_id', 'prow_reference' ]);
+    return $open311_only;
+}
+
+sub open311_extra_data_exclude {
+    [ 'feature_id', 'prow_reference' ]
 }
 
 sub open311_config_updates {
diff --git a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
index bd20d77ff..00264afea 100644
--- a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
@@ -45,16 +45,7 @@ sub send_questionnaires {
     return 0;
 }
 
-sub open311_pre_send {
-    my ($self, $row, $open311) = @_;
-
-    return unless $row->extra;
-    my $extra = $row->get_extra_fields;
-    if (@$extra) {
-        @$extra = grep { $_->{name} ne 'road-placement' } @$extra;
-        $row->set_extra_fields(@$extra);
-    }
-}
+sub open311_extra_data_exclude { [ 'road-placement' ] }
 
 sub open311_post_send {
     my ($self, $row, $h) = @_;
diff --git a/perllib/FixMyStreet/Cobrand/CheshireEast.pm b/perllib/FixMyStreet/Cobrand/CheshireEast.pm
index c5e5107f3..ae537b635 100644
--- a/perllib/FixMyStreet/Cobrand/CheshireEast.pm
+++ b/perllib/FixMyStreet/Cobrand/CheshireEast.pm
@@ -5,6 +5,7 @@ use strict;
 use warnings;
 
 use Moo;
+with 'FixMyStreet::Roles::ConfirmOpen311';
 with 'FixMyStreet::Roles::ConfirmValidation';
 
 sub council_area_id { 21069 }
@@ -56,39 +57,6 @@ sub abuse_reports_only { 1 }
 
 sub send_questionnaires { 0 }
 
-sub open311_config {
-    my ($self, $row, $h, $params) = @_;
-
-    $params->{multi_photos} = 1;
-}
-
-sub open311_extra_data {
-    my ($self, $row, $h, $extra) = @_;
-
-    my $open311_only = [
-        { name => 'report_url',
-          value => $h->{url} },
-        { name => 'title',
-          value => $row->title },
-        { name => 'description',
-          value => $row->detail },
-    ];
-
-    # Reports made via FMS.com or the app probably won't have a site code
-    # value because we don't display the adopted highways layer on those
-    # frontends. Instead we'll look up the closest asset from the WFS
-    # service at the point we're sending the report over Open311.
-    if (!$row->get_extra_field_value('site_code')) {
-        if (my $site_code = $self->lookup_site_code($row)) {
-            push @$extra,
-                { name => 'site_code',
-                value => $site_code };
-        }
-    }
-
-    return $open311_only;
-}
-
 # TODO These values may not be accurate
 sub lookup_site_code_config { {
     buffer => 200, # metres
diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm
index be260d0c0..de7dd5d96 100644
--- a/perllib/FixMyStreet/Cobrand/Greenwich.pm
+++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm
@@ -44,7 +44,7 @@ sub reports_per_page { return 20; }
 
 sub admin_user_domain { 'royalgreenwich.gov.uk' }
 
-sub open311_extra_data {
+sub open311_extra_data_include {
     my ($self, $row, $h, $extra) = @_;
 
     # Greenwich doesn't have category metadata to fill this
diff --git a/perllib/FixMyStreet/Cobrand/IsleOfWight.pm b/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
index 08741639c..84b916fc2 100644
--- a/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
+++ b/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
@@ -63,16 +63,7 @@ sub lookup_site_code_config { {
     accept_feature => sub { 1 }
 } }
 
-sub open311_pre_send {
-    my ($self, $row, $open311) = @_;
-
-    return unless $row->extra;
-    my $extra = $row->get_extra_fields;
-    if (@$extra) {
-        @$extra = grep { $_->{name} ne 'urgent' } @$extra;
-        $row->set_extra_fields(@$extra);
-    }
-}
+sub open311_extra_data_exclude { [ '^urgent$' ] }
 
 # Make sure fetched report description isn't shown.
 sub filter_report_description { "" }
diff --git a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm
index 3e32b0856..791e2f83f 100644
--- a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm
@@ -91,10 +91,10 @@ sub open311_config {
     $params->{multi_photos} = 1;
 }
 
-sub open311_extra_data {
+sub open311_extra_data_include {
     my ($self, $row, $h, $extra) = @_;
 
-    return ([
+    return [
         { name => 'report_url',
           value => $h->{url} },
         { name => 'title',
@@ -103,10 +103,9 @@ sub open311_extra_data {
           value => $row->detail },
         { name => 'category',
           value => $row->category },
-    ], [
-        'emergency'
-    ]);
+    ];
 }
+sub open311_extra_data_exclude { [ 'emergency' ] }
 
 sub open311_get_update_munging {
     my ($self, $comment) = @_;
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 8ce12a81b..aa6c9a5a5 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -122,7 +122,7 @@ sub open311_config {
     $params->{extended_description} = 'oxfordshire';
 }
 
-sub open311_extra_data {
+sub open311_extra_data_include {
     my ($self, $row, $h, $extra) = @_;
 
     return [
diff --git a/perllib/FixMyStreet/Cobrand/Peterborough.pm b/perllib/FixMyStreet/Cobrand/Peterborough.pm
index bdd19a338..dd6592a7c 100644
--- a/perllib/FixMyStreet/Cobrand/Peterborough.pm
+++ b/perllib/FixMyStreet/Cobrand/Peterborough.pm
@@ -41,7 +41,7 @@ sub geocoder_munge_results {
 
 sub admin_user_domain { "peterborough.gov.uk" }
 
-around open311_extra_data => sub {
+around open311_extra_data_include => sub {
     my ($orig, $self, $row, $h, $extra) = @_;
 
     my $open311_only = $self->$orig($row, $h, $extra);
@@ -53,18 +53,8 @@ around open311_extra_data => sub {
     }
     return $open311_only;
 };
-
 # remove categories which are informational only
-sub open311_pre_send {
-    my ($self, $row, $open311) = @_;
-
-    return unless $row->extra;
-    my $extra = $row->get_extra_fields;
-    if (@$extra) {
-        @$extra = grep { $_->{name} !~ /^(PCC-|emergency$|private_land$)/i } @$extra;
-        $row->set_extra_fields(@$extra);
-    }
-}
+sub open311_extra_data_exclude { [ '^PCC-', '^emergency$', '^private_land$' ] }
 
 sub lookup_site_code_config { {
     buffer => 50, # metres
diff --git a/perllib/FixMyStreet/Cobrand/Rutland.pm b/perllib/FixMyStreet/Cobrand/Rutland.pm
index 63a20d893..557cf83a9 100644
--- a/perllib/FixMyStreet/Cobrand/Rutland.pm
+++ b/perllib/FixMyStreet/Cobrand/Rutland.pm
@@ -29,7 +29,7 @@ sub open311_config {
     $params->{multi_photos} = 1;
 }
 
-sub open311_extra_data {
+sub open311_extra_data_include {
     my ($self, $row, $h, $extra) = @_;
 
     return [
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 7456d9ddf..f09d4314d 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -329,6 +329,12 @@ sub munge_report_new_contacts {
     }
 }
 
+sub open311_extra_data {
+    my $self = shift;
+    my $include = $self->call_hook(open311_extra_data_include => @_);
+    my $exclude = $self->call_hook(open311_extra_data_exclude => @_);
+    return ($include, $exclude);
+};
 
 =head2 lookup_site_code
 
diff --git a/perllib/FixMyStreet/Cobrand/Westminster.pm b/perllib/FixMyStreet/Cobrand/Westminster.pm
index c9f31f7f9..40ae9f6c6 100644
--- a/perllib/FixMyStreet/Cobrand/Westminster.pm
+++ b/perllib/FixMyStreet/Cobrand/Westminster.pm
@@ -78,7 +78,7 @@ sub open311_config {
     $h->{account_id} = $id || '0';
 }
 
-sub open311_extra_data {
+sub open311_extra_data_include {
     my ($self, $row, $h, $extra) = @_;
 
     # Reports made via the app probably won't have a USRN because we don't
diff --git a/perllib/FixMyStreet/Roles/ConfirmOpen311.pm b/perllib/FixMyStreet/Roles/ConfirmOpen311.pm
index 0845105f1..6787ba3f4 100644
--- a/perllib/FixMyStreet/Roles/ConfirmOpen311.pm
+++ b/perllib/FixMyStreet/Roles/ConfirmOpen311.pm
@@ -13,7 +13,7 @@ sub open311_config {
     $params->{multi_photos} = 1;
 }
 
-sub open311_extra_data {
+sub open311_extra_data_include {
     my ($self, $row, $h, $extra) = @_;
 
     my $open311_only = [
-- 
cgit v1.2.3


From 002bcf0346adcb6669c236a784752ade896f22ba Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 2 Jul 2020 15:16:27 +0100
Subject: [UK] Ignore Highways England extra data.

If a report is made on a HE road, but it is not to be sent to HE (so the
user has picked it's not on the HE road) and the category name is shared
between council and HE, then the extra HE data (area, road, & sector) is
still saved on the report, and our open311-adapter rejects it due to the
additionnal information present. So make sure we remove this data before
sending.
---
 perllib/FixMyStreet/Cobrand/EastSussex.pm | 2 +-
 perllib/FixMyStreet/Cobrand/UKCouncils.pm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/EastSussex.pm b/perllib/FixMyStreet/Cobrand/EastSussex.pm
index 8d95980fe..04394f776 100644
--- a/perllib/FixMyStreet/Cobrand/EastSussex.pm
+++ b/perllib/FixMyStreet/Cobrand/EastSussex.pm
@@ -20,7 +20,7 @@ sub open311_extra_data {
         }
     }
     $row->detail($row->detail . $text);
-    return ();
+    return (undef, ['sect_label', 'road_name', 'area_name']);
 }
 
 sub open311_post_send {
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index f09d4314d..4634f4b14 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -333,6 +333,7 @@ sub open311_extra_data {
     my $self = shift;
     my $include = $self->call_hook(open311_extra_data_include => @_);
     my $exclude = $self->call_hook(open311_extra_data_exclude => @_);
+    push @$exclude, 'sect_label', 'road_name', 'area_name';
     return ($include, $exclude);
 };
 
-- 
cgit v1.2.3


From 0bce7c37e58e47bc3b2b864fe3fdd4072871827d Mon Sep 17 00:00:00 2001
From: MyfanwyNixon <myf@mysociety.org>
Date: Wed, 8 Jul 2020 09:28:44 +0100
Subject: [fixmystreet.com] Advertise webinars in _submit_footer.html

Change the dashboard promo to a webinar promo, in the email sent
to councils.
---
 templates/email/fixmystreet.com/_submit_footer.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/templates/email/fixmystreet.com/_submit_footer.html b/templates/email/fixmystreet.com/_submit_footer.html
index 0da75a3b7..9a53c942d 100644
--- a/templates/email/fixmystreet.com/_submit_footer.html
+++ b/templates/email/fixmystreet.com/_submit_footer.html
@@ -2,13 +2,15 @@
   <tr>
     <th style="[% td_style %] padding: [% column_padding %]px; background-color: [% color_yellow %]; color: [% color_black %];">
       <h2 style="[% h2_style %] margin-bottom: 15px;">
-        In-depth stats from our new, exclusive dashboard
+        FixMyStreet Pro is making savings for authorities across the UK
       </h2>
       <p style="margin: 0;">
-        What do people report most in your area?
-        How’s your response rate?
-        And how do you compare to other UK councils?
-        <a href="https://www.fixmystreet.com/about/council-dashboard/?utm_source=council_submit_email&amp;utm_content=[% "View FixMyStreet stats for your area" | uri %]&amp;utm_medium=email&amp;utm_campaign=fms_stats_dashboard_promo">View FixMyStreet stats for your area.</a>
+        <a href="https://www.fixmystreet.com/pro/take-a-tour/webinar-schedule/?utm_source=council_submit_email&amp;utm_content=[% "Join one of our regular informal webinars" | uri %]&amp;utm_medium=email&amp;utm_campaign=fms_webinars_promo">
+          Join one of our regular informal webinars
+        </a> to discover how FixMyStreet Pro
+        integrates with your existing systems,
+        drives channel shift,
+        and saves you money from day one.
       </p>
     </th>
   </tr>
-- 
cgit v1.2.3


From eb85d0df6cfcdfa5eb7833c53d704967e3df761a Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 8 Jul 2020 18:22:37 +0100
Subject: Change that fixes test on Travis.

---
 .cypress/cypress/integration/duplicates.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cypress/cypress/integration/duplicates.js b/.cypress/cypress/integration/duplicates.js
index 406b3fb67..3dba5e38a 100644
--- a/.cypress/cypress/integration/duplicates.js
+++ b/.cypress/cypress/integration/duplicates.js
@@ -53,7 +53,7 @@ describe('Duplicate tests', function() {
     it('lets an inspector see duplicate reports coming from /reports', function() {
       cy.request({
         method: 'POST',
-        url: 'http://borsetshire.localhost:3001/auth?r=/reports',
+        url: 'http://borsetshire.localhost:3001/auth?r=/my',
         form: true,
         body: { username: 'admin@example.org', password_sign_in: 'password' }
       });
-- 
cgit v1.2.3


From f55c261f92ea53d5a36da5d5297394baabd740a4 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 2 Apr 2020 15:27:34 +0100
Subject: [UK] Show data from StreetManager.

---
 .cypress/cypress/fixtures/iow_roadworks.json       | 109 +++------------------
 .cypress/cypress/integration/bathnes.js            |   2 +-
 .cypress/cypress/integration/isleofwight.js        |  13 +++
 templates/web/bathnes/footer_extra_js.html         |   9 +-
 templates/web/bexley/footer_extra_js.html          |   2 +-
 templates/web/bristol/footer_extra_js.html         |   2 +-
 templates/web/bromley/footer_extra_js.html         |   2 +-
 templates/web/buckinghamshire/footer_extra_js.html |   2 +-
 templates/web/cheshireeast/footer_extra_js.html    |   2 +-
 .../footer_extra_js_base.html                      |   5 +
 templates/web/hounslow/footer_extra_js.html        |   2 +-
 templates/web/isleofwight/footer_extra_js.html     |   2 +-
 templates/web/lincolnshire/footer_extra_js.html    |   2 +-
 .../web/northamptonshire/footer_extra_js.html      |   2 +-
 templates/web/oxfordshire/footer_extra_js.html     |   2 +-
 templates/web/peterborough/footer_extra_js.html    |   2 +-
 templates/web/westminster/footer_extra_js.html     |   2 +-
 web/cobrands/bathnes/js.js                         |  11 +++
 web/cobrands/fixmystreet-uk-councils/roadworks.js  |  82 ++++++++++++++++
 web/cobrands/sass/_base.scss                       |   4 +
 20 files changed, 150 insertions(+), 109 deletions(-)
 create mode 100644 web/cobrands/bathnes/js.js
 create mode 100644 web/cobrands/fixmystreet-uk-councils/roadworks.js

diff --git a/.cypress/cypress/fixtures/iow_roadworks.json b/.cypress/cypress/fixtures/iow_roadworks.json
index b20dd8514..d6d7bb31b 100644
--- a/.cypress/cypress/fixtures/iow_roadworks.json
+++ b/.cypress/cypress/fixtures/iow_roadworks.json
@@ -1,97 +1,16 @@
 {
-  "query": {
-    "recordcount": 38,
-    "columnlist": "se_id,phase_id,u_se_id,longitude,latitude,gsymbol_id,tooltip,swtype,org_name_disp,promoter,source,promoter_works_ref,originator_ref,swa_org_ref,promoter_org_ref,publisher_orgref,publisher_organisation_id,promoter_organisation_id,organisation_id,lha_id,start_date,end_date,works_state,impact,works_desc,geom_type,geojson_wgs84,tm_cat",
-    "data": {
-      "se_id": [
-        114013162
-      ],
-      "phase_id": [
-        1
-      ],
-      "u_se_id": [
-        "114013162:1"
-      ],
-      "longitude": [
-        -1.29574
-      ],
-      "latitude": [
-        50.71086
-      ],
-      "gsymbol_id": [
-        "gcln01y"
-      ],
-      "tooltip": [
-        "B3401 Whitepit Lane, Newport, Isle of Wight\\n18 Jun 2019 - 23 Jul 2019\\ndelays unlikely"
-      ],
-      "swtype": [
-        "cw"
-      ],
-      "org_name_disp": [
-        "Island Roads on behalf of the Isle of Wight Council"
-      ],
-      "promoter": [
-        "Island Roads on behalf of the Isle of Wight Council"
-      ],
-      "source": [
-        "SW"
-      ],
-      "promoter_works_ref": [
-        "RF101BT0103000021728"
-      ],
-      "originator_ref": [
-        "RF101BT0103000021728"
-      ],
-      "swa_org_ref": [
-        2114
-      ],
-      "promoter_org_ref": [
-        2114
-      ],
-      "publisher_orgref": [
-        2114
-      ],
-      "publisher_organisation_id": [
-        1062
-      ],
-      "promoter_organisation_id": [
-        1062
-      ],
-      "organisation_id": [
-        1062
-      ],
-      "lha_id": [
-        62
-      ],
-      "start_date": [
-        "{ts '2019-06-18 00:00:00'}"
-      ],
-      "end_date": [
-        "{ts '2030-07-23 23:59:59'}"
-      ],
-      "works_state": [
-        4
-      ],
-      "impact": [
-        1
-      ],
-      "works_desc": [
-        "Parapet improvement NEWPORT"
-      ],
-      "geom_type": [
-        1
-      ],
-      "geojson_wgs84": [
-        "{\"type\":\"Point\",\"coordinates\":[-1.295784,50.71086]}"
-      ],
-      "tm_cat": [
-        ""
-      ]
-    }
-  },
-  "reqtoken": "",
-  "filterimpact": "1,2,3,4",
-  "filterenddate": "16/10/2019",
-  "filterstartdate": "16/07/2019",
-  "timeperiod": "cw"
+    "type":"FeatureCollection",
+    "features":[
+        {
+            "type":"Feature",
+            "geometry":{"type":"Point","coordinates":[449822,90373]},
+            "properties":{
+                "start_date":"2019-06-18T00:00:00.000Z",
+                "end_date":"2040-07-23T23:59:59.000Z",
+                "summary":"B3401 Whitepit Lane, Newport, Isle of Wight",
+                "description":"Parapet improvement NEWPORT",
+                "promoter":"Island Roads on behalf of the Isle of Wight Council"
+            }
+        }
+    ]
 }
diff --git a/.cypress/cypress/integration/bathnes.js b/.cypress/cypress/integration/bathnes.js
index 1acbd3602..5598409d9 100644
--- a/.cypress/cypress/integration/bathnes.js
+++ b/.cypress/cypress/integration/bathnes.js
@@ -19,7 +19,7 @@ it('loads the staff layer correctly', function() {
     cy.window().then(function(win){
         var llpg = 0;
         win.fixmystreet.map.layers.forEach(function(lyr) {
-            if (lyr.fixmystreet && lyr.fixmystreet.http_options.params.TYPENAME === 'LLPG') {
+            if (lyr.fixmystreet && lyr.fixmystreet.http_options && lyr.fixmystreet.http_options.params && lyr.fixmystreet.http_options.params.TYPENAME === 'LLPG') {
                 llpg++;
             }
         });
diff --git a/.cypress/cypress/integration/isleofwight.js b/.cypress/cypress/integration/isleofwight.js
index ab7039a5f..7cfb21c82 100644
--- a/.cypress/cypress/integration/isleofwight.js
+++ b/.cypress/cypress/integration/isleofwight.js
@@ -20,4 +20,17 @@ describe('When you look at the Island Roads site', function() {
     cy.get('select:eq(4)').select('Extra');
     cy.contains('Help Island Roads');
   });
+
+  it('displays nearby roadworks', function() {
+    cy.fixture('iow_roadworks.json');
+    cy.route('/streetmanager.php**', 'fixture:iow_roadworks.json').as('roadworks');
+    cy.visit('http://isleofwight.localhost:3001/');
+    cy.get('[name=pc]').type('PO30 5XJ');
+    cy.get('[name=pc]').parents('form').submit();
+    cy.get('#map_box').click();
+    cy.wait('@report-ajax');
+    cy.wait('@roadworks');
+    cy.contains('Roadworks are scheduled near this location');
+    cy.contains('Parapet improvement');
+  });
 });
diff --git a/templates/web/bathnes/footer_extra_js.html b/templates/web/bathnes/footer_extra_js.html
index e46e103e8..fcbbe6eb4 100644
--- a/templates/web/bathnes/footer_extra_js.html
+++ b/templates/web/bathnes/footer_extra_js.html
@@ -1,4 +1,11 @@
-[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 roadworks=1 %]
+[%
+IF bodyclass.match('mappage');
+    scripts.push(
+        version('/cobrands/bathnes/js.js')
+    );
+END
+%]
 [%~
 SET council_area_id = c.cobrand.council_area_id;
 IF c.user_exists AND ((c.user.from_body AND c.user.from_body.areas.$council_area_id) OR c.user.is_superuser);
diff --git a/templates/web/bexley/footer_extra_js.html b/templates/web/bexley/footer_extra_js.html
index 7369f7147..61a02cdf0 100644
--- a/templates/web/bexley/footer_extra_js.html
+++ b/templates/web/bexley/footer_extra_js.html
@@ -1 +1 @@
-[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 tfl=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 tfl=1 roadworks=1 %]
diff --git a/templates/web/bristol/footer_extra_js.html b/templates/web/bristol/footer_extra_js.html
index 3965c9d1e..60fe6822c 100644
--- a/templates/web/bristol/footer_extra_js.html
+++ b/templates/web/bristol/footer_extra_js.html
@@ -1 +1 @@
-[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 ~%]
+[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 roadworks=1 ~%]
diff --git a/templates/web/bromley/footer_extra_js.html b/templates/web/bromley/footer_extra_js.html
index c3bad670c..3a58505ef 100644
--- a/templates/web/bromley/footer_extra_js.html
+++ b/templates/web/bromley/footer_extra_js.html
@@ -2,7 +2,7 @@
     version('/jslib/jquery-1.7.2.min.js'),
     version('/cobrands/bromley/a-z-nav.js'),
 ) %]
-[% PROCESS 'footer_extra_js_base.html' cobrand_js=1 validation=1 tfl=1 %]
+[% PROCESS 'footer_extra_js_base.html' cobrand_js=1 validation=1 tfl=1 roadworks=1 %]
 [% IF bodyclass.match('mappage');
     scripts.push(
         version('/cobrands/bromley/map.js'),
diff --git a/templates/web/buckinghamshire/footer_extra_js.html b/templates/web/buckinghamshire/footer_extra_js.html
index 9132ead25..3e2eca135 100644
--- a/templates/web/buckinghamshire/footer_extra_js.html
+++ b/templates/web/buckinghamshire/footer_extra_js.html
@@ -1 +1 @@
-[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 roadworks=1 %]
diff --git a/templates/web/cheshireeast/footer_extra_js.html b/templates/web/cheshireeast/footer_extra_js.html
index 9132ead25..3e2eca135 100644
--- a/templates/web/cheshireeast/footer_extra_js.html
+++ b/templates/web/cheshireeast/footer_extra_js.html
@@ -1 +1 @@
-[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 roadworks=1 %]
diff --git a/templates/web/fixmystreet-uk-councils/footer_extra_js_base.html b/templates/web/fixmystreet-uk-councils/footer_extra_js_base.html
index 58e2872e3..633d1f14a 100644
--- a/templates/web/fixmystreet-uk-councils/footer_extra_js_base.html
+++ b/templates/web/fixmystreet-uk-councils/footer_extra_js_base.html
@@ -20,6 +20,11 @@ IF bodyclass.match('mappage');
             version('/cobrands/highways/assets.js'),
         );
     END;
+    IF roadworks;
+        scripts.push(
+            version('/cobrands/fixmystreet-uk-councils/roadworks.js'),
+        );
+    END;
     IF tfl;
         scripts.push(
             version('/cobrands/tfl/assets.js'),
diff --git a/templates/web/hounslow/footer_extra_js.html b/templates/web/hounslow/footer_extra_js.html
index 081ec3a12..84531dee6 100644
--- a/templates/web/hounslow/footer_extra_js.html
+++ b/templates/web/hounslow/footer_extra_js.html
@@ -1,4 +1,4 @@
-[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 tfl=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 tfl=1 roadworks=1 %]
 [%
 IF bodyclass.match('mappage');
   scripts.push(
diff --git a/templates/web/isleofwight/footer_extra_js.html b/templates/web/isleofwight/footer_extra_js.html
index a7cea7811..379ace871 100644
--- a/templates/web/isleofwight/footer_extra_js.html
+++ b/templates/web/isleofwight/footer_extra_js.html
@@ -1,4 +1,4 @@
-[% PROCESS 'footer_extra_js_base.html' cobrand_js=1 %]
+[% PROCESS 'footer_extra_js_base.html' cobrand_js=1 roadworks=1 %]
 [% IF bodyclass.match('mappage');
     scripts.push(
         version('/cobrands/isleofwight/js.js'),
diff --git a/templates/web/lincolnshire/footer_extra_js.html b/templates/web/lincolnshire/footer_extra_js.html
index 9132ead25..3e2eca135 100644
--- a/templates/web/lincolnshire/footer_extra_js.html
+++ b/templates/web/lincolnshire/footer_extra_js.html
@@ -1 +1 @@
-[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 roadworks=1 %]
diff --git a/templates/web/northamptonshire/footer_extra_js.html b/templates/web/northamptonshire/footer_extra_js.html
index fbd33dd11..523f441cf 100644
--- a/templates/web/northamptonshire/footer_extra_js.html
+++ b/templates/web/northamptonshire/footer_extra_js.html
@@ -4,4 +4,4 @@ IF bodyclass.match('mappage');
     version('/cobrands/fixmystreet-uk-councils/alloy.js'),
   );
 END %]
-[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 roadworks=1 %]
diff --git a/templates/web/oxfordshire/footer_extra_js.html b/templates/web/oxfordshire/footer_extra_js.html
index 88fc006e7..12a42c0d2 100644
--- a/templates/web/oxfordshire/footer_extra_js.html
+++ b/templates/web/oxfordshire/footer_extra_js.html
@@ -1 +1 @@
-[% PROCESS 'footer_extra_js_base.html' highways=1 validation=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 validation=1 roadworks=1 %]
diff --git a/templates/web/peterborough/footer_extra_js.html b/templates/web/peterborough/footer_extra_js.html
index 9132ead25..3e2eca135 100644
--- a/templates/web/peterborough/footer_extra_js.html
+++ b/templates/web/peterborough/footer_extra_js.html
@@ -1 +1 @@
-[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 roadworks=1 %]
diff --git a/templates/web/westminster/footer_extra_js.html b/templates/web/westminster/footer_extra_js.html
index f6e8c8bf9..c4896cfbe 100644
--- a/templates/web/westminster/footer_extra_js.html
+++ b/templates/web/westminster/footer_extra_js.html
@@ -1 +1 @@
-[% PROCESS 'footer_extra_js_base.html' cobrand_js=1 tfl=1 %]
+[% PROCESS 'footer_extra_js_base.html' cobrand_js=1 tfl=1 roadworks=1 %]
diff --git a/web/cobrands/bathnes/js.js b/web/cobrands/bathnes/js.js
new file mode 100644
index 000000000..f76da5cd5
--- /dev/null
+++ b/web/cobrands/bathnes/js.js
@@ -0,0 +1,11 @@
+fixmystreet.roadworks.config = {
+    tag_top: 'h3',
+    colon: true,
+    text_after: "<p>If you think this issue needs immediate attention you can continue your report below</p>"
+};
+
+fixmystreet.roadworks.filter = function(feature) {
+  var category = $('select#form_category').val(),
+      categories = ['Damage to pavement', 'Damage to road', 'Faded road markings', 'Damaged Railing, manhole, or drain cover'];
+    return OpenLayers.Util.indexOf(categories, category) != -1;
+};
diff --git a/web/cobrands/fixmystreet-uk-councils/roadworks.js b/web/cobrands/fixmystreet-uk-councils/roadworks.js
new file mode 100644
index 000000000..a3eec7b1f
--- /dev/null
+++ b/web/cobrands/fixmystreet-uk-councils/roadworks.js
@@ -0,0 +1,82 @@
+/* Using this file, you also need to include the JavaScript file
+ * OpenLayers.Projection.OrdnanceSurvey.js for the 27700 conversion, and an
+ * OpenLayers build that includes OpenLayers.Layer.SphericalMercator and
+ * OpenLayers.Format.GeoJSON.
+ */
+
+(function(){
+
+var roadworks_defaults = {
+    http_options: {
+        url: "https://tilma.mysociety.org/streetmanager.php"
+    },
+    srsName: "EPSG:27700",
+    format_class: OpenLayers.Format.GeoJSON,
+    strategy_class: OpenLayers.Strategy.FixMyStreet,
+    stylemap: fixmystreet.assets.stylemap_invisible,
+    non_interactive: true,
+    always_visible: true,
+    nearest_radius: 100,
+    road: true,
+    all_categories: true,
+    actions: {
+        found: function(layer, feature) {
+            $(".js-roadworks-message-" + layer.id).remove();
+            if (!fixmystreet.roadworks.filter || fixmystreet.roadworks.filter(feature)) {
+                fixmystreet.roadworks.display_message(feature);
+                return true;
+            }
+        },
+        not_found: function(layer) {
+            $(".js-roadworks-message-" + layer.id).remove();
+        }
+    }
+};
+
+fixmystreet.roadworks = {};
+
+// fixmystreet.map.layers[5].getNearestFeature(new OpenLayers.Geometry.Point(-0.835614, 51.816562).transform(new OpenLayers.Projection("EPSG:4326"), new OpenLayers.Projection("EPSG:3857")), 10)
+
+fixmystreet.roadworks.config = {};
+
+fixmystreet.roadworks.display_message = function(feature) {
+    var attr = feature.attributes,
+        start = new Date(attr.start_date).toDateString(),
+        end = new Date(attr.end_date).toDateString(),
+        summary = attr.summary,
+        desc = attr.description;
+
+    var config = this.config,
+        summary_heading_text = config.summary_heading_text || 'Summary',
+        tag_top = config.tag_top || 'p',
+        colon = config.colon ? ':' : '';
+
+    var $msg = $('<div class="js-roadworks-message js-roadworks-message-' + feature.layer.id + ' box-warning"><' + tag_top + '>Roadworks are scheduled near this location, so you may not need to report your issue.</' + tag_top + '></div>');
+    var $dl = $("<dl></dl>").appendTo($msg);
+    $dl.append("<dt>Dates" + colon + "</dt>");
+    var $dates = $("<dd></dd>").appendTo($dl);
+    $dates.text(start + " until " + end);
+    if (config.extra_dates_text) {
+        $dates.append('<br>' + config.extra_dates_text);
+    }
+    $dl.append("<dt>" + summary_heading_text + colon + "</dt>");
+    $dl.append($("<dd></dd>").text(summary));
+    if (desc) {
+        $dl.append("<dt>Description" + colon + "</dt>");
+        $dl.append($("<dd></dd>").text(desc));
+    }
+    if (attr.promoter) {
+        $dl.append("<dt>Responsibility</dt>");
+        $dl.append($("<dd></dd>").text(attr.promoter));
+    }
+
+    if (config.text_after) {
+        $dl.append(config.text_after);
+    }
+
+    $msg.prependTo('#js-post-category-messages');
+};
+
+fixmystreet.assets.add(roadworks_defaults);
+
+})();
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index f86af2386..07bb2baa1 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -2184,6 +2184,10 @@ label .muted {
         margin-bottom: 0.5em;
     }
 
+    dd:last-child {
+        margin-bottom: 0;
+    }
+
     .btn, .btn-primary {
         margin: 0.5em 0 1em 0;
 
-- 
cgit v1.2.3


From 76b2704d4e9a0b0d2c8af704a68652d7b4d81780 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 9 Jul 2020 15:41:18 +0100
Subject: [Bromley] Tidy up tilma URL bits.

---
 perllib/FixMyStreet/Map/Bromley.pm |  4 +---
 perllib/FixMyStreet/Map/FMS.pm     | 12 +++++-------
 web/cobrands/bromley/map.js        |  2 +-
 web/js/map-fms.js                  |  8 +++++---
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/perllib/FixMyStreet/Map/Bromley.pm b/perllib/FixMyStreet/Map/Bromley.pm
index 518382fc0..29063778e 100644
--- a/perllib/FixMyStreet/Map/Bromley.pm
+++ b/perllib/FixMyStreet/Map/Bromley.pm
@@ -9,8 +9,6 @@ use base 'FixMyStreet::Map::FMS';
 
 use strict;
 
-sub map_tile_base {
-    '-', "//%stilma.mysociety.org/bromley/%d/%d/%d.png";
-}
+sub map_tile_base { "bromley" }
 
 1;
diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm
index 126fc34bf..0cb1de553 100644
--- a/perllib/FixMyStreet/Map/FMS.pm
+++ b/perllib/FixMyStreet/Map/FMS.pm
@@ -18,20 +18,18 @@ sub map_javascript { [
     '/js/map-fms.js',
 ] }
 
-sub map_tile_base {
-    '-', "//%stilma.mysociety.org/oml/%d/%d/%d.png";
-}
+sub map_tile_base { "oml" }
 
 sub map_tiles {
     my ( $self, %params ) = @_;
     my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} );
     my $ni = in_northern_ireland_box( $params{latitude}, $params{longitude} );
     if (!$ni && $z >= 16) {
-        my ($tile_sep, $tile_base) = $self->map_tile_base;
+        my $tile_base = '//%stilma.mysociety.org/' . $self->map_tile_base . '/%d/%d/%d.png';
         return [
-            sprintf($tile_base, 'a' . $tile_sep, $z, $x-1, $y-1),
-            sprintf($tile_base, 'b' . $tile_sep, $z, $x, $y-1),
-            sprintf($tile_base, 'c' . $tile_sep, $z, $x-1, $y),
+            sprintf($tile_base, 'a-', $z, $x-1, $y-1),
+            sprintf($tile_base, 'b-', $z, $x, $y-1),
+            sprintf($tile_base, 'c-', $z, $x-1, $y),
             sprintf($tile_base, '', $z, $x, $y),
         ];
     } else {
diff --git a/web/cobrands/bromley/map.js b/web/cobrands/bromley/map.js
index 0753907cc..056dee0b9 100644
--- a/web/cobrands/bromley/map.js
+++ b/web/cobrands/bromley/map.js
@@ -1 +1 @@
-fixmystreet.maps.tile_base = [ [ "", "a-" ], "https://{S}fix.bromley.gov.uk/tilma" ];
+fixmystreet.maps.tile_base = '//{S}tilma.mysociety.org/bromley';
diff --git a/web/js/map-fms.js b/web/js/map-fms.js
index 925fe1fa2..0e263c0a5 100644
--- a/web/js/map-fms.js
+++ b/web/js/map-fms.js
@@ -1,4 +1,4 @@
-fixmystreet.maps.tile_base = [ [ '', 'a-', 'b-', 'c-' ], '//{S}tilma.mysociety.org/oml' ];
+fixmystreet.maps.tile_base = '//{S}tilma.mysociety.org/oml';
 
 fixmystreet.maps.config = (function(original) {
     return function(){
@@ -52,13 +52,15 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, {
         this._updateAttribution(copyrights, logo);
     },
 
+    tile_prefix: [ '', 'a-', 'b-', 'c-' ],
+
     get_urls: function(bounds, z) {
         var urls;
         var in_uk = this.in_uk(bounds.getCenterLonLat());
         if (z >= 16 && in_uk) {
             urls = [];
-            for (var i=0; i< fixmystreet.maps.tile_base[0].length; i++) {
-                urls.push( fixmystreet.maps.tile_base[1].replace('{S}', fixmystreet.maps.tile_base[0][i]) + "/${z}/${x}/${y}.png" );
+            for (var i=0; i< this.tile_prefix.length; i++) {
+                urls.push( fixmystreet.maps.tile_base.replace('{S}', this.tile_prefix[i]) + "/${z}/${x}/${y}.png" );
             }
         } else {
             var type = '';
-- 
cgit v1.2.3


From 196e3cafcfcec0cc1a050a9d07aad81156ee794e Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 9 Jul 2020 17:38:00 +0100
Subject: Use up-to-date Bing map URLs.

---
 perllib/FixMyStreet/Map/Bing.pm |  6 ++----
 perllib/FixMyStreet/Map/FMS.pm  | 15 ++++++++-------
 web/js/map-bing-ol.js           | 15 ++++++++-------
 web/js/map-fms.js               | 25 ++++++++++++-------------
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm
index 97a0d229f..97b947902 100644
--- a/perllib/FixMyStreet/Map/Bing.pm
+++ b/perllib/FixMyStreet/Map/Bing.pm
@@ -29,14 +29,12 @@ sub get_quadkey {
     return $key;
 }
 
-sub map_tile_base {
-    '', "//ecn.%s.tiles.virtualearth.net/tiles/r%s.png?g=6570";
-}
+my $road_base = '//t%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=G,L&src=t&shading=hill&og=969&n=z';
 
 sub map_tiles {
     my ( $self, %params ) = @_;
     my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} );
-    my ($tile_sep, $tile_base) = $self->map_tile_base;
+    my $tile_base = $road_base;
     return [
         sprintf($tile_base, 't0', $self->get_quadkey($x-1, $y-1, $z)),
         sprintf($tile_base, 't1', $self->get_quadkey($x,   $y-1, $z)),
diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm
index 0cb1de553..246d04bc0 100644
--- a/perllib/FixMyStreet/Map/FMS.pm
+++ b/perllib/FixMyStreet/Map/FMS.pm
@@ -32,16 +32,17 @@ sub map_tiles {
             sprintf($tile_base, 'c-', $z, $x-1, $y),
             sprintf($tile_base, '', $z, $x, $y),
         ];
-    } else {
+    } elsif (!$ni && $z > 11) {
         my $key = FixMyStreet->config('BING_MAPS_API_KEY');
-        my $url = "g=6570";
-        $url .= "&productSet=mmOS&key=$key" if $z > 11 && !$ni;
+        my $base = "//ecn.%s.tiles.virtualearth.net/tiles/r%s?g=8702&lbl=l1&productSet=mmOS&key=$key";
         return [
-            "//ecn.t0.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x-1, $y-1, $z) . ".png?$url",
-            "//ecn.t1.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x,   $y-1, $z) . ".png?$url",
-            "//ecn.t2.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x-1, $y,   $z) . ".png?$url",
-            "//ecn.t3.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x,   $y,   $z) . ".png?$url",
+            sprintf($base, "t0", $self->get_quadkey($x-1, $y-1, $z)),
+            sprintf($base, "t1", $self->get_quadkey($x,   $y-1, $z)),
+            sprintf($base, "t2", $self->get_quadkey($x-1, $y,   $z)),
+            sprintf($base, "t3", $self->get_quadkey($x,   $y,   $z)),
         ];
+    } else {
+        return $self->SUPER::map_tiles(%params);
     }
 }
 
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index 4e01ff58b..a99fdd849 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -14,6 +14,7 @@ fixmystreet.maps.config = function() {
 };
 
 OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
+    tile_base: '//t{S}.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/${id}?mkt=en-US&it=G,L&src=t&shading=hill&og=969&n=z',
     attributionTemplate: '${logo}${copyrights}',
 
     setMap: function() {
@@ -35,7 +36,8 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
     },
 
     updateAttribution: function() {
-        var copyrights = '&copy; 2011 <a href="https://www.bing.com/maps/">Microsoft</a>. &copy; AND, Navteq';
+        var year = (new Date()).getFullYear();
+        var copyrights = '&copy; ' + year + ' <a href="https://www.bing.com/maps/">Microsoft</a>, HERE';
         var logo = '<a href="https://www.bing.com/maps/"><img border=0 src="//dev.virtualearth.net/Branding/logo_powered_by.png"></a>';
         this._updateAttribution(copyrights, logo);
     },
@@ -89,12 +91,11 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
     },
 
     get_urls: function(bounds, z) {
-        return [
-            "//ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=6570",
-            "//ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=6570",
-            "//ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=6570",
-            "//ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=6570"
-        ];
+        var urls = [];
+        for (var i=0; i<4; i++) {
+            urls.push(this.tile_base.replace('{S}', i));
+        }
+        return urls;
     },
 
     CLASS_NAME: "OpenLayers.Layer.Bing"
diff --git a/web/js/map-fms.js b/web/js/map-fms.js
index 0e263c0a5..8af6adec3 100644
--- a/web/js/map-fms.js
+++ b/web/js/map-fms.js
@@ -44,9 +44,9 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, {
         } else {
             logo = '<a href="https://www.bing.com/maps/"><img border=0 src="//dev.virtualearth.net/Branding/logo_powered_by.png"></a>';
             if (in_uk) {
-                copyrights = '&copy; ' + year + ' <a href="https://www.bing.com/maps/">Microsoft</a>. &copy; AND, Navteq, Highways England, Ordnance Survey';
+                copyrights = '&copy; ' + year + ' <a href="https://www.bing.com/maps/">Microsoft</a>, HERE, Highways England, Ordnance Survey';
             } else {
-                copyrights = '&copy; ' + year + ' <a href="https://www.bing.com/maps/">Microsoft</a>. &copy; AND, Navteq, Ordnance Survey';
+                copyrights = '&copy; ' + year + ' <a href="https://www.bing.com/maps/">Microsoft</a>, HERE, Ordnance Survey';
             }
         }
         this._updateAttribution(copyrights, logo);
@@ -55,24 +55,23 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, {
     tile_prefix: [ '', 'a-', 'b-', 'c-' ],
 
     get_urls: function(bounds, z) {
-        var urls;
+        var urls = [], i;
         var in_uk = this.in_uk(bounds.getCenterLonLat());
         if (z >= 16 && in_uk) {
             urls = [];
-            for (var i=0; i< this.tile_prefix.length; i++) {
+            for (i=0; i< this.tile_prefix.length; i++) {
                 urls.push( fixmystreet.maps.tile_base.replace('{S}', this.tile_prefix[i]) + "/${z}/${x}/${y}.png" );
             }
+        } else if (z > 11 && in_uk) {
+            var type = 'g=8702&lbl=l1&productSet=mmOS&key=' + fixmystreet.key;
+            var tile_base = "//ecn.t{S}.tiles.virtualearth.net/tiles/r${id}?" + type;
+            for (i=0; i<4; i++) {
+                urls.push(tile_base.replace('{S}', i));
+            }
         } else {
-            var type = '';
-            if (z > 11 && in_uk) {
-                type = '&productSet=mmOS&key=' + fixmystreet.key;
+            for (i=0; i<4; i++) {
+                urls.push(this.tile_base.replace('{S}', i));
             }
-            urls = [
-                "//ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type,
-                "//ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type,
-                "//ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type,
-                "//ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type
-            ];
         }
         return urls;
     },
-- 
cgit v1.2.3


From 009c42448270895f97302747a69485de432d537d Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Tue, 19 May 2020 17:02:50 +0100
Subject: Add aerial view toggle to Bing Maps & subclasses.

Co-authored-by: Dave Arter <davea@mysociety.org>
Co-authored-by: Matthew Somerville <matthew@mysociety.org>
---
 perllib/FixMyStreet/Map/Bing.pm         | 13 +++++++++-
 templates/web/base/maps/_sub_links.html |  6 +++++
 templates/web/base/maps/bing.html       |  9 +++++++
 templates/web/base/maps/fms.html        | 12 ++++++---
 templates/web/base/maps/google-ol.html  |  9 +------
 web/js/map-OpenLayers.js                |  2 ++
 web/js/map-bing-ol.js                   | 43 ++++++++++++++++++++++++++++++++-
 web/js/map-fms.js                       | 12 ++++-----
 web/js/map-mastermap.js                 |  5 ++++
 9 files changed, 91 insertions(+), 20 deletions(-)
 create mode 100644 templates/web/base/maps/_sub_links.html
 create mode 100644 templates/web/base/maps/bing.html

diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm
index 97b947902..4463b4ed2 100644
--- a/perllib/FixMyStreet/Map/Bing.pm
+++ b/perllib/FixMyStreet/Map/Bing.pm
@@ -8,6 +8,8 @@ use strict;
 
 sub map_type { '' }
 
+sub map_template { 'bing' }
+
 sub map_javascript { [
     '/vendor/OpenLayers/OpenLayers.fixmystreet.js',
     '/js/map-OpenLayers.js',
@@ -29,12 +31,21 @@ sub get_quadkey {
     return $key;
 }
 
+sub display_map {
+    my ($self, $c, %params) = @_;
+
+    $params{aerial} = $c->get_param("aerial") ? 1 : 0;
+
+    $self->SUPER::display_map($c, %params);
+}
+
 my $road_base = '//t%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=G,L&src=t&shading=hill&og=969&n=z';
+my $aerial_base = '//t%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=A,G,L&src=t&og=969&n=z';
 
 sub map_tiles {
     my ( $self, %params ) = @_;
     my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} );
-    my $tile_base = $road_base;
+    my $tile_base = $params{aerial} ? $aerial_base : $road_base;
     return [
         sprintf($tile_base, 't0', $self->get_quadkey($x-1, $y-1, $z)),
         sprintf($tile_base, 't1', $self->get_quadkey($x,   $y-1, $z)),
diff --git a/templates/web/base/maps/_sub_links.html b/templates/web/base/maps/_sub_links.html
new file mode 100644
index 000000000..d58ecf97c
--- /dev/null
+++ b/templates/web/base/maps/_sub_links.html
@@ -0,0 +1,6 @@
+[% INCLUDE maps/openlayers.html %]
+[% UNLESS around_page %]
+<p class="sub-map-links" id="sub_map_links">
+     [% map_sub_links | safe %]
+</p>
+[% END %]
diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html
new file mode 100644
index 000000000..7d2c379c4
--- /dev/null
+++ b/templates/web/base/maps/bing.html
@@ -0,0 +1,9 @@
+[% map_sub_links = BLOCK %]
+    [% IF c.req.params.aerial %]
+        <a id="map_layer_toggle" href="[% c.uri_with( { aerial => 0 } ) %]">[% loc('Roads') %]</a>
+    [% ELSE %]
+        <a id="map_layer_toggle" href="[% c.uri_with( { aerial => 1 } ) %]">[% loc('Aerial') %]</a>
+    [% END %]
+[% END %]
+
+[% map_html = INCLUDE maps/_sub_links.html %]
diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html
index 286ecc8ff..739c00b4e 100644
--- a/templates/web/base/maps/fms.html
+++ b/templates/web/base/maps/fms.html
@@ -1,3 +1,9 @@
-[%
-map_html = INCLUDE maps/openlayers.html include_key = 1
-%]
+[% map_sub_links = BLOCK %]
+    [% IF c.req.params.aerial %]
+        <a id="map_layer_toggle" href="[% c.uri_with( { aerial => 0 } ) %]">[% loc('Roads') %]</a>
+    [% ELSE %]
+        <a id="map_layer_toggle" href="[% c.uri_with( { aerial => 1 } ) %]">[% loc('Aerial') %]</a>
+    [% END %]
+[% END %]
+
+[% map_html = INCLUDE maps/_sub_links.html include_key = 1 %]
diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html
index 47c940129..eb68ae804 100644
--- a/templates/web/base/maps/google-ol.html
+++ b/templates/web/base/maps/google-ol.html
@@ -2,11 +2,4 @@
 <a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Satellite') %]</a>
 [% END %]
 
-[% map_html = BLOCK %]
-[% INCLUDE maps/openlayers.html %]
-[% UNLESS around_page %]
-<p class="sub-map-links" id="sub_map_links">
-     [% map_sub_links | safe %]
-</p>
-[% END %]
-[% END %]
+[% map_html = INCLUDE maps/_sub_links.html %]
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index d5fd36e97..3db59f218 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -958,6 +958,8 @@ $.extend(fixmystreet.utils, {
                 );
             } else if (layer_options.matrixIds) {
                 layer = new fixmystreet.map_type(layer_options);
+            } else if (fixmystreet.layer_options[i].map_type) {
+                layer = new fixmystreet.layer_options[i].map_type(fixmystreet.layer_name, layer_options);
             } else {
                 layer = new fixmystreet.map_type(fixmystreet.layer_name, layer_options);
             }
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index a99fdd849..bbaf22940 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -10,9 +10,21 @@ fixmystreet.maps.config = function() {
     if ( fixmystreet.page == 'report' ) {
         fixmystreet.controls.push( new OpenLayers.Control.PermalinkFMS('key-tool-problems-nearby', '/around') );
     }
-    fixmystreet.map_type = OpenLayers.Layer.Bing;
 };
 
+(function() {
+    $(function(){
+        $('#map_layer_toggle').toggle(function(){
+            $(this).text('Roads');
+            fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]);
+        }, function(){
+            $(this).text('Aerial');
+            fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]);
+        });
+    });
+
+})();
+
 OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
     tile_base: '//t{S}.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/${id}?mkt=en-US&it=G,L&src=t&shading=hill&og=969&n=z',
     attributionTemplate: '${logo}${copyrights}',
@@ -100,3 +112,32 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
 
     CLASS_NAME: "OpenLayers.Layer.Bing"
 });
+
+OpenLayers.Layer.BingAerial = OpenLayers.Class(OpenLayers.Layer.Bing, {
+    tile_base: '//t{S}.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/${id}?mkt=en-US&it=A,G,L&src=t&og=969&n=z',
+
+    setMap: function() {
+        OpenLayers.Layer.Bing.prototype.setMap.apply(this, arguments);
+        this.map.events.register("moveend", this, this.updateAttribution);
+    },
+
+    updateAttribution: function() {
+        var z = this.map.getZoom() + this.zoomOffset;
+        var year = (new Date()).getFullYear();
+        var copyrights = '&copy; ' + year + ' <a href="https://www.bing.com/maps/">Microsoft</a>, HERE, ';
+        if (z >= 13) {
+            copyrights += 'Maxar, CNES Distribution Airbus DS';
+        } else {
+            copyrights += 'Earthstar Geographics SIO';
+        }
+        var logo = '<a href="https://www.bing.com/maps/"><img border=0 src="//dev.virtualearth.net/Branding/logo_powered_by.png"></a>';
+        this._updateAttribution(copyrights, logo);
+    },
+
+    CLASS_NAME: "OpenLayers.Layer.BingAerial"
+});
+
+fixmystreet.layer_options = [
+  { map_type: OpenLayers.Layer.Bing },
+  { map_type: OpenLayers.Layer.BingAerial }
+];
diff --git a/web/js/map-fms.js b/web/js/map-fms.js
index 8af6adec3..bb51467a7 100644
--- a/web/js/map-fms.js
+++ b/web/js/map-fms.js
@@ -1,12 +1,5 @@
 fixmystreet.maps.tile_base = '//{S}tilma.mysociety.org/oml';
 
-fixmystreet.maps.config = (function(original) {
-    return function(){
-        original();
-        fixmystreet.map_type = OpenLayers.Layer.BingUK;
-    };
-})(fixmystreet.maps.config);
-
 OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, {
     uk_bounds: [
         new OpenLayers.Bounds(-6.6, 49.8, 1.102680, 51),
@@ -78,3 +71,8 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, {
 
     CLASS_NAME: "OpenLayers.Layer.BingUK"
 });
+
+fixmystreet.layer_options = [
+  { map_type: OpenLayers.Layer.BingUK },
+  { map_type: OpenLayers.Layer.BingAerial }
+];
diff --git a/web/js/map-mastermap.js b/web/js/map-mastermap.js
index bb9adf532..663ccbdfb 100644
--- a/web/js/map-mastermap.js
+++ b/web/js/map-mastermap.js
@@ -23,3 +23,8 @@ OpenLayers.Layer.MasterMap = OpenLayers.Class(OpenLayers.Layer.BingUK, {
 
     CLASS_NAME: "OpenLayers.Layer.MasterMap"
 });
+
+fixmystreet.layer_options = [
+  { map_type: OpenLayers.Layer.MasterMap },
+  { map_type: OpenLayers.Layer.BingAerial }
+];
-- 
cgit v1.2.3


From 71f4787dce0dec5c2f7157f106a5b539c24c6071 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 10 Jul 2020 19:27:34 +0100
Subject: [Open311] Make exclude field list case-insensitive.

---
 perllib/FixMyStreet/SendReport/Open311.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm
index e8e840ef5..5c4407094 100644
--- a/perllib/FixMyStreet/SendReport/Open311.pm
+++ b/perllib/FixMyStreet/SendReport/Open311.pm
@@ -47,7 +47,7 @@ sub send {
         push @$extra, @$include if $include;
         if ($exclude) {
             $exclude = join('|', @$exclude);
-            @$extra = grep { $_->{name} !~ /$exclude/ } @$extra;
+            @$extra = grep { $_->{name} !~ /$exclude/i } @$extra;
         }
 
         my $id_field = $contact->id_field;
-- 
cgit v1.2.3


From 3f6eb19ac70f4200379a8a57724900eb8c4e2435 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 10 Jul 2020 20:08:37 +0100
Subject: [Peterborough,TfL] Remove unneeded CSS.

---
 web/cobrands/peterborough/base.scss | 14 --------------
 web/cobrands/tfl/_colours.scss      |  3 ++-
 web/cobrands/tfl/base.scss          |  4 ----
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/web/cobrands/peterborough/base.scss b/web/cobrands/peterborough/base.scss
index 32d883132..9039cfd87 100644
--- a/web/cobrands/peterborough/base.scss
+++ b/web/cobrands/peterborough/base.scss
@@ -78,20 +78,6 @@ h1, h2 {
     font-weight: 700;
 }
 
-a,
-.fake-link   {
-  color: $link-color;
-
-  &:visited {
-    color: $link-visited-color;
-  }
-
-  &:hover,
-  &:active {
-    color: $link-hover-color;
-  }
-}
-
 .dz-clickable .dz-message u {
     color: $link-color;
 }
diff --git a/web/cobrands/tfl/_colours.scss b/web/cobrands/tfl/_colours.scss
index 1cffc3f55..b175dcd26 100644
--- a/web/cobrands/tfl/_colours.scss
+++ b/web/cobrands/tfl/_colours.scss
@@ -33,6 +33,7 @@ $primary_b: $johnston-black;
 $primary_text: $johnston-black;
 
 $link-color: $beck-blue;
+$link-text-decoration: 'underline';
 $link-hover-color: $blue-dark;
 
 $base_bg: $white;
@@ -73,4 +74,4 @@ $header-top-border: false;
   background-color: $white;
   box-shadow: none;
   padding: 0.4em;
-}
\ No newline at end of file
+}
diff --git a/web/cobrands/tfl/base.scss b/web/cobrands/tfl/base.scss
index 43ac90612..2625596d5 100644
--- a/web/cobrands/tfl/base.scss
+++ b/web/cobrands/tfl/base.scss
@@ -55,10 +55,6 @@ h3 {
     line-height: 1.238095238em; //26px
 }
 
-a, .fake-link {
-    text-decoration: underline;
-}
-
 .btn--primary,
 .btn,
 .green-btn {
-- 
cgit v1.2.3


From 6380aaa7f0294895578fa021c81f61905e4c213e Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Tue, 10 Mar 2020 17:58:48 +0000
Subject: [Northamptonshire] handle further investigation state

If an update has an external_status code of further we display 'Under
futher investigation' on the site. This is for acknowledging comments
from users.
---
 perllib/FixMyStreet/Cobrand/Northamptonshire.pm | 13 +++++++++++++
 perllib/FixMyStreet/DB/Result/Comment.pm        | 10 ++++++----
 t/cobrand/northamptonshire.t                    | 26 +++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm
index 791e2f83f..26c8706cc 100644
--- a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm
@@ -75,6 +75,19 @@ sub problems_on_map_restriction {
     return $self->problems_restriction($rs);
 }
 
+sub problem_state_processed {
+    my ($self, $comment) = @_;
+
+    my $state = $comment->problem_state || '';
+    my $code = $comment->get_extra_metadata('external_status_code') || '';
+
+    if ( $state eq 'investigating' and $code eq 'further' ) {
+        $state = 'Under further investigation';
+    }
+
+    return $state;
+}
+
 sub privacy_policy_url {
     'https://www3.northamptonshire.gov.uk/councilservices/council-and-democracy/transparency/information-policies/privacy-notice/place/Pages/street-doctor.aspx'
 }
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index b217bf96c..68e267d00 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -265,16 +265,18 @@ sub meta_line {
 };
 
 sub problem_state_processed {
-    my $self = shift;
+    my ( $self, $c ) = @_;
     return 'fixed - user' if $self->mark_fixed;
     return 'confirmed' if $self->mark_open;
-    return $self->problem_state;
+    my $cobrand_state = $c->cobrand->call_hook(problem_state_processed => $self);
+
+    return $cobrand_state || $self->problem_state;
 }
 
 sub problem_state_display {
     my ( $self, $c ) = @_;
 
-    my $state = $self->problem_state_processed;
+    my $state = $self->problem_state_processed($c);
     return '' unless $state;
 
     my $cobrand_name = $c->cobrand->moniker;
@@ -323,7 +325,7 @@ sub as_hashref {
         created => $self->created,
     };
 
-    $out->{problem_state} = $self->problem_state_processed;
+    $out->{problem_state} = $self->problem_state_processed($c);
 
     $out->{photos} = [ map { $_->{url} } @{$self->photos} ] if !$cols || $cols->{photos};
 
diff --git a/t/cobrand/northamptonshire.t b/t/cobrand/northamptonshire.t
index 57fe319a9..11b22bdb0 100644
--- a/t/cobrand/northamptonshire.t
+++ b/t/cobrand/northamptonshire.t
@@ -107,6 +107,32 @@ subtest 'check updates disallowed correctly' => sub {
     is $cobrand->updates_disallowed($report), 1;
 };
 
+subtest 'check further investigation state' => sub {
+    $comment->problem_state('investigating');
+    $comment->update();
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $mech->get_ok('/report/' . $comment->problem_id);
+    };
+
+    $mech->content_lacks('Under further investigation');
+
+    $comment->set_extra_metadata('external_status_code' => 'further');
+    $comment->update;
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $mech->get_ok('/report/' . $comment->problem_id);
+    };
+
+    $mech->content_contains('Under further investigation');
+};
+
 subtest 'check pin colour / reference shown' => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => 'northamptonshire',
-- 
cgit v1.2.3


From 102824cc005f48ba751e8cbb445c304cc1e25098 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 14 Jul 2020 09:17:41 +0100
Subject: Fix non-JS aerial tile display.

---
 perllib/FixMyStreet/Map/Bing.pm |  4 +--
 perllib/FixMyStreet/Map/FMS.pm  |  8 +++---
 t/map/bing.t                    | 12 +++++++++
 t/map/fms.t                     | 55 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 t/map/bing.t
 create mode 100644 t/map/fms.t

diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm
index 4463b4ed2..723dcd6dc 100644
--- a/perllib/FixMyStreet/Map/Bing.pm
+++ b/perllib/FixMyStreet/Map/Bing.pm
@@ -39,8 +39,8 @@ sub display_map {
     $self->SUPER::display_map($c, %params);
 }
 
-my $road_base = '//t%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=G,L&src=t&shading=hill&og=969&n=z';
-my $aerial_base = '//t%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=A,G,L&src=t&og=969&n=z';
+my $road_base = '//%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=G,L&src=t&shading=hill&og=969&n=z';
+my $aerial_base = '//%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=A,G,L&src=t&og=969&n=z';
 
 sub map_tiles {
     my ( $self, %params ) = @_;
diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm
index 246d04bc0..1b556f6b3 100644
--- a/perllib/FixMyStreet/Map/FMS.pm
+++ b/perllib/FixMyStreet/Map/FMS.pm
@@ -24,7 +24,9 @@ sub map_tiles {
     my ( $self, %params ) = @_;
     my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} );
     my $ni = in_northern_ireland_box( $params{latitude}, $params{longitude} );
-    if (!$ni && $z >= 16) {
+    if ($params{aerial} || $ni || $z <= 11) {
+        return $self->SUPER::map_tiles(%params);
+    } elsif ($z >= 16) {
         my $tile_base = '//%stilma.mysociety.org/' . $self->map_tile_base . '/%d/%d/%d.png';
         return [
             sprintf($tile_base, 'a-', $z, $x-1, $y-1),
@@ -32,7 +34,7 @@ sub map_tiles {
             sprintf($tile_base, 'c-', $z, $x-1, $y),
             sprintf($tile_base, '', $z, $x, $y),
         ];
-    } elsif (!$ni && $z > 11) {
+    } elsif ($z > 11) {
         my $key = FixMyStreet->config('BING_MAPS_API_KEY');
         my $base = "//ecn.%s.tiles.virtualearth.net/tiles/r%s?g=8702&lbl=l1&productSet=mmOS&key=$key";
         return [
@@ -41,8 +43,6 @@ sub map_tiles {
             sprintf($base, "t2", $self->get_quadkey($x-1, $y,   $z)),
             sprintf($base, "t3", $self->get_quadkey($x,   $y,   $z)),
         ];
-    } else {
-        return $self->SUPER::map_tiles(%params);
     }
 }
 
diff --git a/t/map/bing.t b/t/map/bing.t
new file mode 100644
index 000000000..ae8391871
--- /dev/null
+++ b/t/map/bing.t
@@ -0,0 +1,12 @@
+use Test::More;
+use FixMyStreet::Map::Bing;
+
+my $tiles = FixMyStreet::Map::Bing->map_tiles(x_tile => 8105, y_tile => 5375, zoom_act => 14);
+$tiles = [ map { m{ch/([^?]*)}; $1; } @$tiles ];
+is_deeply $tiles, [ '03131132323220', '03131132323221', '03131132323222', '03131132323223' ];
+
+$tiles = FixMyStreet::Map::Bing->map_tiles(x_tile => 8105, y_tile => 5375, zoom_act => 14, aerial => 1);
+$tiles = [ map { m{ch/([^?]*)\?.*A,G,L}; $1; } @$tiles ];
+is_deeply $tiles, [ '03131132323220', '03131132323221', '03131132323222', '03131132323223' ];
+
+done_testing();
diff --git a/t/map/fms.t b/t/map/fms.t
new file mode 100644
index 000000000..3a562db26
--- /dev/null
+++ b/t/map/fms.t
@@ -0,0 +1,55 @@
+use Test::More;
+use FixMyStreet::Map::FMS;
+
+#   Z   NI  Aerial
+my $expected = {
+    10 => {
+        0 => {
+            0 => 'ch/1010100100.*?=G,L',
+            1 => 'ch/1010100100.*?A,G,L',
+        },
+        1 => {
+            0 => 'ch/1010100100.*?=G,L',
+            1 => 'ch/1010100100.*?A,G,L',
+       },
+    },
+    13 => {
+        0 => {
+            0 => 'r3131010100100.*?mmOS',
+            1 => 'ch/3131010100100.*?A,G,L',
+        },
+        1 => {
+            0 => 'ch/3131010100100.*?=G,L',
+            1 => 'ch/3131010100100.*?A,G,L',
+        },
+    },
+    16 => {
+        0 => {
+            0 => 'oml/16/32420/21504',
+            1 => 'ch/0313131010100100.*?A,G,L',
+        },
+        1 => {
+            0 => 'ch/0313131010100100.*?=G,L',
+            1 => 'ch/0313131010100100.*?A,G,L',
+        },
+    },
+};
+
+subtest "Correct tiles with various parameters" => sub {
+    for my $aerial (0, 1) {
+        for my $ni (0, 1) {
+            for my $zoom (qw(10 13 16)) {
+                my $tiles = FixMyStreet::Map::FMS->map_tiles(
+                    x_tile => 32421, y_tile => 21505, zoom_act => $zoom,
+                    aerial => $aerial,
+                    latitude => $ni ? 55 : 51,
+                    longitude => $ni ? -6 : -2,
+                );
+                my $wanted = $expected->{$zoom}{$ni}{$aerial};
+                like $tiles->[0], qr/$wanted/, "with zoom $zoom, NI $ni, aerial $aerial";
+            }
+        }
+    }
+};
+
+done_testing();
-- 
cgit v1.2.3


From c3313f7206e832a7e78890b21372cdf72bdf70ad Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 14 Jul 2020 09:23:21 +0100
Subject: Make aerial/roads translatable in JavaScript.

---
 templates/web/base/js/translation_strings.html | 2 ++
 web/js/map-bing-ol.js                          | 9 ++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html
index 2eb652c1f..4c4902fc5 100644
--- a/templates/web/base/js/translation_strings.html
+++ b/templates/web/base/js/translation_strings.html
@@ -64,6 +64,8 @@ fixmystreet.password_minimum_length = [% c.cobrand.password_minimum_length %];
 
         map_map: '[% loc('Map', "JS") %]',
         map_satellite: '[% loc('Satellite', "JS") %]',
+        map_aerial: '[% loc('Aerial', "JS") %]',
+        map_roads: '[% loc('Roads', "JS") %]',
 
         expand_map: '[% loc('Expand map', "JS") %]',
         collapse_map: '[% loc('Collapse map', "JS") %]',
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index bbaf22940..a329c4235 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -14,15 +14,10 @@ fixmystreet.maps.config = function() {
 
 (function() {
     $(function(){
-        $('#map_layer_toggle').toggle(function(){
-            $(this).text('Roads');
-            fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]);
-        }, function(){
-            $(this).text('Aerial');
-            fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]);
+            $(this).text(translation_strings.map_roads);
+            $(this).text(translation_strings.map_aerial);
         });
     });
-
 })();
 
 OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
-- 
cgit v1.2.3


From eed6158981240afce10824e82fa86f14b38f3167 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 14 Jul 2020 09:24:02 +0100
Subject: Remove use of jQuery toggle().

---
 web/js/map-bing-ol.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index a329c4235..b0e5dfc6a 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -14,8 +14,16 @@ fixmystreet.maps.config = function() {
 
 (function() {
     $(function(){
-            $(this).text(translation_strings.map_roads);
-            $(this).text(translation_strings.map_aerial);
+        $('#map_layer_toggle').click(function(e) {
+            e.preventDefault();
+            var $this = $(this);
+            if ($this.text() == translation_strings.map_aerial) {
+                $this.text(translation_strings.map_roads);
+                fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]);
+            } else {
+                $this.text(translation_strings.map_aerial);
+                fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]);
+            }
         });
     });
 })();
-- 
cgit v1.2.3


From 0e78353e0afb2e074b91a8cbaeae2a1f3715fea8 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 14 Jul 2020 14:10:33 +0100
Subject: [.com] Fix original-reporter-only update message.

The function call was changed/renamed in 4fe75bb17.
---
 t/cobrand/isleofwight.t                                     | 13 ++++++++++++-
 .../fixmystreet.com/report/_updates_disallowed_message.html |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/t/cobrand/isleofwight.t b/t/cobrand/isleofwight.t
index 3cac710da..303cdbc07 100644
--- a/t/cobrand/isleofwight.t
+++ b/t/cobrand/isleofwight.t
@@ -116,13 +116,24 @@ subtest "only original reporter can comment" => sub {
     };
 };
 
+subtest "only original reporter can comment" => sub {
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+        ALLOWED_COBRANDS => 'fixmystreet',
+        COBRAND_FEATURES => { updates_allowed => { fixmystreet => { 'Isle of Wight' => 'reporter' } } },
+    }, sub {
+        $mech->log_out_ok;
+        $mech->get_ok('/report/' . $reports[0]->id);
+        $mech->content_contains('Only the original reporter may leave updates');
+    };
+};
+
 subtest "check moderation label uses correct name" => sub {
     my $REPORT_URL = '/report/' . $reports[0]->id;
     FixMyStreet::override_config {
         MAPIT_URL => 'http://mapit.uk/',
         ALLOWED_COBRANDS => ['isleofwight'],
     }, sub {
-        $mech->log_out_ok;
         $mech->log_in_ok( $iow_user->email );
         $mech->get_ok($REPORT_URL);
         $mech->content_lacks('show-moderation');
diff --git a/templates/web/fixmystreet.com/report/_updates_disallowed_message.html b/templates/web/fixmystreet.com/report/_updates_disallowed_message.html
index d2d9cf83b..d7b3d383a 100644
--- a/templates/web/fixmystreet.com/report/_updates_disallowed_message.html
+++ b/templates/web/fixmystreet.com/report/_updates_disallowed_message.html
@@ -1,4 +1,4 @@
-[% cfg = c.cobrand.updates_disallowed_config(problem).0 ~%]
+[% cfg = c.cobrand.per_body_config('updates_allowed', problem).0 ~%]
 [% IF cfg.match('reporter') AND (NOT cfg.match('open') OR problem.is_open) %]
     <p>
         Only the original reporter may leave updates.
-- 
cgit v1.2.3


From 9b7df4542b75f4463d0f3de0a8b68db32c2353a6 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 14 Jul 2020 14:51:43 +0100
Subject: [UK] Show message if site-wide update disallowed.

---
 t/app/controller/admin/bodies.t                    | 27 ++++++++++++++++++++++
 templates/web/base/admin/bodies/contact-form.html  |  1 +
 .../admin/bodies/_updates_disallowed_hint.html     |  9 ++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 templates/web/fixmystreet-uk-councils/admin/bodies/_updates_disallowed_hint.html

diff --git a/t/app/controller/admin/bodies.t b/t/app/controller/admin/bodies.t
index 80ee22630..75db6f87c 100644
--- a/t/app/controller/admin/bodies.t
+++ b/t/app/controller/admin/bodies.t
@@ -413,4 +413,31 @@ subtest 'check log of the above' => sub {
     $mech->content_contains('Edited body <a href="/admin/body/' . $body->id . '">Aberdeen City Council</a>');
 };
 
+subtest 'check update disallowed message' => sub {
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+        ALLOWED_COBRANDS => 'bathnes',
+        COBRAND_FEATURES => { updates_allowed => { bathnes => 'open' } }
+    }, sub {
+        $mech->get_ok('/admin/body/' . $body->id .'/test%20category');
+        $mech->content_contains('even if this is unticked, only open reports can have updates left on them.');
+    };
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+        ALLOWED_COBRANDS => 'bathnes',
+        COBRAND_FEATURES => { updates_allowed => { bathnes => 'staff' } }
+    }, sub {
+        $mech->get_ok('/admin/body/' . $body->id .'/test%20category');
+        $mech->content_contains('even if this is unticked, only staff will be able to leave updates.');
+    };
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+        ALLOWED_COBRANDS => 'bathnes',
+        COBRAND_FEATURES => { updates_allowed => { bathnes => 'reporter' } }
+    }, sub {
+        $mech->get_ok('/admin/body/' . $body->id .'/test%20category');
+        $mech->content_contains('even if this is unticked, only the problem reporter will be able to leave updates');
+    };
+};
+
 done_testing();
diff --git a/templates/web/base/admin/bodies/contact-form.html b/templates/web/base/admin/bodies/contact-form.html
index 21b69fdcd..e1fd2054a 100644
--- a/templates/web/base/admin/bodies/contact-form.html
+++ b/templates/web/base/admin/bodies/contact-form.html
@@ -66,6 +66,7 @@
     <p class="form-check">
         <input type="checkbox" name="updates_disallowed" value="1" id="updates_disallowed" [% ' checked' IF contact.get_extra_metadata('updates_disallowed') %]>
         <label for="updates_disallowed">[% loc('Disable updates on reports in this category') %]</label>
+        [% TRY %][% INCLUDE admin/bodies/_updates_disallowed_hint.html %][% CATCH file %][% END %]
     </p>
 
     <p class="form-check">
diff --git a/templates/web/fixmystreet-uk-councils/admin/bodies/_updates_disallowed_hint.html b/templates/web/fixmystreet-uk-councils/admin/bodies/_updates_disallowed_hint.html
new file mode 100644
index 000000000..fc9ef4867
--- /dev/null
+++ b/templates/web/fixmystreet-uk-councils/admin/bodies/_updates_disallowed_hint.html
@@ -0,0 +1,9 @@
+[% cfg = c.cobrand.feature('updates_allowed') ~%]
+<span class="form-hint">
+    This site’s configuration means even if this is unticked, only
+  [%~ IF cfg == 'staff' %] staff will be able to leave updates.
+  [%~ ELSIF cfg == 'reporter' %] the problem reporter will be able to leave updates.
+  [%~ ELSIF cfg == 'reporter-open' %] the problem reporter will be able to leave updates on open reports.
+  [%~ ELSIF cfg == 'open' %] open reports can have updates left on them.
+  [%~ END %]
+</span>
-- 
cgit v1.2.3


From 67823bc788ce744e1228a8602b9a5aa805771ced Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 10 Jul 2020 14:38:17 +0100
Subject: Centralise update creation to include fields.

Given the user, we can infer the name if not provided, and the extra
data if a staff user. We can also provide defaults for various other
fields. Always have superuser take precedence over from_body.
---
 CHANGELOG.md                                       |  1 +
 bin/fixmystreet.com/banes-close-reports            |  1 -
 bin/fixmystreet.com/buckinghamshire-flytipping     |  1 -
 bin/one-off-update-staff                           | 38 ++++++++++++++++++++++
 .../FixMyStreet/App/Controller/Admin/Reports.pm    | 24 ++------------
 perllib/FixMyStreet/App/Controller/Admin/Triage.pm | 17 ++--------
 perllib/FixMyStreet/App/Controller/Moderate.pm     |  9 ++---
 .../FixMyStreet/App/Controller/Questionnaire.pm    |  4 ---
 perllib/FixMyStreet/App/Controller/Report.pm       |  7 +---
 perllib/FixMyStreet/DB/Result/Comment.pm           | 35 ++++++++++++++++++++
 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm  | 10 +-----
 perllib/Open311/UpdatesBase.pm                     |  5 ---
 t/app/controller/admin/report_edit.t               | 22 ++-----------
 t/app/controller/admin/update_edit.t               |  4 +--
 t/app/controller/report_updates.t                  |  6 ++--
 t/app/model/comment.t                              | 25 +++++++++-----
 t/open311.t                                        |  1 +
 17 files changed, 107 insertions(+), 103 deletions(-)
 create mode 100755 bin/one-off-update-staff

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a500d688..28d37d847 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
         - Better sort admin user table.
+        - Centralise update creation to include fields.
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
diff --git a/bin/fixmystreet.com/banes-close-reports b/bin/fixmystreet.com/banes-close-reports
index bba4c88e0..79c1c44b9 100755
--- a/bin/fixmystreet.com/banes-close-reports
+++ b/bin/fixmystreet.com/banes-close-reports
@@ -50,7 +50,6 @@ my $q = FixMyStreet::DB->resultset("Problem")->search({
 # Provide some variables to the archiving script
 FixMyStreet::Script::ArchiveOldEnquiries::update_options({
     user => $body->comment_user->id,
-    user_name => $body->comment_user->name,
     closure_text => CLOSURE_TEXT,
     retain_alerts => 1,
     commit => $opts->commit,
diff --git a/bin/fixmystreet.com/buckinghamshire-flytipping b/bin/fixmystreet.com/buckinghamshire-flytipping
index a312f9fbe..65e87d30e 100755
--- a/bin/fixmystreet.com/buckinghamshire-flytipping
+++ b/bin/fixmystreet.com/buckinghamshire-flytipping
@@ -79,7 +79,6 @@ sub find_problems {
     # Provide some variables to the archiving script
     FixMyStreet::Script::ArchiveOldEnquiries::update_options({
         user => $body->comment_user->id,
-        user_name => $body->comment_user->name,
         closure_text => $template->text,
         retain_alerts => $retain_alerts,
         commit => $opts->commit,
diff --git a/bin/one-off-update-staff b/bin/one-off-update-staff
new file mode 100755
index 000000000..d94d6b961
--- /dev/null
+++ b/bin/one-off-update-staff
@@ -0,0 +1,38 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+BEGIN {
+    use File::Basename qw(dirname);
+    use File::Spec;
+    my $d = dirname(File::Spec->rel2abs($0));
+    require "$d/../setenv.pl";
+}
+
+use FixMyStreet::DB;
+
+my $rs = FixMyStreet::DB->resultset("Comment")->search({
+    'user.from_body' => { '!=', undef },
+    'user.is_superuser' => 0,
+    'me.extra' => [ undef, { -not_like => '%is_body_user%' } ],
+}, {
+    "+columns" => ["user.from_body"],
+    join => 'user',
+});
+while (my $row = $rs->next) {
+    my $id = $row->user->{_column_data}->{from_body}; # Avoid DB lookups
+    $row->set_extra_metadata( is_body_user => $id );
+    $row->update;
+}
+
+$rs = FixMyStreet::DB->resultset("Comment")->search({
+    'user.is_superuser' => 1,
+    'me.extra' => [ undef, { -not_like => '%is_superuser%' } ],
+}, {
+    join => 'user',
+});
+while (my $row = $rs->next) {
+    $row->set_extra_metadata( is_superuser => 1 );
+    $row->update;
+}
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
index 4866a657e..48386cf3e 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
@@ -368,24 +368,10 @@ sub edit : Path('/admin/report_edit') : Args(1) {
         if ( $problem->state ne $old_state ) {
             $c->forward( '/admin/log_edit', [ $id, 'problem', 'state_change' ] );
 
-            my $name = $c->user->moderating_user_name;
-            my $extra = { is_superuser => 1 };
-            if ($c->user->from_body) {
-                delete $extra->{is_superuser};
-                $extra->{is_body_user} = $c->user->from_body->id;
-            }
-            my $timestamp = \'current_timestamp';
             $problem->add_to_comments( {
                 text => $c->stash->{update_text} || '',
-                created => $timestamp,
-                confirmed => $timestamp,
-                user_id => $c->user->id,
-                name => $name,
-                mark_fixed => 0,
-                anonymous => 0,
-                state => 'confirmed',
+                user => $c->user->obj,
                 problem_state => $problem->state,
-                extra => $extra
             } );
         }
         $c->forward( '/admin/log_edit', [ $id, 'problem', 'edit' ] );
@@ -444,13 +430,7 @@ sub edit_category : Private {
         } else {
             $problem->add_to_comments({
                 text => $update_text,
-                created => \'current_timestamp',
-                confirmed => \'current_timestamp',
-                user_id => $c->user->id,
-                name => $c->user->from_body ? $c->user->from_body->name : $c->user->name,
-                state => 'confirmed',
-                mark_fixed => 0,
-                anonymous => 0,
+                user => $c->user->obj,
             });
         }
         $c->forward( '/admin/log_edit', [ $problem->id, 'problem', 'category_change' ] );
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Triage.pm b/perllib/FixMyStreet/App/Controller/Admin/Triage.pm
index 7cfcc93dd..c5bb6628d 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Triage.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Triage.pm
@@ -117,27 +117,14 @@ sub update : Private {
         $c->stash->{problem}->update( { state => 'confirmed' } );
         $c->forward( '/admin/log_edit', [ $problem->id, 'problem', 'triage' ] );
 
-        my $name = $c->user->moderating_user_name;
-        my $extra = { is_superuser => 1 };
-        if ($c->user->from_body) {
-            delete $extra->{is_superuser};
-            $extra->{is_body_user} = $c->user->from_body->id;
-        }
-
+        my $extra;
         $extra->{triage_report} = 1;
         $extra->{holding_category} = $current_category;
         $extra->{new_category} = $new_category;
 
-        my $timestamp = \'current_timestamp';
         my $comment = $problem->add_to_comments( {
             text => "Report triaged from $current_category to $new_category",
-            created => $timestamp,
-            confirmed => $timestamp,
-            user_id => $c->user->id,
-            name => $name,
-            mark_fixed => 0,
-            anonymous => 0,
-            state => 'confirmed',
+            user => $c->user->obj,
             problem_state => $problem->state,
             extra => $extra,
             whensent => \'current_timestamp',
diff --git a/perllib/FixMyStreet/App/Controller/Moderate.pm b/perllib/FixMyStreet/App/Controller/Moderate.pm
index f4143f0b4..c936f13c0 100644
--- a/perllib/FixMyStreet/App/Controller/Moderate.pm
+++ b/perllib/FixMyStreet/App/Controller/Moderate.pm
@@ -340,13 +340,8 @@ sub moderate_state : Private {
         $problem->state($new_state);
         $problem->add_to_comments( {
             text => $c->stash->{moderation_reason},
-            created => \'current_timestamp',
-            confirmed => \'current_timestamp',
-            user_id => $c->user->id,
-            name => $c->user->from_body ? $c->user->from_body->name : $c->user->name,
-            state => 'confirmed',
-            mark_fixed => 0,
-            anonymous => $c->user->from_body ? 0 : 1,
+            user => $c->user->obj,
+            anonymous => $c->user->is_superuser || $c->user->from_body ? 0 : 1,
             problem_state => $new_state,
         } );
         return 'state';
diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
index ab6117ae4..ef6152c30 100755
--- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm
+++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
@@ -206,16 +206,12 @@ sub submit_standard : Private {
         $update = $c->model('DB::Comment')->new(
             {
                 problem      => $problem,
-                name         => $problem->name,
                 user         => $problem->user,
                 text         => $update,
-                state        => 'confirmed',
                 mark_fixed   => $c->stash->{new_state} eq 'fixed - user' ? 1 : 0,
                 mark_open    => $c->stash->{new_state} eq 'confirmed' ? 1 : 0,
                 lang         => $c->stash->{lang_code},
                 cobrand      => $c->cobrand->moniker,
-                cobrand_data => '',
-                confirmed    => \'current_timestamp',
                 anonymous    => $problem->anonymous,
             }
         );
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 4f9825cae..dd7abc563 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -569,16 +569,11 @@ sub inspect : Private {
                         epoch => $saved_at
                     );
                 }
-                my $name = $c->user->from_body ? $c->user->from_body->name : $c->user->name;
                 $problem->add_to_comments( {
                     text => $update_text,
                     created => $timestamp,
                     confirmed => $timestamp,
-                    user_id => $c->user->id,
-                    name => $name,
-                    state => 'confirmed',
-                    mark_fixed => 0,
-                    anonymous => 0,
+                    user => $c->user->obj,
                     %update_params,
                 } );
             }
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index 68e267d00..c876f3459 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -110,6 +110,41 @@ with 'FixMyStreet::Roles::Abuser',
      'FixMyStreet::Roles::Moderation',
      'FixMyStreet::Roles::PhotoSet';
 
+=head2 FOREIGNBUILDARGS
+
+Make sure that when creating a new Comment object, certain
+other fields are set based upon the supplied data.
+
+=cut
+
+sub FOREIGNBUILDARGS {
+    my ($class, $opts) = @_;
+
+    if (my $user = $opts->{user}) {
+        my $name;
+        if ($user->is_superuser) {
+            $opts->{extra}->{is_superuser} = 1;
+            $name = _('an administrator');
+        } elsif (my $body = $user->from_body) {
+            $opts->{extra}->{is_body_user} = $body->id;
+            $name = $body->name;
+            $name = 'Island Roads' if $name eq 'Isle of Wight Council';
+        } else {
+            $name = $user->name;
+        }
+        $opts->{name} //= $name;
+    }
+
+    $opts->{anonymous} //= 0;
+    $opts->{mark_fixed} //= 0;
+    $opts->{state} //= 'confirmed'; # it's only public updates that need to be unconfirmed
+    if ($opts->{state} eq 'confirmed') {
+        $opts->{confirmed} //= \'current_timestamp';
+    }
+
+    return $opts;
+};
+
 =head2 get_cobrand_logged
 
 Get a cobrand object for the cobrand the update was made on.
diff --git a/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm b/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm
index 7ba763515..7c183ecbc 100644
--- a/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm
+++ b/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm
@@ -141,7 +141,6 @@ sub close_problems {
     my $problems = shift;
 
     my $extra = { auto_closed_by_script => 1 };
-    $extra->{is_superuser} = 1 if !$opts->{user_name};
 
     my $cobrand;
     while (my $problem = $problems->next) {
@@ -152,16 +151,9 @@ sub close_problems {
             $cobrand->set_lang_and_domain($problem->lang, 1);
         }
 
-        my $timestamp = \'current_timestamp';
         my $comment = $problem->add_to_comments( {
             text => $opts->{closure_text} || '',
-            created => $timestamp,
-            confirmed => $timestamp,
-            user_id => $opts->{user},
-            name => $opts->{user_name} || _('an administrator'),
-            mark_fixed => 0,
-            anonymous => 0,
-            state => 'confirmed',
+            user => FixMyStreet::DB->resultset("User")->find($opts->{user}),
             problem_state => $opts->{closed_state},
             extra => $extra,
         } );
diff --git a/perllib/Open311/UpdatesBase.pm b/perllib/Open311/UpdatesBase.pm
index 0be324773..c2f3fae0d 100644
--- a/perllib/Open311/UpdatesBase.pm
+++ b/perllib/Open311/UpdatesBase.pm
@@ -154,13 +154,8 @@ sub process_update {
                 $request, $p, $state, $old_state,
                 $external_status_code, $old_external_status_code
             ),
-            mark_fixed => 0,
-            mark_open => 0,
-            anonymous => 0,
-            name => $self->system_user->name,
             confirmed => $request->{comment_time},
             created => $request->{comment_time},
-            state => 'confirmed',
         }
     );
 
diff --git a/t/app/controller/admin/report_edit.t b/t/app/controller/admin/report_edit.t
index f8101ab76..e041154db 100644
--- a/t/app/controller/admin/report_edit.t
+++ b/t/app/controller/admin/report_edit.t
@@ -329,7 +329,6 @@ foreach my $test (
             closed_updates => undef,
         },
         expect_comment => 1,
-        user_body => $oxfordshire,
         changes   => { state => 'investigating' },
         log_entries => [
             qw/edit state_change edit edit resend edit state_change edit state_change edit state_change edit state_change edit state_change edit edit edit edit edit/
@@ -351,7 +350,6 @@ foreach my $test (
         },
         expect_comment => 1,
         expected_text => '*Category changed from ‘Other’ to ‘Potholes’*',
-        user_body => $oxfordshire,
         changes   => { state => 'in progress', category => 'Potholes' },
         log_entries => [
             qw/edit state_change category_change edit state_change edit edit resend edit state_change edit state_change edit state_change edit state_change edit state_change edit edit edit edit edit/
@@ -364,11 +362,6 @@ foreach my $test (
         $report->comments->delete;
         $log_entries->reset;
 
-        if ( $test->{user_body} ) {
-            $superuser->from_body( $test->{user_body}->id );
-            $superuser->update;
-        }
-
         $mech->get_ok("/admin/report_edit/$report_id");
 
         @{$test->{fields}}{'external_id', 'external_body', 'external_team', 'category'} = (13, "", "", "Other");
@@ -440,21 +433,12 @@ foreach my $test (
             } else {
                 is $comment->text, '', 'comment has no text';
             }
-            if ( $test->{user_body} ) {
-                ok $comment->get_extra_metadata('is_body_user'), 'body user metadata set';
-                ok !$comment->get_extra_metadata('is_superuser'), 'superuser metadata not set';
-                is $comment->name, $test->{user_body}->name, 'comment name is body name';
-            } else {
-                ok !$comment->get_extra_metadata('is_body_user'), 'body user metadata not set';
-                ok $comment->get_extra_metadata('is_superuser'), 'superuser metadata set';
-                is $comment->name, _('an administrator'), 'comment name is admin';
-            }
+            ok !$comment->get_extra_metadata('is_body_user'), 'body user metadata not set';
+            ok $comment->get_extra_metadata('is_superuser'), 'superuser metadata set';
+            is $comment->name, _('an administrator'), 'comment name is admin';
         } else {
             is $report->comments->count, 0, 'report has no comments';
         }
-
-        $superuser->from_body(undef);
-        $superuser->update;
     };
 }
 
diff --git a/t/app/controller/admin/update_edit.t b/t/app/controller/admin/update_edit.t
index 57c8973d4..8650e7771 100644
--- a/t/app/controller/admin/update_edit.t
+++ b/t/app/controller/admin/update_edit.t
@@ -81,7 +81,7 @@ for my $test (
         fields => {
             text => 'this is an update',
             state => 'confirmed',
-            name => '',
+            name => 'Test User',
             anonymous => 1,
             username => $update->user->email,
         },
@@ -96,7 +96,7 @@ for my $test (
         fields => {
             text => 'this is a changed update',
             state => 'confirmed',
-            name => '',
+            name => 'Test User',
             anonymous => 1,
             username => $update->user->email,
         },
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index e97b04f12..3198cf70c 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -1096,10 +1096,10 @@ subtest $test->{desc} => sub {
     unlike $update_meta->[1], qr/Commenter/, 'commenter name not included';
     like $update_meta->[0], qr/investigating/i, 'update meta includes state change';
 
-    if ($test->{body} || $test->{bodyuser}) {
-        like $update_meta->[1], qr/Westminster/, 'body user update uses body name';
-    } elsif ($test->{superuser}) {
+    if ($test->{superuser}) {
         like $update_meta->[1], qr/an administrator/, 'superuser update says an administrator';
+    } elsif ($test->{body} || $test->{bodyuser}) {
+        like $update_meta->[1], qr/Westminster/, 'body user update uses body name';
     }
 
     ok $user->user_body_permissions->create({
diff --git a/t/app/model/comment.t b/t/app/model/comment.t
index 3f30b3a1e..dd9af9eb9 100644
--- a/t/app/model/comment.t
+++ b/t/app/model/comment.t
@@ -1,20 +1,27 @@
 use FixMyStreet::Test;
 
-my $comment_rs = FixMyStreet::DB->resultset('Comment');
+my $user = FixMyStreet::DB->resultset('User')->new({ name => 'Test User', is_superuser => 1 });
 
+my $comment_rs = FixMyStreet::DB->resultset('Comment');
 my $comment = $comment_rs->new(
     {
-        user_id      => 1,
+        user => $user,
         problem_id   => 1,
         text         => '',
-        state        => 'confirmed',
-        anonymous    => 0,
-        mark_fixed   => 0,
-        cobrand      => 'default',
-        cobrand_data => '',
     }
 );
 
-is $comment->confirmed,  undef, 'inflating null confirmed ok';
-is $comment->created,  undef, 'inflating null confirmed ok';
+is $comment->created,  undef, 'inflating null created ok';
+is $comment->mark_fixed, 0, 'mark fixed default set';
+is $comment->state, 'confirmed', 'state default is confirmed';
+is $comment->name, 'an administrator';
+
+$user->is_superuser(0);
+$comment = $comment_rs->new({
+    user => $user,
+    problem_id => 1,
+    text => '',
+});
+is $comment->name, 'Test User';
+
 done_testing();
diff --git a/t/open311.t b/t/open311.t
index 9524006b8..941e35f7e 100644
--- a/t/open311.t
+++ b/t/open311.t
@@ -402,6 +402,7 @@ subtest 'Hounslow update description is correct for a different user' => sub {
 
     my $comment = make_comment('hounslow');
     $comment->user($user2);
+    $comment->name($user2->name);
     my $results;
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => 'hounslow',
-- 
cgit v1.2.3


From 8bee582c74f9db05d08c682803987e6b324fb61f Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Tue, 14 Jul 2020 16:32:12 +0100
Subject: [HighwaysEngland] add notice about offensive language

Below description.
---
 templates/web/highwaysengland/report/new/inline-tips.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/templates/web/highwaysengland/report/new/inline-tips.html b/templates/web/highwaysengland/report/new/inline-tips.html
index ff0ef42f8..73f70a3d0 100644
--- a/templates/web/highwaysengland/report/new/inline-tips.html
+++ b/templates/web/highwaysengland/report/new/inline-tips.html
@@ -1,3 +1,9 @@
+<div class="description_tips" >
+    <p>
+        Content of reports shall be monitored and any language that could be deemed to cause offense or be inappropriate shall be removed.
+    </p>
+</div>
+
 <label for="where_hear">How did you hear about us?</label>
 
 [%~ SET where_hear = report.get_extra_metadata('where_hear') %]
-- 
cgit v1.2.3


From 1243e701620d71dfcf0eedb880f40e7fef59415d Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 13 Jul 2020 13:55:10 +0100
Subject: Do not have bootstrap run sudo commands.

Your site user may not have access to sudo, and your admin user may
cause permission issues if used to do the git checkout, or the Perl
module installation. Document the separate script to install system
packages instead.

Co-authored-by: Sam Pearson <sam@mysociety.org>
---
 CHANGELOG.md                   |  1 +
 Vagrantfile                    |  3 +++
 bin/docker.preinit             |  1 +
 bin/install_packages           |  2 +-
 bin/site-specific-install.sh   |  2 --
 docker-compose.yml             |  1 -
 docs/install/manual-install.md |  2 +-
 docs/updating/ami.md           |  4 +++-
 docs/updating/index.md         |  5 +++--
 script/bootstrap               | 13 -------------
 10 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28d37d847..2af6f052c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
         - Improve compatibility with G Suite OpenID Connect authentication. #3032
         - Fix duplicate asset message after dismissing duplicate suggestions.
         - Improve moderation diff display in a few small ways. #3105
+        - Do not have bootstrap run sudo commands. #2930
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/Vagrantfile b/Vagrantfile
index 17eebe4b5..a69b58b11 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -60,6 +60,9 @@ EOS
 # This just runs our update script, used on our offical box.
 $update = <<-EOS
     chown -R vagrant:vagrant /home/vagrant/.cpanm
+    # Ensure any new packages are installed
+    /home/vagrant/fixmystreet/bin/install_packages
+    # Run setup script
     su vagrant -c '/home/vagrant/fixmystreet/script/setup ; exit $?'
     if [ $? -eq 0 ]; then
       touch /tmp/success
diff --git a/bin/docker.preinit b/bin/docker.preinit
index 459e89de2..501878185 100644
--- a/bin/docker.preinit
+++ b/bin/docker.preinit
@@ -34,6 +34,7 @@ fi
 su $FMS_DB_USER -c "${FMS_ROOT}/bin/docker-cobrand"
 
 # Ensure things are up to date - schema, CSS, etc
+${FMS_ROOT}/bin/install_packages docker
 su $FMS_DB_USER -c "${FMS_ROOT}/script/update"
 
 # Update reports
diff --git a/bin/install_packages b/bin/install_packages
index 7b4bfd8e1..c7f1b9446 100755
--- a/bin/install_packages
+++ b/bin/install_packages
@@ -3,7 +3,7 @@ set -e
 
 cd "$(dirname "${BASH_SOURCE[0]}")/.."
 
-PACKAGE_FILE=conf/packages
+PACKAGE_FILE=conf/packages.generic
 
 [ -n "$1" ] && PACKAGE_FILE="conf/packages.${1}"
 
diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh
index af52dbdbc..2b773fecb 100644
--- a/bin/site-specific-install.sh
+++ b/bin/site-specific-install.sh
@@ -54,8 +54,6 @@ fi
 
 install_website_packages
 
-su -l -c "touch '$DIRECTORY/admin-htpasswd'" "$UNIX_USER"
-
 if [ $INSTALL_DB = true ]; then
     add_postgresql_user
 fi
diff --git a/docker-compose.yml b/docker-compose.yml
index cc653c922..80f0b56f1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,7 +30,6 @@ services:
       FMS_ROOT: '/var/www/fixmystreet/fixmystreet'
       SUPERUSER_EMAIL: 'superuser@example.org'
       SUPERUSER_PASSWORD: '5up3r53cr3t'
-      SKIP_PACKAGES_INSTALL:
     networks:
       default:
         aliases:
diff --git a/docs/install/manual-install.md b/docs/install/manual-install.md
index 408b419cb..35c654cf5 100644
--- a/docs/install/manual-install.md
+++ b/docs/install/manual-install.md
@@ -40,7 +40,7 @@ dependencies are listed in `conf/packages.generic`. To install all of them you
 can run e.g.:
 
 {% highlight bash %}
-$ sudo xargs -a conf/packages.generic apt-get install
+$ sudo bin/install_packages
 {% endhighlight %}
 
 A similar list of packages should work for other Debian-based distributions.
diff --git a/docs/updating/ami.md b/docs/updating/ami.md
index ff83e3aec..9f2f612ed 100644
--- a/docs/updating/ami.md
+++ b/docs/updating/ami.md
@@ -41,10 +41,12 @@ make sure they are all committed to your local branch and fork first, see
 to try checking out your repository elsewhere and trying the merge there first,
 to see if it there are any problems.
 
-After updating the code, you should run the following command to update any
+After updating the code, you should run the following commands to update any
 needed dependencies and any schema changes to your database. It's a good idea
 to take a backup of your database first.
 
+    admin@ip-10-58-191-98:/var/www/fixmystreet/fixmystreet$ sudo bin/install_packages
+
     fms@ip-10-58-191-98:~/fixmystreet$ script/update
 
 If you have made changes to the schema yourself, this may not work,
diff --git a/docs/updating/index.md b/docs/updating/index.md
index 2ab8ed6f5..ea1ce72cd 100644
--- a/docs/updating/index.md
+++ b/docs/updating/index.md
@@ -53,12 +53,13 @@ you are too worried to merge in case it breaks something.
 
 ## Subsequent dependency updates
 
-After updating the code, you should run the following command to update any
+After updating the code, you should run the following commands to update any
 needed dependencies and any schema changes to your database. It's a good idea
 to take a backup of your database first.
 
 {% highlight bash %}
-script/update
+sudo bin/install_packages # (as your admin user)
+script/update # (as the fms user)
 {% endhighlight %}
 
 Of course, if you have made changes to the database schema yourself, this may
diff --git a/script/bootstrap b/script/bootstrap
index f40e97b18..dfebd7449 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -4,17 +4,4 @@ set -e
 cd "$(dirname "$0")/.."
 
 git submodule --quiet update --init --recursive --rebase
-
-if [ -z ${SKIP_PACKAGES_INSTALL:+x} ] ; then
-    # Let's see if we can't work out where we might be running.
-    if cut -d/ -f2 /proc/self/cgroup | sort -u | grep -q docker ; then
-        echo "==> Installing Docker packages..."
-        sudo bin/install_packages docker
-    else
-        # Fallback
-        echo "==> Installing generic packages..."
-        sudo bin/install_packages generic
-    fi
-fi
-
 bin/install_perl_modules
-- 
cgit v1.2.3


From c3899dc611ade1410adc7682f2ed196e341ee577 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Wed, 15 Jul 2020 14:23:27 +0100
Subject: [HighwaysEngland] change where heard from options

---
 templates/web/highwaysengland/report/new/inline-tips.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/web/highwaysengland/report/new/inline-tips.html b/templates/web/highwaysengland/report/new/inline-tips.html
index 73f70a3d0..730b482e5 100644
--- a/templates/web/highwaysengland/report/new/inline-tips.html
+++ b/templates/web/highwaysengland/report/new/inline-tips.html
@@ -14,6 +14,6 @@
 <option value="Highways England website"[% ' selected' IF 'Highways England website' == where_hear %]>Highways England website</option>
 <option value="Twitter"[% ' selected' IF 'Twitter' == where_hear %]>Twitter</option>
 <option value="Word of mouth"[% ' selected' IF 'Word of mouth' == where_hear %]>Word of mouth</option>
-<option value="Through the post"[% ' selected' IF 'Through the post' == where_hear %]>Through the post</option>
+<option value="Highways England correspondence"[% ' selected' IF 'Highways England correspondence' == where_hear %]>Highways England correspondence</option>
 <option value="Other"[% ' selected' IF 'Other' == where_hear %]>Other</option>
 </select>
-- 
cgit v1.2.3


From 2915ec9562bcb43f981d08ed2fa64a13c78a6a58 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 16 Jul 2020 12:59:38 +0100
Subject: Tidy up map_sub_links in templates.

---
 templates/web/base/maps/_sub_links.html | 6 ------
 templates/web/base/maps/bing.html       | 2 +-
 templates/web/base/maps/fms.html        | 2 +-
 templates/web/base/maps/google-ol.html  | 2 +-
 templates/web/base/maps/openlayers.html | 6 ++++++
 templates/web/zurich/maps/zurich.html   | 5 -----
 6 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 templates/web/base/maps/_sub_links.html

diff --git a/templates/web/base/maps/_sub_links.html b/templates/web/base/maps/_sub_links.html
deleted file mode 100644
index d58ecf97c..000000000
--- a/templates/web/base/maps/_sub_links.html
+++ /dev/null
@@ -1,6 +0,0 @@
-[% INCLUDE maps/openlayers.html %]
-[% UNLESS around_page %]
-<p class="sub-map-links" id="sub_map_links">
-     [% map_sub_links | safe %]
-</p>
-[% END %]
diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html
index 7d2c379c4..d30fc2600 100644
--- a/templates/web/base/maps/bing.html
+++ b/templates/web/base/maps/bing.html
@@ -6,4 +6,4 @@
     [% END %]
 [% END %]
 
-[% map_html = INCLUDE maps/_sub_links.html %]
+[% map_html = INCLUDE maps/openlayers.html %]
diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html
index 739c00b4e..2df3bd11b 100644
--- a/templates/web/base/maps/fms.html
+++ b/templates/web/base/maps/fms.html
@@ -6,4 +6,4 @@
     [% END %]
 [% END %]
 
-[% map_html = INCLUDE maps/_sub_links.html include_key = 1 %]
+[% map_html = INCLUDE maps/openlayers.html include_key = 1 %]
diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html
index eb68ae804..9103ba42b 100644
--- a/templates/web/base/maps/google-ol.html
+++ b/templates/web/base/maps/google-ol.html
@@ -2,4 +2,4 @@
 <a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Satellite') %]</a>
 [% END %]
 
-[% map_html = INCLUDE maps/_sub_links.html %]
+[% map_html = INCLUDE maps/openlayers.html %]
diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html
index f4c78767c..60d7acfde 100644
--- a/templates/web/base/maps/openlayers.html
+++ b/templates/web/base/maps/openlayers.html
@@ -46,3 +46,9 @@
     <div class="olControlAttribution" style="position: absolute;">[% map.copyright | safe %]</div>
     [% END %]
     <img id="loading-indicator" class="hidden" aria-hidden="true" src="/i/loading.svg" alt="Loading...">
+
+[% IF NOT around_page AND map_sub_links %]
+<p class="sub-map-links" id="sub_map_links">
+     [% map_sub_links | safe %]
+</p>
+[% END %]
diff --git a/templates/web/zurich/maps/zurich.html b/templates/web/zurich/maps/zurich.html
index f3a9bdc7f..8310b0758 100644
--- a/templates/web/zurich/maps/zurich.html
+++ b/templates/web/zurich/maps/zurich.html
@@ -5,9 +5,4 @@
 [% map_html = BLOCK %]
 [% INCLUDE maps/openlayers.html %]
 [% INCLUDE maps/wmts_config.html %]
-[% UNLESS around_page %]
-<p class="sub-map-links" id="sub_map_links">
-     [% map_sub_links | safe %]
-</p>
-[% END %]
 [% END %]
-- 
cgit v1.2.3


From 4770393b3de8d38649a66b9608048c15ec73347a Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 16 Jul 2020 13:08:56 +0100
Subject: Add aerial option to OSM maps.

---
 CHANGELOG.md                      |  2 +-
 perllib/FixMyStreet/Map/Bing.pm   | 10 ----------
 perllib/FixMyStreet/Map/OSM.pm    |  4 ++++
 templates/web/base/maps/bing.html |  9 ---------
 templates/web/base/maps/osm.html  |  8 ++++++++
 web/js/map-OpenStreetMap.js       |  7 +++++++
 6 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 templates/web/base/maps/bing.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2af6f052c..9f7dc615b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
         - Add lazy image loading on list items.
         - Improve Bing geocoder results.
         - Add option of checking passwords against Have I Been Pwned.
-        - Add aerial maps option to Bing maps.
+        - Add aerial maps option to Bing and OSM maps.
     - Changes:
         - Mark user as active when sent an email alert.
     - Bugfixes:
diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm
index 723dcd6dc..17bdc3a53 100644
--- a/perllib/FixMyStreet/Map/Bing.pm
+++ b/perllib/FixMyStreet/Map/Bing.pm
@@ -8,8 +8,6 @@ use strict;
 
 sub map_type { '' }
 
-sub map_template { 'bing' }
-
 sub map_javascript { [
     '/vendor/OpenLayers/OpenLayers.fixmystreet.js',
     '/js/map-OpenLayers.js',
@@ -31,14 +29,6 @@ sub get_quadkey {
     return $key;
 }
 
-sub display_map {
-    my ($self, $c, %params) = @_;
-
-    $params{aerial} = $c->get_param("aerial") ? 1 : 0;
-
-    $self->SUPER::display_map($c, %params);
-}
-
 my $road_base = '//%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=G,L&src=t&shading=hill&og=969&n=z';
 my $aerial_base = '//%s.ssl.ak.dynamic.tiles.virtualearth.net/comp/ch/%s?mkt=en-US&it=A,G,L&src=t&og=969&n=z';
 
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 417fdca0b..47c1c8535 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -21,11 +21,13 @@ sub map_template { 'osm' }
 sub map_javascript { [
     '/vendor/OpenLayers/OpenLayers.wfs.js',
     '/js/map-OpenLayers.js',
+    FixMyStreet->config('BING_MAPS_API_KEY') ? ('/js/map-bing-ol.js') : (),
     '/js/map-OpenStreetMap.js',
 ] }
 
 sub map_tiles {
     my ( $self, %params ) = @_;
+    return FixMyStreet::Map::Bing->map_tiles(%params) if $params{aerial};
     my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} );
     my $tile_url = $self->base_tile_url();
     return [
@@ -59,6 +61,8 @@ sub display_map {
         if defined $c->get_param('lon');
     $params{zoomToBounds} = $params{any_zoom} && !defined $c->get_param('zoom');
 
+    $params{aerial} = $c->get_param("aerial") && FixMyStreet->config('BING_MAPS_API_KEY') ? 1 : 0;
+
     my %data;
     $data{cobrand} = $c->cobrand;
     $data{distance} = $c->stash->{distance};
diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html
deleted file mode 100644
index d30fc2600..000000000
--- a/templates/web/base/maps/bing.html
+++ /dev/null
@@ -1,9 +0,0 @@
-[% map_sub_links = BLOCK %]
-    [% IF c.req.params.aerial %]
-        <a id="map_layer_toggle" href="[% c.uri_with( { aerial => 0 } ) %]">[% loc('Roads') %]</a>
-    [% ELSE %]
-        <a id="map_layer_toggle" href="[% c.uri_with( { aerial => 1 } ) %]">[% loc('Aerial') %]</a>
-    [% END %]
-[% END %]
-
-[% map_html = INCLUDE maps/openlayers.html %]
diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html
index 70d05929f..560055f3b 100644
--- a/templates/web/base/maps/osm.html
+++ b/templates/web/base/maps/osm.html
@@ -1,3 +1,11 @@
+[% map_sub_links = BLOCK %][% IF c.config.BING_MAPS_API_KEY %]
+    [% IF c.req.params.aerial %]
+        <a id="map_layer_toggle" href="[% c.uri_with( { aerial => 0 } ) %]">[% loc('Roads') %]</a>
+    [% ELSE %]
+        <a id="map_layer_toggle" href="[% c.uri_with( { aerial => 1 } ) %]">[% loc('Aerial') %]</a>
+    [% END %]
+[% END %][% END %]
+
 [%
 map.copyright = ''; # This is handled with OpenLayers.Control.Attribution
 map_html = INCLUDE maps/openlayers.html
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index 9ed3a2ee3..bd3497343 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -7,6 +7,13 @@ fixmystreet.maps.config = function() {
         new OpenLayers.Control.PermalinkFMS('map'),
         new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
     ];
+
+    if (OpenLayers.Layer.BingAerial) {
+        fixmystreet.layer_options = [
+          { map_type: fixmystreet.map_type },
+          { map_type: OpenLayers.Layer.BingAerial }
+        ];
+    }
 };
 
 // http://www.openstreetmap.org/openlayers/OpenStreetMap.js (added maxResolution)
-- 
cgit v1.2.3


From 83b77947e61525ad2a18aa4511a513abdfef25eb Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 16 Jul 2020 11:27:15 +0100
Subject: [TfL] remove COVID-19 front page text

Fixes mysociety/fimystreet-commercial#1939
---
 templates/web/tfl/front/pre-steps.html | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 templates/web/tfl/front/pre-steps.html

diff --git a/templates/web/tfl/front/pre-steps.html b/templates/web/tfl/front/pre-steps.html
deleted file mode 100644
index 1dead5c89..000000000
--- a/templates/web/tfl/front/pre-steps.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<p style="max-width: 38em; font-size: 1.2em; margin-bottom: 2.5em;">
-    <strong>
-        All issues reported on Streetcare continue to be monitored by our teams at
-        Transport for London. We are not able to carry out all of our normal
-        maintenance works at the moment but we are working hard to deal with all
-        safety critical issues.
-    </strong>
-    <br>
-    If you are concerned about pavement overcrowding during social distancing
-    on the Transport for London Road Network, you can now report that to us
-    here.
-</p>
-- 
cgit v1.2.3


From d55461e6d05ab0c1b398f756a687107a5ce6d49e Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 16 Jul 2020 14:26:13 +0100
Subject: Default to aerial map in JS if aerial given in URL.

---
 web/js/map-bing-ol.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index b0e5dfc6a..179238633 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -25,6 +25,10 @@ fixmystreet.maps.config = function() {
                 fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]);
             }
         });
+        // If page loaded with Aerial as starting, rather than default road
+        if ($('#map_layer_toggle').text() == translation_strings.map_roads) {
+            fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]);
+        }
     });
 })();
 
-- 
cgit v1.2.3


From 88c607fa378951491c7ec0f3384bc8f27fbca467 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 15 Jul 2020 16:02:21 +0100
Subject: Fix lookups in templates of categories with &s.

A hash lookup in a template is escaping the key used, meaning the lookup
is failing anywhere we are using a category containing an ampersand as a
key. A continuation of the changes made in 527d763b.
---
 CHANGELOG.md                                       |  1 +
 t/app/controller/around.t                          |  4 ++--
 t/app/controller/report_inspect.t                  | 23 +++++++++++-----------
 t/cobrand/hackney.t                                |  7 +++++--
 templates/web/base/admin/report-category.html      |  3 ++-
 templates/web/base/admin/triage/_list-filters.html |  5 +++--
 templates/web/base/report/_inspect.html            |  7 ++++---
 templates/web/base/report/_item.html               |  5 +++--
 .../web/base/report/new/form_user_loggedin.html    |  5 +++--
 templates/web/base/reports/_list-filters.html      |  3 ++-
 10 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2af6f052c..f724b8f98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
         - Fix duplicate asset message after dismissing duplicate suggestions.
         - Improve moderation diff display in a few small ways. #3105
         - Do not have bootstrap run sudo commands. #2930
+        - Fix lookups in templates of categories with &s.
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index 784801517..e35406bb6 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -217,8 +217,8 @@ for my $permission ( qw/ report_inspect report_mark_private/ ) {
 
 subtest 'check assigned-only list items do not display shortlist buttons' => sub {
     my $body = FixMyStreet::DB->resultset('Body')->find( $body_edin_id );
-    my $contact = $mech->create_contact_ok( category => 'Horses', body_id => $body->id, email => "horses\@example.org" );
-    $edinburgh_problems[4]->update({ category => 'Horses' });
+    my $contact = $mech->create_contact_ok( category => 'Horses & Ponies', body_id => $body->id, email => "horses\@example.org" );
+    $edinburgh_problems[4]->update({ category => 'Horses & Ponies' });
 
     my $user = $mech->log_in_ok( 'test@example.com' );
     $user->set_extra_metadata(assigned_categories_only => 1);
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index 2852f8d18..de9d689cd 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -7,7 +7,7 @@ my $brum = $mech->create_body_ok(2514, 'Birmingham City Council');
 my $oxon = $mech->create_body_ok(2237, 'Oxfordshire County Council', { can_be_devolved => 1 } );
 my $contact = $mech->create_contact_ok( body_id => $oxon->id, category => 'Cows', email => 'cows@example.net' );
 my $contact2 = $mech->create_contact_ok( body_id => $oxon->id, category => 'Sheep', email => 'SHEEP', send_method => 'Open311' );
-my $contact3 = $mech->create_contact_ok( body_id => $oxon->id, category => 'Badgers', email => 'badgers@example.net' );
+my $contact3 = $mech->create_contact_ok( body_id => $oxon->id, category => 'Badgers & Voles', email => 'badgers@example.net' );
 my $rp = FixMyStreet::DB->resultset("ResponsePriority")->create({
     body => $oxon,
     name => 'High Priority',
@@ -683,19 +683,20 @@ FixMyStreet::override_config {
 
 FixMyStreet::override_config {
     MAPIT_URL => 'http://mapit.uk/',
-    ALLOWED_COBRANDS => 'fixmystreet',
+    ALLOWED_COBRANDS => 'oxfordshire',
 }, sub {
     subtest "test category not updated if fail to include public update" => sub {
         $mech->get_ok("/report/$report_id");
-        $mech->submit_form(button => 'save', with_fields => { category => 'Badgers' });
+        $mech->submit_form(button => 'save', with_fields => { category => 'Badgers & Voles' });
 
         $report->discard_changes;
         is $report->category, "Cows", "Report in correct category";
-        $mech->content_contains('Badgers" selected', 'Changed category still selected');
+        $mech->content_contains('Badgers &amp; Voles" selected', 'Changed category still selected');
     };
 
     subtest "test invalid form maintains Category and priority" => sub {
         $mech->get_ok("/report/$report_id");
+        $mech->content_like(qr/data-priorities='[^']*?Low Priority/);
         my $expected_fields = {
           state => 'action scheduled',
           category => 'Cows',
@@ -709,9 +710,9 @@ FixMyStreet::override_config {
         my $values = $mech->visible_form_values('report_inspect_form');
         is_deeply $values, $expected_fields, 'correct form fields present';
 
-        $mech->submit_form(button => 'save', with_fields => { category => 'Badgers', priority => $rp2->id });
+        $mech->submit_form(button => 'save', with_fields => { category => 'Badgers & Voles', priority => $rp2->id });
 
-        $expected_fields->{category} = 'Badgers';
+        $expected_fields->{category} = 'Badgers & Voles';
         $expected_fields->{priority} = $rp2->id;
 
         my $new_values = $mech->visible_form_values('report_inspect_form');
@@ -724,15 +725,15 @@ FixMyStreet::override_config {
         $mech->submit_form(
             button => 'save',
             with_fields => {
-                category => 'Badgers',
+                category => 'Badgers & Voles',
                 include_update => 1,
                 public_update => 'This is a public update',
         });
 
         $report->discard_changes;
-        is $report->category, "Badgers", "Report in correct category";
+        is $report->category, "Badgers & Voles", "Report in correct category";
         is $report->comments->count, 1, "Only leaves one update";
-        like $report->comments->first->text, qr/Category changed.*Badgers/, 'update text included category change';
+        like $report->comments->first->text, qr/Category changed.*Badgers & Voles/, 'update text included category change';
     };
 
     subtest "test non-public changing" => sub {
@@ -779,10 +780,10 @@ FixMyStreet::override_config {
     });
     subtest "test report not resent when category changes if send_method doesn't change" => sub {
         $mech->get_ok("/report/$report3_id");
-        $mech->submit_form(button => 'save', with_fields => { category => 'Badgers', include_update => undef, });
+        $mech->submit_form(button => 'save', with_fields => { category => 'Badgers & Voles', include_update => undef, });
 
         $report3->discard_changes;
-        is $report3->category, "Badgers", "Report in correct category";
+        is $report3->category, "Badgers & Voles", "Report in correct category";
         isnt $report3->whensent, undef, "Report not marked as unsent";
         is $report3->bodies_str, $oxon->id, "Reported to OCC";
     };
diff --git a/t/cobrand/hackney.t b/t/cobrand/hackney.t
index b5a629e33..374bf2ea9 100644
--- a/t/cobrand/hackney.t
+++ b/t/cobrand/hackney.t
@@ -28,7 +28,7 @@ my $params = {
 my $hackney = $mech->create_body_ok(2508, 'Hackney Council', $params);
 my $contact = $mech->create_contact_ok(
     body_id => $hackney->id,
-    category => 'Potholes',
+    category => 'Potholes & stuff',
     email => 'pothole@example.org',
 );
 $contact->set_extra_fields( ( {
@@ -143,7 +143,7 @@ $p->delete;
 subtest "sends branded confirmation emails" => sub {
     $mech->log_out_ok;
     $mech->clear_emails_ok;
-    $mech->get_ok('/around');
+    $mech->get_ok('/?filter_category=Potholes+%26+stuff');
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ 'hackney' ],
         MAPIT_URL => 'http://mapit.uk/',
@@ -159,6 +159,9 @@ subtest "sends branded confirmation emails" => sub {
         $mech->submit_form_ok( { with_fields => { pc => 'E8 1DY', } },
             "submit location" );
 
+        # While we're here, check the category with an ampersand (regression test)
+        $mech->content_contains('<option value="Potholes &amp; stuff" selected>');
+
         # click through to the report page
         $mech->follow_link_ok( { text_regex => qr/skip this step/i, },
             "follow 'skip this step' link" );
diff --git a/templates/web/base/admin/report-category.html b/templates/web/base/admin/report-category.html
index e76106f7f..55b9e2ea5 100644
--- a/templates/web/base/admin/report-category.html
+++ b/templates/web/base/admin/report-category.html
@@ -6,7 +6,8 @@
 [%~ END ~%]
 
 <select class="form-control" name="[% select_name %]" id="[% select_name %]">
-  [% IF NOT problem.category OR NOT categories_hash.${problem.category} %]
+  [% SET category_safe = mark_safe(problem.category) ~%]
+  [% IF NOT problem.category OR NOT categories_hash.$category_safe %]
     <optgroup label="[% loc('Existing category') %]">
         <option selected value="[% problem.category | html %]">[% (problem.category_display OR '-') | html %]</option>
     </optgroup>
diff --git a/templates/web/base/admin/triage/_list-filters.html b/templates/web/base/admin/triage/_list-filters.html
index dd3e17875..29f48f0bb 100644
--- a/templates/web/base/admin/triage/_list-filters.html
+++ b/templates/web/base/admin/triage/_list-filters.html
@@ -2,8 +2,9 @@
   [% IF filter_categories.size %]
     <select class="form-control js-multiple" name="filter_category" id="filter_categories" multiple data-all="[% loc('Everything') %]">
         [% FOR cat IN filter_categories %]
-            <option value="[% cat.category | html %]"[% ' selected' IF filter_category.${cat.category} %]>
-                [% cat.category_display | html %]
+          [%~ SET cat_safe = mark_safe(cat.category) %]
+            <option value="[% cat.category %]"[% ' selected' IF filter_category.$cat_safe %]>
+                [% cat.category_display %]
                 [%~ IF cat.get_extra_metadata('help_text') %] ([% cat.get_extra_metadata('help_text') %])[% END ~%]
             </option>
         [% END %]
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index a8be342d0..88fbdd70b 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -18,13 +18,14 @@
 
         [% FOREACH category IN category_options %]
           [% cat_name = category.category;
+             cat_safe = mark_safe(cat_name);
              cat_prefix = cat_name | lower | replace('[^a-z]', '');
              cat_prefix = "category_" _ cat_prefix _ "_" %]
             <p data-category="[% cat_name | html %]"
                [%~ IF cat_name != problem.category %] class="hidden"[% END %]
-               data-priorities='[% priorities_by_category.$cat_name | html %]'
-               data-templates='[% templates_by_category.$cat_name | html %]'>
-                [% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$cat_name hide_notices=1 show_hidden=1 %]
+               data-priorities='[% priorities_by_category.$cat_safe | html %]'
+               data-templates='[% templates_by_category.$cat_safe | html %]'>
+                [% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$cat_safe hide_notices=1 show_hidden=1 %]
             </p>
         [% END %]
 
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index 6f567de01..9a5168986 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -5,8 +5,9 @@
 [%
 
 SET relevant_staff = 1;
-SET is_user_category = user_categories.${problem.category};
-IF (assigned_users_only.${problem.category} OR assigned_categories_only) AND NOT is_user_category;
+SET category_safe = mark_safe(problem.category);
+SET is_user_category = user_categories.$category_safe;
+IF (assigned_users_only.$category_safe OR assigned_categories_only) AND NOT is_user_category;
     SET relevant_staff = 0;
 END;
 
diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html
index 0d259e695..d26948fc2 100644
--- a/templates/web/base/report/new/form_user_loggedin.html
+++ b/templates/web/base/report/new/form_user_loggedin.html
@@ -64,8 +64,9 @@
 [% IF c.user.has_permission_to("report_inspect", bodies_ids) OR c.user.has_permission_to("report_mark_private", bodies_ids) %]
     <div class="checkbox-group">
         <input type="checkbox" name="non_public" id="form_non_public" value="1"
-            [%~ ' checked' IF report.non_public OR non_public_categories.$category %]
-            [%~ ' disabled' IF non_public_categories.$category %]>
+            [%~ SET category_safe = mark_safe(category) %]
+            [%~ ' checked' IF report.non_public OR non_public_categories.$category_safe %]
+            [%~ ' disabled' IF non_public_categories.$category_safe %]>
         <label class="inline" for="form_non_public">[% loc('Private') %] </label>
     </div>
 [% END %]
diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html
index c5a8eaa75..ee9815157 100644
--- a/templates/web/base/reports/_list-filters.html
+++ b/templates/web/base/reports/_list-filters.html
@@ -2,7 +2,8 @@
 
 [% BLOCK category_options %]
     [% FOR cat IN categories %]
-        <option value="[% cat.category %]"[% ' selected' IF filter_category.${cat.category} OR ( filter_group AND ( cat.groups.grep(filter_group).size OR cat.category == filter_group ) ) %]>
+      [% SET cat_safe = mark_safe(cat.category) %]
+        <option value="[% cat.category %]"[% ' selected' IF filter_category.$cat_safe OR ( filter_group AND ( cat.groups.grep(filter_group).size OR cat.category == filter_group ) ) %]>
             [% cat.category_display %]
             [%~ IF cat.get_extra_metadata('help_text') %] ([% cat.get_extra_metadata('help_text') %])[% END ~%]
         </option>
-- 
cgit v1.2.3


From 90afa8d790808979d1b1fd9c327e0139013b3b90 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 15 Jul 2020 15:17:13 +0100
Subject: Select matches for both filter category and group.

If both are specified, we want to treat it as an AND, not an OR.
---
 CHANGELOG.md                                        | 1 +
 t/app/controller/around.t                           | 8 +++++++-
 templates/web/base/report/new/_category_select.html | 1 +
 templates/web/base/report/new/category.html         | 2 +-
 templates/web/base/reports/_list-filters.html       | 3 ++-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f724b8f98..d7be16b11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
         - Improve Bing geocoder results.
         - Add option of checking passwords against Have I Been Pwned.
         - Add aerial maps option to Bing maps.
+        - Select matches for both filter category and group. #3110
     - Changes:
         - Mark user as active when sent an email alert.
     - Bugfixes:
diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index e35406bb6..ba5f8c48a 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -250,7 +250,10 @@ subtest 'check category, status and extra filtering works on /around' => sub {
     # Create one open and one fixed report in each category
     foreach my $category ( @$categories ) {
         my $contact = $mech->create_contact_ok( category => $category, body_id => $body->id, email => "$category\@example.org" );
-        if ($category ne 'Pothole') {
+        if ($category eq 'Vegetation') {
+            $contact->set_extra_metadata(group => ['Environment', 'Green']);
+            $contact->update;
+        } elsif ($category eq 'Flytipping') {
             $contact->set_extra_metadata(group => ['Environment']);
             $contact->update;
         }
@@ -281,6 +284,9 @@ subtest 'check category, status and extra filtering works on /around' => sub {
 
         $mech->get_ok( '/around?filter_group=Environment&bbox=' . $bbox );
         $mech->content_contains('<option value="Flytipping" selected>');
+
+        $mech->get_ok( '/around?filter_group=Environment&filter_category=Vegetation&bbox=' . $bbox );
+        $mech->content_like(qr/<optgroup label="Environment">.*?<option value="Vegetation" selected>.*?<optgroup label="Green">.*?<option value="Vegetation">/s);
     };
 
     $json = $mech->get_ok_json( '/around?ajax=1&filter_category=Pothole&bbox=' . $bbox );
diff --git a/templates/web/base/report/new/_category_select.html b/templates/web/base/report/new/_category_select.html
index d5aa9842b..61353647d 100644
--- a/templates/web/base/report/new/_category_select.html
+++ b/templates/web/base/report/new/_category_select.html
@@ -1,3 +1,4 @@
+[% SET filter_group = c.get_param('filter_group') %]
 [%~ IF category_groups.size ~%]
     [%~ FOREACH group IN category_groups ~%]
         [% IF group.name %]<optgroup label="[% group.name %]">[% END %]
diff --git a/templates/web/base/report/new/category.html b/templates/web/base/report/new/category.html
index b5bfd0251..37479e4a5 100644
--- a/templates/web/base/report/new/category.html
+++ b/templates/web/base/report/new/category.html
@@ -10,7 +10,7 @@ END
 [% IF category_options.size OR category_groups.size ~%]
     [%~ BLOCK category_option ~%]
     [% cat_lc = cat.category | lower =%]
-    <option value='[% cat.category | html %]'[% ' selected' IF report.category == cat.category || category_lc == cat_lc ~%]
+    <option value='[% cat.category | html %]'[% ' selected' IF ( report.category == cat.category || category_lc == cat_lc ) AND ( NOT filter_group OR filter_group == group.name ) ~%]
     >[% IF loop.first %][% cat.category_display %][% ELSE %][% cat.category_display | html %][% END %]
     [%~ IF cat.get_extra_metadata('help_text') %] ([% cat.get_extra_metadata('help_text') %])[% END ~%]
     </option>
diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html
index ee9815157..9973a0c1f 100644
--- a/templates/web/base/reports/_list-filters.html
+++ b/templates/web/base/reports/_list-filters.html
@@ -1,9 +1,10 @@
 [% select_status = PROCESS 'reports/_list-filter-status.html' %]
 
+[%# We want to only select things that match all filters, if filters are provided ~%]
 [% BLOCK category_options %]
     [% FOR cat IN categories %]
       [% SET cat_safe = mark_safe(cat.category) %]
-        <option value="[% cat.category %]"[% ' selected' IF filter_category.$cat_safe OR ( filter_group AND ( cat.groups.grep(filter_group).size OR cat.category == filter_group ) ) %]>
+        <option value="[% cat.category %]"[% ' selected' IF ( filter_category.size OR filter_group ) AND ( NOT filter_category.size OR filter_category.$cat_safe ) AND ( NOT filter_group OR filter_group == group.name ) %]>
             [% cat.category_display %]
             [%~ IF cat.get_extra_metadata('help_text') %] ([% cat.get_extra_metadata('help_text') %])[% END ~%]
         </option>
-- 
cgit v1.2.3


From 859fe1336c653bc3a533fd7f1be23cc56b61c03c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 16 Jul 2020 11:09:48 +0100
Subject: Make correct selection from single filter choice.

If a single filter item, that was in multiple groups, was selected,
then the entry in the last group was being selected in the category
dropdown when starting a new report. Make sure we check for a match
in the group first, the same behaviour as when there is an existing
category.
---
 web/cobrands/fixmystreet/fixmystreet.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index d79f17049..ca36d5b46 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -1310,6 +1310,20 @@ fixmystreet.update_pin = function(lonlat, savePushState) {
     }
 };
 
+(function() { // fetch_reporting_data closure
+
+function re_select(group, category) {
+    var cat_in_group = $("#form_category optgroup[label=\"" + group + "\"] option[value=\"" + category + "\"]");
+    if (cat_in_group.length) {
+        cat_in_group.prop({selected:true});
+        return true;
+    } else if ($("#form_category option[value=\"" + category + "\"]").length) {
+        $("#form_category").val(category);
+        return true;
+    }
+    return false;
+}
+
 fixmystreet.fetch_reporting_data = function() {
     $.getJSON('/report/new/ajax', {
         latitude: $('#fixmystreet\\.latitude').val(),
@@ -1364,16 +1378,12 @@ fixmystreet.fetch_reporting_data = function() {
         }
 
         $('#form_category_row').html(data.category);
-        var cat_in_group = $("#form_category optgroup[label=\"" + old_category_group + "\"] option[value=\"" + old_category + "\"]");
-        if (cat_in_group.length) {
-            cat_in_group.prop({selected:true});
-        } else if ($("#form_category option[value=\"" + old_category + "\"]").length) {
-            $("#form_category").val(old_category);
-        } else if (filter_category !== undefined && $("#form_category option[value='" + filter_category + "']").length) {
+        var reselected = re_select(old_category_group, old_category);
+        if (!reselected && filter_category !== undefined) {
             // If the category filter appears on the map and the user has selected
             // something from it, then pre-fill the category field in the report,
             // if it's a value already present in the drop-down.
-            $("#form_category").val(filter_category);
+            re_select(old_category_group, filter_category);
         }
 
         fixmystreet.set_up.category_groups(old_category_group);
@@ -1408,6 +1418,8 @@ fixmystreet.fetch_reporting_data = function() {
     });
 };
 
+})(); // fetch_reporting_data closure
+
 fixmystreet.display = {
   begin_report: function(lonlat, saveHistoryState) {
     lonlat = fixmystreet.maps.begin_report(lonlat);
-- 
cgit v1.2.3


From 60af4a782721257e2647cc37cff8234779361e43 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 16 Jul 2020 16:49:05 +0100
Subject: Spot user set on update not at object creation.

The changes in 67823bc78 create the necessary metadata at the creation
of a Comment object, but if the user is not included at that point but
later (as is done by the normal public update flow), then it would not
be created. Wrap the user accessor so we can make sure it is set.
---
 perllib/FixMyStreet/DB/Result/Comment.pm | 20 ++++++++++++++++++++
 t/app/controller/report_updates.t        |  1 +
 2 files changed, 21 insertions(+)

diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index c876f3459..2ef8925e6 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -145,6 +145,26 @@ sub FOREIGNBUILDARGS {
     return $opts;
 };
 
+=head2 around user
+
+Also make sure we catch the setting of a user on an object at a time other than
+object creation, to set the extra field needed.
+
+=cut
+
+around user => sub {
+    my ( $orig, $self ) = ( shift, shift );
+    my $res = $self->$orig(@_);
+    if (@_) {
+        if ($_[0]->is_superuser) {
+            $self->set_extra_metadata( is_superuser => 1 );
+        } elsif (my $body = $_[0]->from_body) {
+            $self->set_extra_metadata( is_body_user => $body->id );
+        }
+    }
+    return $res;
+};
+
 =head2 get_cobrand_logged
 
 Get a cobrand object for the cobrand the update was made on.
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 3198cf70c..0b60ac02b 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -907,6 +907,7 @@ subtest "check comment with no status change has not status in meta" => sub {
 
         is $report->state, 'investigating', 'correct report state';
         is $update->problem_state, 'investigating', 'correct update state';
+        is $update->get_extra_metadata('is_body_user'), $body->id, 'correct metadata';
         $update_meta = $mech->extract_update_metas;
         like $update_meta->[0], qr/fixed/i, 'first update meta says fixed';
         unlike $update_meta->[2], qr/State changed to/, 'second update meta does not include state change';
-- 
cgit v1.2.3


From 5cff522976b840167b0ed7a1226c16b272238d06 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Mon, 20 Jul 2020 11:11:55 +0100
Subject: [Hounslow] skip disabled contacts in enquiry form

This is largely to resolve an issue with the TfL other category
appearing in the contact form even though it is disabled, and hence has
no contact details.
---
 t/app/controller/contact_enquiry.t            | 10 ++++++++++
 templates/web/base/contact/enquiry/index.html |  1 +
 2 files changed, 11 insertions(+)

diff --git a/t/app/controller/contact_enquiry.t b/t/app/controller/contact_enquiry.t
index af249ec6c..feb2a0545 100644
--- a/t/app/controller/contact_enquiry.t
+++ b/t/app/controller/contact_enquiry.t
@@ -40,9 +40,18 @@ my $contact4 = $mech->create_contact_ok(
     category => 'Carriageway Defect',
     email => 'potholes@example.com',
 );
+my $contact5 = $mech->create_contact_ok(
+    body_id => $body->id,
+    category => 'Other (disabled)',
+    email => 'other@example.com',
+);
 $contact->update( { extra => { group => 'General Enquiries' } } );
 $contact2->update( { extra => { group => 'General Enquiries' } } );
 $contact3->update( { extra => { group => 'Other' } } );
+$contact5->update( { extra => { group => 'Other' } } );
+
+$contact5->push_extra_fields({ code => '_fms_disable_', 'disable_form' => 'true', description => 'form_disabled' });
+$contact5->update;
 
 FixMyStreet::override_config { ALLOWED_COBRANDS => ['bromley'], }, sub {
     subtest 'redirected to / if general enquiries not enabled' => sub {
@@ -60,6 +69,7 @@ FixMyStreet::override_config {
     subtest 'Non-general enquiries category not shown' => sub {
         $mech->get_ok( '/contact/enquiry' );
         $mech->content_lacks('Carriageway Defect');
+        $mech->content_lacks('Other (disabled)');
         $mech->content_contains('FOI Request');
     };
 
diff --git a/templates/web/base/contact/enquiry/index.html b/templates/web/base/contact/enquiry/index.html
index c88ca221e..1180c08b4 100644
--- a/templates/web/base/contact/enquiry/index.html
+++ b/templates/web/base/contact/enquiry/index.html
@@ -34,6 +34,7 @@
         <select class="form-control required" name="category" id="category">
          <option value="">[% loc('-- Please select --') %]</option>
         [% FOREACH contact IN contacts %]
+         [% NEXT IF contact.get_extra_field(, 'code', '_fms_disable_').disable_form == 'true' %]
          <option value="[% contact.category | html %]" [% "selected" IF report.category == contact.category %]>[% contact.category | html %]</option>
         [% END %]
         </select>
-- 
cgit v1.2.3


From 82e7b51deb93d83618e99d9e092951695f221906 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 29 Jul 2020 12:52:43 +0100
Subject: Include textarea in alert email form copy.

The recaptcha used by fixmystreet.com uses a textarea.
---
 web/cobrands/fixmystreet/fixmystreet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index ca36d5b46..032140298 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -1117,7 +1117,7 @@ $.extend(fixmystreet.set_up, {
         e.preventDefault();
         var form = $('<form/>').attr({ method:'post', action:"/alert/subscribe" });
         form.append($('<input name="alert" value="Subscribe me to an email alert" type="hidden" />'));
-        $(this).closest('.js-alert-list').find('input[type=email], input[type=text], input[type=hidden], input[type=radio]:checked').each(function() {
+        $(this).closest('.js-alert-list').find('textarea, input[type=email], input[type=text], input[type=hidden], input[type=radio]:checked').each(function() {
             var $v = $(this);
             $('<input/>').attr({ name:$v.attr('name'), value:$v.val(), type:'hidden' }).appendTo(form);
         });
-- 
cgit v1.2.3


From 5bef5a64577601c01f875264911a882b7794ebca Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 29 Jul 2020 18:43:42 +0100
Subject: [fixmystreet.com] Show recaptcha on /around.

The hidden embedded new report form on /around needs to be included,
otherwise report submission could fail.
---
 perllib/FixMyStreet/Cobrand/UK.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index 322b257a7..772310545 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -427,8 +427,8 @@ sub requires_recaptcha {
 
     return 0 if $c->user_exists;
     return 0 if !FixMyStreet->config('RECAPTCHA');
+    return 0 unless $c->action =~ /^(alert|report|around)/;
     return 0 if $c->user_country eq 'GB';
-    return 0 unless $c->action =~ /^(alert|report)/;
     return 1;
 }
 
-- 
cgit v1.2.3


From 34dd7c253d337ea922049390dc6ba44b8686e516 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 29 Jul 2020 15:19:58 +0100
Subject: Prefetch user bodies in admin user search.

---
 perllib/FixMyStreet/App/Controller/Admin/Users.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Admin/Users.pm b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
index c73f1429b..9fd4cd32d 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Users.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
@@ -64,7 +64,7 @@ sub index :Path : Args(0) {
                     -or => [
                         email => { ilike => $isearch },
                         phone => { ilike => $isearch },
-                        name => { ilike => $isearch },
+                        'me.name' => { ilike => $isearch },
                         from_body => $search_n,
                     ]
                 }
@@ -87,7 +87,10 @@ sub index :Path : Args(0) {
         $users = $users->search({ from_body => { '!=', undef } });
     }
 
-    $users = $users->search(undef, { order_by => [ \"name = ''", 'name' ] });
+    $users = $users->search(undef, {
+        prefetch => 'from_body',
+        order_by => [ \"me.name = ''", 'me.name' ],
+    });
     my @users = $users->all;
     $c->stash->{users} = \@users;
     if ($search) {
-- 
cgit v1.2.3


From bd42d6a1fcb6c8e6d89413e0ee22617625d95bad Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 29 Jul 2020 09:03:56 +0100
Subject: Add database index for full text search.

---
 CHANGELOG.md                                       |  1 +
 bin/update-schema                                  |  4 ++
 conf/general.yml-example                           |  4 ++
 db/downgrade_0073---0072.sql                       |  2 +
 db/schema.sql                                      | 12 ++++
 db/schema_0073-add-full-text-search-index.sql      | 13 ++++
 perllib/DBIx/Class/Helper/ResultSet/Me.pm          | 78 ++++++++++++++++++++++
 .../FixMyStreet/App/Controller/Admin/Reports.pm    | 46 +++++--------
 perllib/FixMyStreet/DB/ResultSet/Comment.pm        |  7 +-
 perllib/FixMyStreet/DB/ResultSet/Contact.pm        |  2 +-
 perllib/FixMyStreet/DB/ResultSet/Problem.pm        |  6 ++
 perllib/FixMyStreet/Roles/FullTextSearch.pm        | 22 ++++++
 12 files changed, 164 insertions(+), 33 deletions(-)
 create mode 100644 db/downgrade_0073---0072.sql
 create mode 100644 db/schema_0073-add-full-text-search-index.sql
 create mode 100644 perllib/DBIx/Class/Helper/ResultSet/Me.pm
 create mode 100644 perllib/FixMyStreet/Roles/FullTextSearch.pm

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df449a480..e7f42fdc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
         - Interface for enabling anonymous reports for certain categories. #2989
         - Better sort admin user table.
         - Centralise update creation to include fields.
+        - Add full text index to speed up admin search.
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
diff --git a/bin/update-schema b/bin/update-schema
index 44e299b91..90876cf76 100755
--- a/bin/update-schema
+++ b/bin/update-schema
@@ -78,6 +78,8 @@ print "= Dry run =\n" unless $commit;
 
 my $upgrade = !$downgrade;
 
+my $db_fts_config = FixMyStreet->config('DB_FULL_TEXT_SEARCH_CONFIG') || 'english';
+
 sub get_statements {
     my $path = shift;
     open(my $FP, '<', $path) or die $!;
@@ -91,6 +93,7 @@ sub get_statements {
         $in_function = 1 if /create (or replace )?function/i;
         $in_function = 0 if /language (sql|'plpgsql')/i;
         if ($s =~ /;/ && !$in_function) {
+            $s =~ s/DB_FULL_TEXT_SEARCH_CONFIG/$db_fts_config/g;
             push @statements, $s;
             $s = '';
         }
@@ -212,6 +215,7 @@ else {
 # (assuming schema change files are never half-applied, which should be the case)
 sub get_db_version {
     return 'EMPTY' if ! table_exists('problem');
+    return '0073' if index_exists('problem_fulltext_idx');
     return '0072' if constraint_contains('contacts_state_check', 'staff');
     return '0071' if table_exists('manifest_theme');
     return '0070' if column_like('alert_type', "ref='new_problems'", 'head_title', '{{SITE_NAME}}');
diff --git a/conf/general.yml-example b/conf/general.yml-example
index e42a1433e..ece50d0f3 100644
--- a/conf/general.yml-example
+++ b/conf/general.yml-example
@@ -66,6 +66,10 @@ EXAMPLE_PLACES: [ 'High Street', 'Main Street' ]
 LANGUAGES:
   - 'en-gb,English,en_GB'
 
+# A postgresql text search configuration value - it should match the
+# configuration used by the problem_fulltext_idx index.
+DB_FULL_TEXT_SEARCH_CONFIG: 'english'
+
 # If you're running an installation that is being used in a different time zone
 # from the server, you can set the time zone here (standard time zone string)
 TIME_ZONE: ""
diff --git a/db/downgrade_0073---0072.sql b/db/downgrade_0073---0072.sql
new file mode 100644
index 000000000..1ae19b9d7
--- /dev/null
+++ b/db/downgrade_0073---0072.sql
@@ -0,0 +1,2 @@
+DROP INDEX problem_fulltext_idx;
+DROP INDEX comment_fulltext_idx;
diff --git a/db/schema.sql b/db/schema.sql
index ed21aded6..f198a287b 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -246,6 +246,12 @@ create index problem_user_id_idx on problem ( user_id );
 create index problem_external_body_idx on problem(lower(external_body));
 create index problem_radians_latitude_longitude_idx on problem(radians(latitude), radians(longitude));
 create index problem_bodies_str_array_idx on problem USING gin(regexp_split_to_array(bodies_str, ','));
+create index problem_fulltext_idx on problem USING GIN(
+    to_tsvector(
+        'english',
+        translate(id || ' ' || coalesce(external_id,'') || ' ' || coalesce(bodies_str,'') || ' ' || name || ' ' || title || ' ' || detail, '/.', '  ')
+    )
+);
 
 create table questionnaire (
     id serial not null primary key,
@@ -354,6 +360,12 @@ create table comment (
 create index comment_user_id_idx on comment(user_id);
 create index comment_problem_id_idx on comment(problem_id);
 create index comment_problem_id_created_idx on comment(problem_id, created);
+create index comment_fulltext_idx on comment USING GIN(
+    to_tsvector(
+        'english',
+        translate(id || ' ' || problem_id || ' ' || coalesce(name,'') || ' ' || text, '/.', '  ')
+    )
+);
 
 -- Tokens for confirmations
 create table token (
diff --git a/db/schema_0073-add-full-text-search-index.sql b/db/schema_0073-add-full-text-search-index.sql
new file mode 100644
index 000000000..9871386bd
--- /dev/null
+++ b/db/schema_0073-add-full-text-search-index.sql
@@ -0,0 +1,13 @@
+CREATE INDEX CONCURRENTLY problem_fulltext_idx ON problem USING GIN(
+    to_tsvector(
+        'DB_FULL_TEXT_SEARCH_CONFIG',
+        translate(id || ' ' || coalesce(external_id,'') || ' ' || coalesce(bodies_str,'') || ' ' || name || ' ' || title || ' ' || detail, '/.', '  ')
+    )
+);
+
+CREATE INDEX CONCURRENTLY comment_fulltext_idx on comment USING GIN(
+    to_tsvector(
+        'DB_FULL_TEXT_SEARCH_CONFIG',
+        translate(id || ' ' || problem_id || ' ' || coalesce(name,'') || ' ' || text, '/.', '  ')
+    )
+);
diff --git a/perllib/DBIx/Class/Helper/ResultSet/Me.pm b/perllib/DBIx/Class/Helper/ResultSet/Me.pm
new file mode 100644
index 000000000..6077cffe7
--- /dev/null
+++ b/perllib/DBIx/Class/Helper/ResultSet/Me.pm
@@ -0,0 +1,78 @@
+package DBIx::Class::Helper::ResultSet::Me;
+$DBIx::Class::Helper::ResultSet::Me::VERSION = '2.036000';
+# ABSTRACT: Define predefined searches more nicely
+
+use strict;
+use warnings;
+
+use parent 'DBIx::Class::ResultSet';
+
+sub me { join('.', shift->current_source_alias, shift || q{})  }
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+DBIx::Class::Helper::ResultSet::Me - Define predefined searches more nicely
+
+=head1 SYNOPSIS
+
+ # note that this is normally a component for a ResultSet
+ package MySchema::ResultSet::Bar;
+
+ use strict;
+ use warnings;
+
+ use parent 'DBIx::Class::ResultSet';
+
+ use constant CANDY => 1;
+
+ __PACKAGE__->load_components('Helper::ResultSet::Me');
+
+ sub candy {
+    $_[0]->search({ $_[0]->me.'type' => CANDY })
+ }
+
+ sub cake {
+    $_[0]->search({ $_[0]->me('type') => CAKE })
+ }
+
+ # in code using resultset:
+ my $candy_bars = $schema->resultset('Bar')->candy;
+ my $cake_bars  = $schema->resultset('Bar')->cake;
+
+=head1 DESCRIPTION
+
+This component allows slightly nicer predefined search definition.  See
+L<DBIx::Class::Helper::ResultSet/NOTE> for a nice way to apply it to your
+entire schema.
+
+It defines a single method that is shorter and (to most) clearer than
+L<DBIx::Class::ResultSet/current_source_alias>, which is what it uses
+for the L</me> method.
+
+=head1 METHODS
+
+=head2 me
+
+Merely returns the SQL namespace for the current search with a C<.> at the end,
+allowing internal resultset methods to be defined with C<< $self->me >> instead
+of C<< $self->current_source_alias . q(.) >>.  Also, if you pass it a single
+argument it will append that to the returned string.
+
+=head1 AUTHOR
+
+Arthur Axel "fREW" Schmidt <frioux+cpan@gmail.com>
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2020 by Arthur Axel "fREW" Schmidt.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
index 48386cf3e..052230643 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
@@ -50,6 +50,8 @@ sub index : Path {
 
     return if $c->cobrand->call_hook(report_search_query => $query, $p_page, $u_page, $order);
 
+    my $problems = $c->cobrand->problems;
+
     if (my $search = $c->get_param('search')) {
         $search = $self->trim($search);
 
@@ -62,9 +64,6 @@ sub index : Path {
 
         $c->stash->{searched} = $search;
 
-        my $search_n = 0;
-        $search_n = int($search) if $search =~ /^\d+$/;
-
         my $like_search = "%$search%";
 
         my $parsed = FixMyStreet::SMS->parse_username($search);
@@ -92,20 +91,10 @@ sub index : Path {
                 'me.external_id' => { like => "%$1%" }
             ];
         } else {
-            $query->{'-or'} = [
-                'me.id' => $search_n,
-                'user.email' => { ilike => $like_search },
-                'user.phone' => { ilike => $like_search },
-                'me.external_id' => { ilike => $like_search },
-                'me.name' => { ilike => $like_search },
-                'me.title' => { ilike => $like_search },
-                detail => { ilike => $like_search },
-                bodies_str => { like => $like_search },
-                cobrand_data => { like => $like_search },
-            ];
+            $problems = $problems->search_text($search);
         }
 
-        my $problems = $c->cobrand->problems->search(
+        $problems = $problems->search(
             $query,
             {
                 join => 'user',
@@ -119,6 +108,7 @@ sub index : Path {
         $c->stash->{problems} = [ $problems->all ];
         $c->stash->{problems_pager} = $problems->pager;
 
+        my $updates = $c->cobrand->updates;
         if ($valid_email) {
             $query = [
                 'user.email' => { ilike => $like_search },
@@ -133,24 +123,18 @@ sub index : Path {
                 'me.problem_id' => int($1),
             ];
         } elsif ($search =~ /^area:(\d+)$/) {
-            $query = [];
+            $query = 0;
         } else {
-            $query = [
-                'me.id' => $search_n,
-                'problem.id' => $search_n,
-                'user.email' => { ilike => $like_search },
-                'user.phone' => { ilike => $like_search },
-                'me.name' => { ilike => $like_search },
-                text => { ilike => $like_search },
-                'me.cobrand_data' => { ilike => $like_search },
-            ];
+            $updates = $updates->search_text($search);
+            $query = 1;
         }
 
-        if (@$query) {
-            my $updates = $c->cobrand->updates->search(
-                {
-                    -or => $query,
-                },
+        $query = { -or => $query } if ref $query;
+
+        if ($query) {
+            $query = undef unless ref $query;
+            $updates = $updates->search(
+                $query,
                 {
                     '+columns' => ['user.email'],
                     join => 'user',
@@ -165,7 +149,7 @@ sub index : Path {
 
     } else {
 
-        my $problems = $c->cobrand->problems->search(
+        $problems = $problems->search(
             $query,
             {
                 '+columns' => ['user.email'],
diff --git a/perllib/FixMyStreet/DB/ResultSet/Comment.pm b/perllib/FixMyStreet/DB/ResultSet/Comment.pm
index 034b86a40..0a4403e52 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Comment.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Comment.pm
@@ -4,12 +4,17 @@ use base 'DBIx::Class::ResultSet';
 use strict;
 use warnings;
 
+use Moo;
+with 'FixMyStreet::Roles::FullTextSearch';
+__PACKAGE__->load_components('Helper::ResultSet::Me');
+sub text_search_columns { qw(id problem_id name text) }
+sub text_search_nulls { qw(name) }
+
 sub to_body {
     my ($rs, $bodies) = @_;
     return FixMyStreet::DB::ResultSet::Problem::to_body($rs, $bodies, 1);
 }
 
-
 sub timeline {
     my ( $rs ) = @_;
 
diff --git a/perllib/FixMyStreet/DB/ResultSet/Contact.pm b/perllib/FixMyStreet/DB/ResultSet/Contact.pm
index 3aceee9e7..accdbb7de 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Contact.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Contact.pm
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 use POSIX qw(strcoll);
 
-sub me { join('.', shift->current_source_alias, shift || q{})  }
+__PACKAGE__->load_components('Helper::ResultSet::Me');
 
 =head2 not_deleted
 
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index 9f7c035ed..3ac9187ee 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -8,6 +8,12 @@ use Memcached;
 use mySociety::Locale;
 use FixMyStreet::DB;
 
+use Moo;
+with 'FixMyStreet::Roles::FullTextSearch';
+__PACKAGE__->load_components('Helper::ResultSet::Me');
+sub text_search_columns { qw(id external_id bodies_str name title detail) }
+sub text_search_nulls { qw(external_id bodies_str) }
+
 my $site_key;
 
 sub set_restriction {
diff --git a/perllib/FixMyStreet/Roles/FullTextSearch.pm b/perllib/FixMyStreet/Roles/FullTextSearch.pm
new file mode 100644
index 000000000..78dbd5c18
--- /dev/null
+++ b/perllib/FixMyStreet/Roles/FullTextSearch.pm
@@ -0,0 +1,22 @@
+package FixMyStreet::Roles::FullTextSearch;
+
+use Moo::Role;
+use FixMyStreet;
+
+requires 'text_search_columns';
+requires 'text_search_nulls';
+
+sub search_text {
+    my ($rs, $query) = @_;
+    my %nulls = map { $_ => 1 } $rs->text_search_nulls;
+    my @cols = map {
+        my $col = $rs->me($_);
+        $nulls{$_} ? "coalesce($col, '')" : $col;
+    } $rs->text_search_columns;
+    my $vector = "translate(" . join(" || ' ' || ", @cols) . ", '/.', '  ')";
+    my $config = FixMyStreet->config('DB_FULL_TEXT_SEARCH_CONFIG') || 'english';
+    $rs->search(\[ "to_tsvector('$config', $vector) @@ plainto_tsquery('$config', ?)", $query ]);
+}
+
+1;
+
-- 
cgit v1.2.3


From 6c472bbf73bc3de5124a7eccd220a2a6a6b181d6 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 23 Jan 2020 11:23:13 +0000
Subject: [Zurich] Fix admin search box on some admin pages.

---
 templates/web/zurich/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index 347bf6b70..49901ebb9 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -66,7 +66,7 @@
             </li>
             [% END %]
             <li class="search-box">
-                <form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+                <form method="get" action="[% c.uri_for_action('/admin/reports/index') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
                     <input type="text" name="search" size="20" id="search" placeholder="[% loc('Search reports') %]">
                 </form>
 
-- 
cgit v1.2.3


From 3c44ce81d6c1d132d869f395278c20769d7153c2 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 21 Jan 2020 16:58:58 +0000
Subject: [Zurich] Factor out user edit form.

---
 templates/web/base/admin/users/_form_details.html | 33 ++++++++++++++++++
 templates/web/base/admin/users/form.html          | 42 ++++-------------------
 templates/web/zurich/admin/users/form.html        | 36 +++++++++++++++++++
 3 files changed, 75 insertions(+), 36 deletions(-)
 create mode 100644 templates/web/base/admin/users/_form_details.html
 create mode 100644 templates/web/zurich/admin/users/form.html

diff --git a/templates/web/base/admin/users/_form_details.html b/templates/web/base/admin/users/_form_details.html
new file mode 100644
index 000000000..e526ceb06
--- /dev/null
+++ b/templates/web/base/admin/users/_form_details.html
@@ -0,0 +1,33 @@
+<li>
+  <div class="admin-hint">
+    <p>
+      [% loc(
+        "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.
+        Names are not necessarily unique.")
+      %]
+    </p>
+  </div>
+  <label for="name">[% loc('Name:') %]</label>
+  <input type='text' class="form-control" name='name' id='name' value='[% user.name | html %]'>
+</li>
+
+<li><label for="email">[% loc('Email:') %]</label>
+<input type='text' class="form-control" id='email' name='email' value='[% user.email | html %]'>
+[% IF user %]
+    <input class="btn" type="submit" name="send_login_email" value="[% loc('Send login email') %]">
+[% END %]
+</li>
+
+<li><label class="inline-text" for="email_verified">[% loc('Email verified:') %]</label>
+<input type="checkbox" id="email_verified" name="email_verified" value="1" [% user.email_verified ? ' checked' : '' %]>
+
+<li><label for="phone">[% loc('Phone:') %]</label>
+<input type='text' class="form-control" id='phone' name='phone' value='[% user.phone | html %]'></li>
+<li><label class="inline-text" for="phone_verified">[% loc('Phone verified:') %]</label>
+<input type="checkbox" id="phone_verified" name="phone_verified" value="1" [% user.phone_verified ? ' checked' : '' %]>
+
+[% IF username_in_abuse %]
+<li>
+    <p class="error">[% loc('User in abuse table') %] <input name="unban" type="submit" value="[% loc('Unban') %]"></p>
+</li>
+[% END %]
diff --git a/templates/web/base/admin/users/form.html b/templates/web/base/admin/users/form.html
index efe885908..c782b7172 100644
--- a/templates/web/base/admin/users/form.html
+++ b/templates/web/base/admin/users/form.html
@@ -7,38 +7,9 @@
 
     [% INCLUDE 'errors.html' errors = field_errors.values %]
     <ul class="no-bullets">
-        <li>
-          <div class="admin-hint">
-            <p>
-              [% loc(
-                "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.
-                Names are not necessarily unique.")
-              %]
-            </p>
-          </div>
-          <label for="name">[% loc('Name:') %]</label>
-          <input type='text' class="form-control" name='name' id='name' value='[% user.name | html %]'>
-        </li>
-        <li><label for="email">[% loc('Email:') %]</label>
-        <input type='text' class="form-control" id='email' name='email' value='[% user.email | html %]'>
-        [% IF user %]
-            <input class="btn" type="submit" name="send_login_email" value="[% loc('Send login email') %]">
-        [% END %]
-        </li>
-        <li><label class="inline-text" for="email_verified">[% loc('Email verified:') %]</label>
-        <input type="checkbox" id="email_verified" name="email_verified" value="1" [% user.email_verified ? ' checked' : '' %]>
-        <li><label for="phone">[% loc('Phone:') %]</label>
-        <input type='text' class="form-control" id='phone' name='phone' value='[% user.phone | html %]'></li>
-        <li><label class="inline-text" for="phone_verified">[% loc('Phone verified:') %]</label>
-        <input type="checkbox" id="phone_verified" name="phone_verified" value="1" [% user.phone_verified ? ' checked' : '' %]>
+        [% PROCESS 'admin/users/_form_details.html' %]
 
-      [% IF username_in_abuse %]
-      <li>
-            <p class="error">[% loc('User in abuse table') %] <input name="unban" type="submit" value="[% loc('Unban') %]"></p>
-      </li>
-      [% END %]
-
-      [% IF c.user.is_superuser || c.cobrand.moniker == 'zurich' %]
+      [% IF c.user.is_superuser %]
         <li>
           <div class="admin-hint">
             <p>
@@ -72,7 +43,7 @@
           </li>
       [% END %]
 
-        [% IF areas AND c.cobrand.moniker != 'zurich' %]
+        [% IF areas %]
           <li>
             <div class="admin-hint">
               <p>
@@ -94,14 +65,14 @@
           </li>
         [% END %]
 
-        [% IF contacts AND c.cobrand.moniker != 'zurich'%]
+        [% IF contacts %]
           <li class="js-user-categories">
             [% INCLUDE 'admin/category-checkboxes.html' hint=loc("Authorised staff users can be associated with the categories in which they operate.") %]
           </li>
         [% END %]
 
 
-      [% IF user.from_body AND c.cobrand.moniker != 'zurich' %]
+      [% IF user.from_body %]
         <li>
           <div class="admin-hint">
             <p>
@@ -116,7 +87,6 @@
         </li>
       [% END %]
 
-      [% IF c.cobrand.moniker != 'zurich' %]
         <li>
           <div class="admin-hint">
             <p>
@@ -197,7 +167,7 @@
             </fieldset>
           </li>
         [% END %]
-      [% END %]
+
       [% TRY %][% INCLUDE 'admin/users/form-extra-fields.html' %][% CATCH file %][% END %]
     </ul>
     <p>
diff --git a/templates/web/zurich/admin/users/form.html b/templates/web/zurich/admin/users/form.html
new file mode 100644
index 000000000..5182d943e
--- /dev/null
+++ b/templates/web/zurich/admin/users/form.html
@@ -0,0 +1,36 @@
+<form method="post" id="user_edit" action="[%
+    SET action_end = user.id || 'add';
+    c.uri_for_action( 'admin/users/edit', [ action_end ] )
+    %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+    <input type="hidden" name="token" value="[% csrf_token %]" >
+    <input type="hidden" name="submit" value="1" >
+
+    [% INCLUDE 'errors.html' errors = field_errors.values %]
+    <ul class="no-bullets">
+        [% PROCESS 'admin/users/_form_details.html' %]
+
+        <li>
+          <label for="body">[% loc('Body:') %]</label>
+          <select class="form-control" id='body' name='body'>
+            <option value=''>[% loc('No body') %]</option>
+          [% FOR body IN bodies %]
+            <option value="[% body.id %]"[% ' selected data-originally-selected' IF body.id == user.from_body.id %]>[% body.name %]</option>
+          [% END %]
+          </select>
+        </li>
+
+    </ul>
+    <p>
+      <input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" >
+    </p>
+
+  [% IF user AND NOT user.from_body %]
+    <ul class="no-bullets danger-zone">
+      <li><input class="btn-danger" type="submit" name="logout_everywhere" value="[% loc('Log out of all sessions') %]">
+      <li><input class="btn-danger" type="submit" name="anon_everywhere" value="[% loc('Make anonymous on all reports and updates') %]">
+      <li><input class="btn-danger" type="submit" name="hide_everywhere" value="[% loc('Hide all reports and updates') %]">
+      <li><input class="btn-danger" type="submit" name="remove_account" value="[% loc('Remove account details') %]">
+    </ul>
+  [% END %]
+
+</form>
-- 
cgit v1.2.3


From 9756c8470d02bcfa36c77bd422181273727fa3aa Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 22 Jan 2020 10:51:13 +0000
Subject: [Zurich] Factor out admin index list table.

---
 templates/web/zurich/admin/_index_table.html  | 20 ++++++++++++++++++++
 templates/web/zurich/admin/index-dm.html      | 27 +++------------------------
 templates/web/zurich/admin/index-sdm.html     | 26 +++-----------------------
 templates/web/zurich/admin/reports/index.html | 17 ++---------------
 4 files changed, 28 insertions(+), 62 deletions(-)
 create mode 100644 templates/web/zurich/admin/_index_table.html

diff --git a/templates/web/zurich/admin/_index_table.html b/templates/web/zurich/admin/_index_table.html
new file mode 100644
index 000000000..d523f4a20
--- /dev/null
+++ b/templates/web/zurich/admin/_index_table.html
@@ -0,0 +1,20 @@
+<table cellspacing="0" cellpadding="2" border="1">
+    <tr>
+        <th>[% loc('ID') %]</th>
+        <th>[% loc('Description') %]</th>
+      [% FOREACH col IN [ [ 'category', loc('Category') ], [ 'created', loc('Submitted') ], [ 'lastupdate', loc('Updated') ], [ 'state', loc('Status') ] ] %]
+        <th><a href="[% INCLUDE sort_link choice = col.0 %]#[% hash %]">[% col.1 %] [% INCLUDE sort_arrow choice = col.0 %]</a></th>
+      [% END %]
+    [% IF include_subdiv %]
+        <th>[% loc('Subdivision/Body') %]</th>
+    [% END %]
+        <th>[% loc('Photo') %]</th>
+        [% IF NOT no_edit %]
+        <th class='edit'>*</th>
+        [% END %]
+    </tr>
+    <tr class="filter-row">
+        <td colspan="8"><input type="text" placeholder="[%= loc('Filter report list') %]" /></td>
+    </tr>
+[% INCLUDE 'admin/problem_row.html' %]
+</table>
diff --git a/templates/web/zurich/admin/index-dm.html b/templates/web/zurich/admin/index-dm.html
index 39fa34dcb..eb791e8d2 100644
--- a/templates/web/zurich/admin/index-dm.html
+++ b/templates/web/zurich/admin/index-dm.html
@@ -6,34 +6,13 @@
 </div>
 
 <h2 id="submitted">[% loc('Submitted') %]</h2>
-[% INCLUDE list, problems = submitted.all, hash = 'submitted' %]
+[% INCLUDE 'admin/_index_table.html' problems=submitted.all hash='submitted' %]
 
 <h2 id="feedback_pending">Rückmeldung ausstehend</h2>
-[% INCLUDE list, problems = approval.all, hash = 'feedback_pending' %]
+[% INCLUDE 'admin/_index_table.html' problems=approval.all hash='feedback_pending' %]
 
 <h2 id="alle">[% loc('All reports') %]</h2>
-[% INCLUDE list, problems = other.all, include_subdiv = 1, hash = 'alle' %]
+[% INCLUDE 'admin/_index_table.html' problems=other.all include_subdiv=1 hash='alle' %]
 [% INCLUDE 'pagination.html', admin = 1, param = 'p', hash = 'alle' %]
 
 [% INCLUDE 'admin/footer.html' %]
-
-[% BLOCK list %]
-<table cellspacing="0" cellpadding="2" border="1">
-    <tr>
-        <th>[% loc('ID') %]</th>
-        <th>[% loc('Description') %]</th>
-      [% FOREACH col IN [ [ 'category', loc('Category') ], [ 'created', loc('Submitted') ], [ 'lastupdate', loc('Updated') ], [ 'state', loc('Status') ] ] %]
-        <th><a href="[% INCLUDE sort_link choice = col.0 %]#[% hash %]">[% col.1 %] [% INCLUDE sort_arrow choice = col.0 %]</a></th>
-      [% END %]
-    [% IF include_subdiv %]
-        <th>[% loc('Subdivision/Body') %]</th>
-    [% END %]
-        <th>[% loc('Photo') %]</th>
-        <th class='edit'>*</th>
-    </tr>
-    <tr class="filter-row">
-        <td colspan="8"><input type="text" placeholder="[%= loc('Filter report list') %]" /></td>
-    </tr>
-[% INCLUDE 'admin/problem_row.html' %]
-</table>
-[% END %]
diff --git a/templates/web/zurich/admin/index-sdm.html b/templates/web/zurich/admin/index-sdm.html
index 68a2fcf62..6155f6a39 100644
--- a/templates/web/zurich/admin/index-sdm.html
+++ b/templates/web/zurich/admin/index-sdm.html
@@ -2,33 +2,13 @@
 [% PROCESS 'admin/report_blocks.html' %]
 
 <h2 id="new">[% loc('New reports') %]</h2>
-[% INCLUDE list, problems = reports_new.all, hash = 'new' %]
+[% INCLUDE 'admin/_index_table.html' problems=reports_new.all hash='new' %]
 
 <h2 id="wait">[% loc('Reports awaiting approval') %]</h2>
-[% INCLUDE list, problems = reports_unpublished.all, hash = 'wait' %]
+[% INCLUDE 'admin/_index_table.html' problems=reports_unpublished.all hash='wait' %]
 
 <h2 id="alle">[% loc('Reports published') %]</h2>
-[% INCLUDE list, problems = reports_published.all, no_edit = 1, hash = 'alle' %]
+[% INCLUDE 'admin/_index_table.html' problems=reports_published.all no_edit=1 hash='alle' %]
 [% INCLUDE 'pagination.html', admin = 1, param = 'p', hash = 'alle' %]
 
 [% INCLUDE 'admin/footer.html' %]
-
-[% BLOCK list %]
-<table cellspacing="0" cellpadding="2" border="1">
-    <tr>
-        <th>[% loc('ID') %]</th>
-        <th>[% loc('Description') %]</th>
-      [% FOREACH col IN [ [ 'category', loc('Category') ], [ 'created', loc('Submitted') ], [ 'lastupdate', loc('Updated') ], [ 'state', loc('Status') ] ] %]
-        <th><a href="[% INCLUDE sort_link choice = col.0 %]#[% hash %]">[% col.1 %] [% INCLUDE sort_arrow choice = col.0 %]</a></th>
-      [% END %]
-        <th>[% loc('Photo') %]</th>
-        [% IF NOT no_edit %]
-        <th class='edit'>*</th>
-        [% END %]
-    </tr>
-    <tr class="filter-row">
-        <td colspan="8"><input type="text" placeholder="[%= loc('Filter report list') %]" /></td>
-    </tr>
-[% INCLUDE 'admin/problem_row.html' %]
-</table>
-[% END %]
diff --git a/templates/web/zurich/admin/reports/index.html b/templates/web/zurich/admin/reports/index.html
index 481dfb49d..ecb7c9519 100644
--- a/templates/web/zurich/admin/reports/index.html
+++ b/templates/web/zurich/admin/reports/index.html
@@ -6,21 +6,8 @@
 </form>
 
 [% IF problems.size %]
-<table cellspacing="0" cellpadding="2" border="1">
-    <tr>
-        <th>[% loc('ID') %]</th>
-        <th>[% loc('Description') %]</th>
-      [% FOREACH col IN [ [ 'category', loc('Category') ], [ 'created', loc('Submitted') ], [ 'lastupdate', loc('Updated') ], [ 'state', loc('Status') ] ] %]
-        <th><a href="[% INCLUDE sort_link choice = col.0 %]">[% col.1 %] [% INCLUDE sort_arrow choice = col.0 %]</a></th>
-      [% END %]
-        <th>[% loc('Photo') %]</th>
-        <th class='edit'>*</th>
-    </tr>
-    [% INCLUDE 'admin/problem_row.html' %]
-</table>
-
-[% INCLUDE 'pagination.html', admin = 1, param = 'p', pager = problems_pager %]
-
+    [% PROCESS 'admin/_index_table.html' %]
+    [% INCLUDE 'pagination.html', admin = 1, param = 'p', pager = problems_pager %]
 [% END %]
 
 [% INCLUDE 'admin/list_updates.html' %]
-- 
cgit v1.2.3


From 8e9c3fb35f86f328bd31710af519a5e6b65f4c7f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 23 Jan 2020 09:37:36 +0000
Subject: [Zurich] Factor out admin index ordering function.

---
 perllib/FixMyStreet/Cobrand/Zurich.pm | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 42932ec41..7930ff6b1 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -454,6 +454,16 @@ sub admin_type {
     return $type;
 }
 
+sub _admin_index_order {
+    my $self = shift;
+    my $c = $self->{c};
+    my $order = $c->get_param('o') || 'created';
+    my $dir = defined $c->get_param('d') ? $c->get_param('d') : 1;
+    $c->stash->{order} = $order;
+    $c->stash->{dir} = $dir;
+    return $dir ? { -desc => $order } : $order;
+}
+
 sub admin {
     my $self = shift;
     my $c = $self->{c};
@@ -466,13 +476,9 @@ sub admin {
         my @children = map { $_->id } $body->bodies->all;
         my @all = (@children, $body->id);
 
-        my $order = $c->get_param('o') || 'created';
-        my $dir = defined $c->get_param('d') ? $c->get_param('d') : 1;
-        $c->stash->{order} = $order;
-        $c->stash->{dir} = $dir;
-        $order = { -desc => $order } if $dir;
+        my $order = $self->_admin_index_order;
 
-        # XXX No multiples or missing bodies
+        # No multiples or missing bodies
         $c->stash->{submitted} = $c->cobrand->problems->search({
             state => [ 'submitted', 'confirmed' ],
             bodies_str => $c->stash->{body}->id,
@@ -499,14 +505,9 @@ sub admin {
         $c->stash->{template} = 'admin/index-sdm.html';
 
         my $body = $c->stash->{body};
+        my $order = $self->_admin_index_order;
 
-        my $order = $c->get_param('o') || 'created';
-        my $dir = defined $c->get_param('d') ? $c->get_param('d') : 1;
-        $c->stash->{order} = $order;
-        $c->stash->{dir} = $dir;
-        $order = { -desc => $order } if $dir;
-
-        # XXX No multiples or missing bodies
+        # No multiples or missing bodies
         $c->stash->{reports_new} = $c->cobrand->problems->search( {
             state => 'in progress',
             bodies_str => $body->id,
-- 
cgit v1.2.3


From fb0c5f39f46275e45074c8707f122a8c4e824ab5 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 23 Jan 2020 11:39:47 +0000
Subject: [Zurich] Remove unused filter-row.

---
 templates/web/zurich/admin/_index_table.html |  3 ---
 web/cobrands/sass/_admin.scss                | 16 ----------------
 2 files changed, 19 deletions(-)

diff --git a/templates/web/zurich/admin/_index_table.html b/templates/web/zurich/admin/_index_table.html
index d523f4a20..232d4dc80 100644
--- a/templates/web/zurich/admin/_index_table.html
+++ b/templates/web/zurich/admin/_index_table.html
@@ -13,8 +13,5 @@
         <th class='edit'>*</th>
         [% END %]
     </tr>
-    <tr class="filter-row">
-        <td colspan="8"><input type="text" placeholder="[%= loc('Filter report list') %]" /></td>
-    </tr>
 [% INCLUDE 'admin/problem_row.html' %]
 </table>
diff --git a/web/cobrands/sass/_admin.scss b/web/cobrands/sass/_admin.scss
index 4ae019776..e78820ae9 100644
--- a/web/cobrands/sass/_admin.scss
+++ b/web/cobrands/sass/_admin.scss
@@ -43,22 +43,6 @@ $button_bg_col: #a1a1a1;  // also search bar (tables)
             text-align: center;
             font-weight: bold;
         }
-        tr.filter-row td {
-            display: none; /* TODO: reveal when filtering is implemented */
-            padding: flip(4px 4px 4px 40px, 4px 40px 4px 4px);
-            background-color: $button_bg_col;
-            background-image: url('/cobrands/zurich/search-icon-white.png');
-            background-position: flip(14px, right) center;
-            background-repeat: no-repeat;
-            border-bottom: 2px solid $table_border_color;
-        }
-        tr.filter-row td input[type=text] {
-            background-color: #e1e1e1;
-            width: 16em;
-            @include border-radius(4px);
-            border: none;
-            padding: 3px 0.5em;
-        }
         tr.is-deleted {
           background-color: #ffdddd;
           img {
-- 
cgit v1.2.3


From 04ce3fe145b50107eb83a9dcdd349ac1f110cae6 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 24 Jan 2020 13:07:02 +0000
Subject: [Zurich] Remove a few test log out/ins.

---
 t/cobrand/zurich.t | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index 8c5acddca..d8e39c304 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -747,26 +747,20 @@ subtest "superuser and dm can see stats" => sub {
     $user = $mech->log_in_ok( 'dm1@example.org' );
     $mech->get( '/admin/stats' );
     is $mech->res->code, 200, "dm can now also see stats page";
-    $mech->log_out_ok;
 };
 
 subtest "only superuser can edit bodies" => sub {
-    $user = $mech->log_in_ok( 'dm1@example.org' );
     $mech->get( '/admin/body/' . $zurich->id );
     is $mech->res->code, 403, "only superuser should be able to edit bodies";
-    $mech->log_out_ok;
 };
 
 subtest "only superuser can see 'Add body' form" => sub {
-    $user = $mech->log_in_ok( 'dm1@example.org' );
     $mech->get_ok( '/admin/bodies' );
     $mech->content_contains('External Body');
     $mech->content_lacks( '<form method="post" action="bodies"' );
-    $mech->log_out_ok;
 };
 
 subtest "phone number is mandatory" => sub {
-    $user = $mech->log_in_ok( 'dm1@example.org' );
     $mech->get_ok( '/report/new?lat=47.381817&lon=8.529156' );
     $mech->submit_form( with_fields => { phone => "" } );
     $mech->content_contains( 'Diese Information wird benötigt' );
-- 
cgit v1.2.3


From e0b0c1650aab6ed688fd32a2b2917d90d1bae604 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 21 Jan 2020 17:01:30 +0000
Subject: [Zurich] Add marking users as government-internal.

---
 t/cobrand/zurich.t                         | 11 ++++++++++-
 templates/web/zurich/admin/users/form.html |  7 +++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index d8e39c304..8def10d4f 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -98,7 +98,7 @@ my $superuser;
 subtest "set up superuser" => sub {
     $superuser = $mech->log_in_ok( 'super@example.org' );
     # a user from body $zurich is a superuser, as $zurich has no parent id!
-    $superuser->update({ from_body => $zurich->id });
+    $superuser->update({ name => 'Superuser', from_body => $zurich->id });
     $EXISTING_REPORT_COUNT = get_export_rows_count($mech);
     $mech->log_out_ok;
 };
@@ -989,6 +989,15 @@ $mech->log_out_ok;
 subtest 'users at the top level can be edited' => sub {
     $mech->log_in_ok( $superuser->email );
     $mech->get_ok('/admin/users/' . $superuser->id );
+    $mech->content_contains('name="flagged">');
+    $mech->submit_form_ok({ with_fields => { flagged => 1 } });
+    $superuser->discard_changes;
+    is $superuser->flagged, 1, 'Marked as flagged';
+    $mech->get_ok('/admin/users/' . $superuser->id );
+    $mech->content_contains('name="flagged" checked');
+    $mech->submit_form_ok({ with_fields => { flagged => 0 } });
+    $superuser->discard_changes;
+    is $superuser->flagged, 0, 'Unmarked';
 };
 
 subtest 'A visit to /reports is okay' => sub {
diff --git a/templates/web/zurich/admin/users/form.html b/templates/web/zurich/admin/users/form.html
index 5182d943e..ec670a28a 100644
--- a/templates/web/zurich/admin/users/form.html
+++ b/templates/web/zurich/admin/users/form.html
@@ -19,6 +19,13 @@
           </select>
         </li>
 
+        <li>
+          <label>
+            [% loc('government-internal') %]
+            <input type="checkbox" id="flagged" name="flagged"[% user.flagged ? ' checked' : '' %]>
+          </label>
+        </li>
+
     </ul>
     <p>
       <input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" >
-- 
cgit v1.2.3


From 8faf42a8d77f5e95840ed633bd21c32923ab2c51 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 23 Jan 2020 09:36:29 +0000
Subject: [Zurich] Mark reports by flagged users non-public.

---
 perllib/FixMyStreet/Cobrand/Zurich.pm |  9 +++++++++
 t/cobrand/zurich.t                    | 11 +++++++++++
 2 files changed, 20 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 7930ff6b1..e9fec8fda 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -1390,4 +1390,13 @@ sub hook_report_filter_status {
     } @$status;
 }
 
+# If report is made by a flagged user, mark as non-public
+sub report_new_munge_before_insert {
+    my ($self, $report) = @_;
+
+    if ($report->user->flagged) {
+        $report->non_public(1);
+    }
+}
+
 1;
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index 8def10d4f..97ac19761 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -14,6 +14,9 @@ use FixMyStreet::Script::Reports;
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
 
+FixMyStreet::App->log->disable('info');
+END { FixMyStreet::App->log->enable('info'); }
+
 # Check that you have the required locale installed - the following
 # should return a line with de_CH.utf8 in. If not install that locale.
 #
@@ -764,6 +767,14 @@ subtest "phone number is mandatory" => sub {
     $mech->get_ok( '/report/new?lat=47.381817&lon=8.529156' );
     $mech->submit_form( with_fields => { phone => "" } );
     $mech->content_contains( 'Diese Information wird benötigt' );
+};
+
+subtest 'test flagged users make internal reports' => sub {
+    $user->update({ flagged => 1 });
+    $mech->submit_form( with_fields => { phone => "01234", category => 'Cat1', detail => 'Details' } );
+    my $report = FixMyStreet::DB->resultset('Problem')->search(undef, { order_by => { -desc => 'id' }, rows => 1 })->single;
+    is $report->non_public, 1;
+    $report->delete;
     $mech->log_out_ok;
 };
 
-- 
cgit v1.2.3


From 7e3742d37dbdab4e5be39230e4738457fecb34a4 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 23 Jan 2020 12:20:19 +0000
Subject: [Zurich] Show internal reports on their own page.

The new internal reports is displayed the same as the main summary, and
all reports shows both internal/non-internal.
---
 bin/zurich/overdue-alert                      |  1 +
 perllib/FixMyStreet/Cobrand/Zurich.pm         |  7 +++++++
 t/cobrand/zurich.t                            | 14 +++++++++++---
 templates/web/zurich/admin/problem_row.html   |  3 ++-
 templates/web/zurich/admin/reports/index.html |  2 +-
 templates/web/zurich/header.html              | 11 ++++++++++-
 6 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/bin/zurich/overdue-alert b/bin/zurich/overdue-alert
index 7689c172f..b052d94d3 100755
--- a/bin/zurich/overdue-alert
+++ b/bin/zurich/overdue-alert
@@ -45,6 +45,7 @@ sub loop_through {
         state => $states,
         created => { '<',  $date_threshold },
         bodies_str => { '!=', undef },
+        non_public => 0,
     } );
 
     my %to_send = ();
diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index e9fec8fda..be73ed9c1 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -468,6 +468,7 @@ sub admin {
     my $self = shift;
     my $c = $self->{c};
     my $type = $c->stash->{admin_type};
+    my $internal = $c->get_param('internal');
 
     if ($type eq 'dm') {
         $c->stash->{template} = 'admin/index-dm.html';
@@ -482,12 +483,14 @@ sub admin {
         $c->stash->{submitted} = $c->cobrand->problems->search({
             state => [ 'submitted', 'confirmed' ],
             bodies_str => $c->stash->{body}->id,
+            non_public => $internal ? 1 : 0,
         }, {
             order_by => $order,
         });
         $c->stash->{approval} = $c->cobrand->problems->search({
             state => 'feedback pending',
             bodies_str => $c->stash->{body}->id,
+            non_public => $internal ? 1 : 0,
         }, {
             order_by => $order,
         });
@@ -496,6 +499,7 @@ sub admin {
         $c->stash->{other} = $c->cobrand->problems->search({
             state => { -not_in => [ 'submitted', 'confirmed', 'feedback pending' ] },
             bodies_str => \@all,
+            non_public => $internal ? 1 : 0,
         }, {
             order_by => $order,
         })->page( $page );
@@ -511,12 +515,14 @@ sub admin {
         $c->stash->{reports_new} = $c->cobrand->problems->search( {
             state => 'in progress',
             bodies_str => $body->id,
+            non_public => $internal ? 1 : 0,
         }, {
             order_by => $order
         } );
         $c->stash->{reports_unpublished} = $c->cobrand->problems->search( {
             state => 'feedback pending',
             bodies_str => $body->parent->id,
+            non_public => $internal ? 1 : 0,
         }, {
             order_by => $order
         } );
@@ -525,6 +531,7 @@ sub admin {
         $c->stash->{reports_published} = $c->cobrand->problems->search( {
             state => 'fixed - council',
             bodies_str => $body->parent->id,
+            non_public => $internal ? 1 : 0,
         }, {
             order_by => $order
         } )->page( $page );
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index 97ac19761..ce38f65d4 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -769,12 +769,20 @@ subtest "phone number is mandatory" => sub {
     $mech->content_contains( 'Diese Information wird benötigt' );
 };
 
+my $internal;
 subtest 'test flagged users make internal reports' => sub {
     $user->update({ flagged => 1 });
     $mech->submit_form( with_fields => { phone => "01234", category => 'Cat1', detail => 'Details' } );
-    my $report = FixMyStreet::DB->resultset('Problem')->search(undef, { order_by => { -desc => 'id' }, rows => 1 })->single;
-    is $report->non_public, 1;
-    $report->delete;
+    $internal = FixMyStreet::DB->resultset('Problem')->search(undef, { order_by => { -desc => 'id' }, rows => 1 })->single;
+    is $internal->non_public, 1;
+};
+
+subtest 'internal report admin display' => sub {
+    $mech->get_ok('/admin/summary');
+    $mech->content_lacks('href="report_edit/' . $internal->id);
+    $mech->get_ok('/admin/summary?internal=1');
+    $mech->content_contains('href="report_edit/' . $internal->id);
+    $internal->delete;
     $mech->log_out_ok;
 };
 
diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html
index 502a7bc39..a138339e6 100644
--- a/templates/web/zurich/admin/problem_row.html
+++ b/templates/web/zurich/admin/problem_row.html
@@ -21,7 +21,8 @@
         <td>[% prettify_state(problem.state) %]
             [% IF problem.state == 'feedback pending';
             SET cs=problem.get_extra_metadata('closure_status');
-            IF cs %] ([% prettify_state(cs) %]) [% END; END %]</td>
+            IF cs %] ([% prettify_state(cs) %]) [% END; END %]
+            [% IF problem.non_public %]<br><i>Interne Meldung</i>[% END %]</td>
 
         [% IF include_subdiv %]
             <td>
diff --git a/templates/web/zurich/admin/reports/index.html b/templates/web/zurich/admin/reports/index.html
index ecb7c9519..e2790309b 100644
--- a/templates/web/zurich/admin/reports/index.html
+++ b/templates/web/zurich/admin/reports/index.html
@@ -1,4 +1,4 @@
-[% PROCESS 'admin/header.html' title=loc('Search Reports') %]
+[% PROCESS 'admin/header.html' title=loc('All Reports') %]
 [% PROCESS 'admin/report_blocks.html' %]
 
 <form method="get" action="[% c.uri_for_action('admin/reports/index') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index 49901ebb9..c9343d8d6 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -41,11 +41,20 @@
             [% pagename = c.req.uri.path %]
             [% pagename = pagename.replace('/admin/?(\w*).*', '$1') %]
 
+            [% IF admin_type == 'super' %]
             <li [% IF pagename == 'summary' OR pagename == '' %]class="current"[% END %]>
                 <a href="/admin/summary">[% loc('Summary') %]</a>
             </li>
+            [% ELSE %]
+            <li [% IF NOT c.get_param('internal') AND (pagename == 'summary' OR pagename == '') %]class="current"[% END %]>
+                <a href="/admin/summary">Öffentliche</a>
+            </li>
+            <li [% IF c.get_param('internal') AND (pagename == 'summary' OR pagename == '') %]class="current"[% END %]>
+                <a href="/admin/summary?internal=1">Interne</a>
+            </li>
+            [% END %]
             <li [% IF pagename == 'reports' OR pagename == 'report_edit' %]class="current"[% END %]>
-                <a href="/admin/reports">[% loc('Reports') %]</a>
+                <a href="/admin/reports">[% loc('All') %]</a>
             </li>
             [% IF admin_type == 'dm' OR admin_type == 'super' %]
             <li [% IF pagename == 'bodies' OR pagename == 'body' %]class="current"[% END %]>
-- 
cgit v1.2.3


From 8fd5db0cb1e873895564486f32d918de385d2f12 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 24 Jan 2020 14:20:29 +0000
Subject: [Zurich] No admin emails on internal reports.

---
 perllib/FixMyStreet/Cobrand/Zurich.pm |  1 +
 t/cobrand/zurich.t                    | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index be73ed9c1..695d10439 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -1061,6 +1061,7 @@ sub _admin_send_email {
     my ( $c, $template, $problem ) = @_;
 
     return unless $problem->get_extra_metadata('email_confirmed');
+    return if $problem->non_public;
 
     my $to = $problem->name
         ? [ $problem->user->email, $problem->name ]
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index ce38f65d4..fb2c08550 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -775,6 +775,7 @@ subtest 'test flagged users make internal reports' => sub {
     $mech->submit_form( with_fields => { phone => "01234", category => 'Cat1', detail => 'Details' } );
     $internal = FixMyStreet::DB->resultset('Problem')->search(undef, { order_by => { -desc => 'id' }, rows => 1 })->single;
     is $internal->non_public, 1;
+    $mech->clear_emails_ok;
 };
 
 subtest 'internal report admin display' => sub {
@@ -782,6 +783,24 @@ subtest 'internal report admin display' => sub {
     $mech->content_lacks('href="report_edit/' . $internal->id);
     $mech->get_ok('/admin/summary?internal=1');
     $mech->content_contains('href="report_edit/' . $internal->id);
+};
+
+subtest 'test no email sent if closed' => sub {
+    $internal->state('feedback pending');
+    $internal->set_extra_metadata('email_confirmed' => 1);
+    $internal->update;
+
+    $mech->get_ok( '/admin/report_edit/' . $internal->id );
+    $mech->submit_form_ok( {
+        button => 'publish_response',
+        with_fields => {
+            status_update => 'Testing no email sent',
+        } });
+
+    $internal->discard_changes;
+    is $internal->state, 'fixed - council';
+    $mech->email_count_is(0);
+
     $internal->delete;
     $mech->log_out_ok;
 };
-- 
cgit v1.2.3


From 1b275ad4e454d772a9874bf3b8aa2506d214a27d Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 23 Jan 2020 12:53:27 +0000
Subject: [Zurich] Add button to remove internal flag.

---
 perllib/FixMyStreet/Cobrand/Zurich.pm           | 46 ++++++++++++++++++-------
 t/cobrand/zurich.t                              |  5 +++
 templates/web/zurich/admin/report_edit-sdm.html |  6 ++++
 templates/web/zurich/admin/reports/edit.html    |  4 +++
 4 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 695d10439..f3cfe8801 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -552,6 +552,18 @@ sub category_options {
     $c->stash->{category_options} = \@categories;
 }
 
+sub report_remove_internal_flag {
+    my $self = shift;
+    my $c = $self->{c};
+    my $problem = $c->stash->{problem};
+    $c->forward('/auth/check_csrf_token');
+    $problem->non_public(0);
+    $problem->update;
+    $c->forward('/admin/log_edit', [ $problem->id, 'problem', 'Intern Flag entfernt' ]);
+    # Make sure the problem's time_spent is updated
+    $self->update_admin_log($c, $problem);
+}
+
 sub admin_report_edit {
     my $self = shift;
     my $c = $self->{c};
@@ -631,6 +643,10 @@ sub admin_report_edit {
         }
     }
 
+    if ( ($type eq 'super' || $type eq 'dm') && $c->get_param('stop_internal') ) {
+        $self->report_remove_internal_flag;
+        return $self->admin_report_edit_done;
+    }
 
     # Problem updates upon submission
     if ( ($type eq 'super' || $type eq 'dm') && $c->get_param('submit') ) {
@@ -871,12 +887,7 @@ sub admin_report_edit {
             $c->go('index');
         }
 
-        $c->stash->{updates} = [ $c->model('DB::Comment')
-          ->search( { problem_id => $problem->id }, { order_by => 'created' } )
-          ->all ];
-
-        $self->stash_states($problem);
-        return 1;
+        return $self->admin_report_edit_done;
     }
 
     if ($type eq 'sdm') {
@@ -913,6 +924,8 @@ sub admin_report_edit {
             # Make sure the problem's time_spent is updated
             $self->update_admin_log($c, $problem);
             $c->res->redirect( '/admin/summary' );
+        } elsif ($editable && $c->get_param('stop_internal')) {
+            $self->report_remove_internal_flag;
         } elsif ($editable && $c->get_param('submit')) {
             $c->forward('/auth/check_csrf_token');
 
@@ -953,13 +966,7 @@ sub admin_report_edit {
             }
         }
 
-        $c->stash->{updates} = [ $c->model('DB::Comment')
-            ->search( { problem_id => $problem->id }, { order_by => 'created' } )
-            ->all ];
-
-        $self->stash_states($problem);
-        return 1;
-
+        return $self->admin_report_edit_done;
     }
 
     $self->stash_states($problem);
@@ -967,6 +974,19 @@ sub admin_report_edit {
 
 }
 
+sub admin_report_edit_done {
+    my $self = shift;
+    my $c = $self->{c};
+    my $problem = $c->stash->{problem};
+    $c->stash->{updates} = [ $c->model('DB::Comment')
+        ->search( { problem_id => $problem->id }, { order_by => 'created' } )
+        ->all ];
+
+    $self->stash_states($problem);
+    return 1;
+}
+
+
 sub admin_district_lookup {
     my ($self, $row) = @_;
     FixMyStreet::Geocode::Zurich::admin_district($row->local_coords);
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index fb2c08550..cab7a3fef 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -800,7 +800,12 @@ subtest 'test no email sent if closed' => sub {
     $internal->discard_changes;
     is $internal->state, 'fixed - council';
     $mech->email_count_is(0);
+};
 
+subtest 'remove internal flag' => sub {
+    $mech->submit_form_ok( { form_number => 2, button => 'stop_internal' } );
+    $internal->discard_changes;
+    is $internal->non_public, 0;
     $internal->delete;
     $mech->log_out_ok;
 };
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index b468bc7a0..9d4afef20 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -85,6 +85,12 @@
 
 <div class="admin-report-edit admin-report-edit--interact">
 
+[% IF problem.non_public %]
+<p align="right" class="screen-only">
+    <input [% sdm_disabled %] type="submit" class="btn" name="stop_internal" value="Keine interne Meldung">
+</p>
+[% END %]
+
 <p align="right" class="screen-only"><input [% sdm_disabled %] type="submit" class="btn" name="send_back" value="[% loc('Not for my subdivision') %]"></p>
 
 [% status_message | safe %]
diff --git a/templates/web/zurich/admin/reports/edit.html b/templates/web/zurich/admin/reports/edit.html
index 147022981..c88c63307 100644
--- a/templates/web/zurich/admin/reports/edit.html
+++ b/templates/web/zurich/admin/reports/edit.html
@@ -119,6 +119,10 @@
 
 [% status_message | safe %]
 
+[% IF problem.non_public %]
+<p align="right" class="screen-only"><input type="submit" class="btn" name="stop_internal" value="Keine interne Meldung"></p>
+[% END %]
+
 <dl [% IF status_message %]class="with-message"[% END %]>
 
     <dt class="screen-only">
-- 
cgit v1.2.3


From 015a2411734f9c7230cdb71893fd6d1af2fb76f5 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 23 Jan 2020 13:23:12 +0000
Subject: [Zurich] SDMs immediately close internal reports.

---
 perllib/FixMyStreet/Cobrand/Zurich.pm | 13 +++++++++----
 t/cobrand/zurich.t                    | 11 +++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index f3cfe8801..0e4c1d907 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -957,10 +957,15 @@ sub admin_report_edit {
 
             # If they clicked the no more updates button, we're done.
             if ($c->get_param('no_more_updates')) {
-                $problem->set_extra_metadata( subdiv_overdue => $self->overdue( $problem ) );
-                $problem->bodies_str( $body->parent->id );
-                $problem->whensent( undef );
-                $self->set_problem_state($c, $problem, 'feedback pending');
+                if ($problem->non_public) {
+                    $problem->bodies_str( $body->parent->id );
+                    $self->set_problem_state($c, $problem, 'fixed - council');
+                } else {
+                    $problem->set_extra_metadata( subdiv_overdue => $self->overdue( $problem ) );
+                    $problem->bodies_str( $body->parent->id );
+                    $problem->whensent( undef );
+                    $self->set_problem_state($c, $problem, 'feedback pending');
+                }
                 $problem->update;
                 $c->res->redirect( '/admin/summary' );
             }
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index cab7a3fef..2992a37e7 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -802,7 +802,18 @@ subtest 'test no email sent if closed' => sub {
     $mech->email_count_is(0);
 };
 
+subtest 'SDM closing internal report' => sub {
+    $mech->log_in_ok('sdm1@example.org');
+    $internal->update({ bodies_str => $subdivision->id, state => 'confirmed' });
+    $mech->get_ok('/admin/report_edit/' . $internal->id);
+    $mech->submit_form_ok( { form_number => 2, button => 'no_more_updates' } );
+    $internal->discard_changes;
+    is $internal->state, 'fixed - council', 'State updated';
+};
+
 subtest 'remove internal flag' => sub {
+    $internal->update({ bodies_str => $subdivision->id, state => 'confirmed' });
+    $mech->get_ok('/admin/report_edit/' . $internal->id);
     $mech->submit_form_ok( { form_number => 2, button => 'stop_internal' } );
     $internal->discard_changes;
     is $internal->non_public, 0;
-- 
cgit v1.2.3


From b9cfc7b5a8366be9b24af2003051371623262d42 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 2 Mar 2020 15:43:49 +0000
Subject: [Zurich] SDM can do fewer with internal reports.

---
 perllib/FixMyStreet/Cobrand/Zurich.pm           |  7 +++++--
 templates/web/zurich/admin/report_edit-sdm.html | 10 +++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 0e4c1d907..4551fcc4a 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -892,8 +892,7 @@ sub admin_report_edit {
 
     if ($type eq 'sdm') {
 
-        my $editable = $type eq 'sdm' && $body->id eq $problem->bodies_str;
-        $c->stash->{sdm_disabled} = $editable ? '' : 'disabled';
+        my $editable = $body->id eq $problem->bodies_str;
 
         # Has cut-down edit template for adding update and sending back up only
         $c->stash->{template} = 'admin/report_edit-sdm.html';
@@ -971,6 +970,10 @@ sub admin_report_edit {
             }
         }
 
+        $c->stash->{sdm_disabled} = $editable ? '' : 'disabled';
+        $c->stash->{sdm_disabled_internal} = $problem->non_public ? 'disabled' : '';
+        $c->stash->{sdm_disabled_fixed} = $problem->is_fixed ? 'disabled' : '';
+
         return $self->admin_report_edit_done;
     }
 
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index 9d4afef20..8d1fa464c 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -87,15 +87,15 @@
 
 [% IF problem.non_public %]
 <p align="right" class="screen-only">
-    <input [% sdm_disabled %] type="submit" class="btn" name="stop_internal" value="Keine interne Meldung">
+    <input [% sdm_disabled %] [% sdm_disabled_fixed %] type="submit" class="btn" name="stop_internal" value="Keine interne Meldung">
 </p>
 [% END %]
 
-<p align="right" class="screen-only"><input [% sdm_disabled %] type="submit" class="btn" name="send_back" value="[% loc('Not for my subdivision') %]"></p>
+<p align="right" class="screen-only"><input [% sdm_disabled %] [% sdm_disabled_fixed %] type="submit" class="btn" name="send_back" value="[% loc('Not for my subdivision') %]"></p>
 
 [% status_message | safe %]
 
-<p align="right" class="screen-only"><input [% sdm_disabled %] type="submit" class="btn" name="not_contactable" value="[% loc('Customer not contactable') %]"></p>
+<p align="right" class="screen-only"><input [% sdm_disabled %] [% sdm_disabled_internal %] [% sdm_disabled_fixed %] type="submit" class="btn" name="not_contactable" value="[% loc('Customer not contactable') %]"></p>
 
 <ul class="no-bullets screen-only">
     <li>
@@ -104,7 +104,7 @@
     </li>
     <li>
         <label for="status_update">[% loc('New note to DM:') %]</label>
-        <textarea [% sdm_disabled %] class="form-control" name='status_update' id='status_update' cols=60 rows=4></textarea>
+        <textarea [% sdm_disabled %] [% sdm_disabled_internal %] [% sdm_disabled_fixed %] class="form-control" name='status_update' id='status_update' cols=60 rows=4></textarea>
     </li>
 </ul>
 
@@ -115,7 +115,7 @@
 
 <p class="clearfix screen-only">
     <input [% sdm_disabled %] style="float:left" type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" >
-    <input [% sdm_disabled %] style="float:right" type="submit" class="btn" name="no_more_updates" value="[% loc('No further updates') %]">
+    <input [% sdm_disabled %] [% sdm_disabled_fixed %] style="float:right" type="submit" class="btn" name="no_more_updates" value="[% loc('No further updates') %]">
 </p>
 
 [% INCLUDE 'admin/list_updates.html' %]
-- 
cgit v1.2.3


From c01d0a50cb9d57ba1c1d53a82d52487f4d5c0e3d Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 14 Apr 2020 16:39:00 +0100
Subject: [Zurich] SDM link internal reports to admin page.

The reports are not visible on the public site,
so SDMs need a way to see them.
---
 templates/web/zurich/admin/problem_row.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html
index a138339e6..08857f165 100644
--- a/templates/web/zurich/admin/problem_row.html
+++ b/templates/web/zurich/admin/problem_row.html
@@ -1,3 +1,5 @@
+[% no_edit = no_edit AND NOT c.req.params.internal ~%]
+
 [%- FOR problem IN problems %]
     [% SET p_body = problem.bodies.values.0 %]
     <tr[%
-- 
cgit v1.2.3


From 7b712ed5a9e78158dbc2b43f5df4ff8fc05ed37c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 6 Jul 2020 13:02:08 +0100
Subject: Make sure disabled inputs greyed out.

---
 web/cobrands/sass/_base.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 07bb2baa1..dbd357646 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -313,6 +313,9 @@ legend,
         box-shadow: none;
         color: #888888;
     }
+    &[disabled] {
+        background-color: #eee;
+    }
 }
 
 select.form-control {
-- 
cgit v1.2.3


From 2e761c6825d76944fd579c98cd0a222d420ea02d Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 31 Jul 2020 10:56:12 +0100
Subject: Lowercase contact email when looking for user.

---
 perllib/FixMyStreet/App/Controller/Contact.pm | 2 +-
 t/app/controller/contact.t                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Contact.pm b/perllib/FixMyStreet/App/Controller/Contact.pm
index 9ce89a9e2..f919cbeff 100644
--- a/perllib/FixMyStreet/App/Controller/Contact.pm
+++ b/perllib/FixMyStreet/App/Controller/Contact.pm
@@ -199,7 +199,7 @@ sub prepare_params_for_email : Private {
     my $base_url = $c->cobrand->base_url();
     my $admin_url = $c->cobrand->admin_base_url;
 
-    my $user = $c->cobrand->users->find( { email => $c->stash->{em} } );
+    my $user = $c->cobrand->users->find( { email => lc $c->stash->{em} } );
     if ( $user ) {
         $c->stash->{user_admin_url} = $admin_url . '/users/' . $user->id;
         $c->stash->{user_reports_admin_url} = $admin_url . '/reports?search=' . $user->email;
diff --git a/t/app/controller/contact.t b/t/app/controller/contact.t
index d6e56e7cc..01e8b0886 100644
--- a/t/app/controller/contact.t
+++ b/t/app/controller/contact.t
@@ -382,7 +382,7 @@ for my $test (
 
         $mech->clear_emails_ok;
         $mech->get_ok('/contact');
-        $test->{fields}{em} = $user->email;
+        $test->{fields}{em} = ucfirst $user->email; # Check case
         $mech->submit_form_ok( { with_fields => $test->{fields} } );
 
         my $email = $mech->get_email;
-- 
cgit v1.2.3


From 361bf0bc0d8b5e86ae2cde5f428129ae23af5999 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Mon, 3 Aug 2020 17:01:54 +0100
Subject: [fixmystreet.org] Update legal wording in footer

---
 docs/_includes/footer.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index d7260aaa7..5f215cf8f 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -47,8 +47,10 @@
                     <p>
                         <a href="https://www.mysociety.org?utm_source=fixmystreet.org&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">mySociety</a>
                         is a registered charity in England and Wales (1076346)
-                        and a limited company (03277032). Through our trading subsidiary
-                        SocietyWorks (05798215) we also provide commercial services.
+                        and a limited company (03277032). We provide commercial
+                        services through our wholly owned subsidiary
+                        <a href="https://www.societyworks.org?utm_source=fixmystreet.org&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">SocietyWorks Ltd</a>
+                        (05798215).
                     </p>
                 </div>
             </div>
-- 
cgit v1.2.3


From 994093c4675393bca6b84747e87a63e10cb063d9 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 4 Aug 2020 15:05:55 +0100
Subject: Do not error in export if report has bad category.

If category groups are enabled, the CSV export includes a subcategory,
but it was only fetching a valid groups value if the row's contact was
found.
---
 perllib/FixMyStreet/App/Controller/Dashboard.pm |  2 +-
 t/app/controller/dashboard.t                    | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index abb2e0988..f7273ca0e 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -493,7 +493,7 @@ sub generate_csv : Private {
         }
 
         if ($asked_for{subcategory}) {
-            my $group = $obj->contact && $obj->contact->groups;
+            my $group = $obj->contact ? $obj->contact->groups : [];
             $group = join(',', @$group);
             if ($group) {
                 $hashref->{subcategory} = $obj->category;
diff --git a/t/app/controller/dashboard.t b/t/app/controller/dashboard.t
index 0f07bcae0..526b1a4c3 100644
--- a/t/app/controller/dashboard.t
+++ b/t/app/controller/dashboard.t
@@ -83,6 +83,7 @@ my $categories = scraper {
 
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => 'no2fa',
+    COBRAND_FEATURES => { category_groups => { no2fa => 1 } },
     MAPIT_URL => 'http://mapit.uk/',
 }, sub {
 
@@ -174,13 +175,14 @@ FixMyStreet::override_config {
     subtest 'export as csv' => sub {
         $mech->create_problems_for_body(1, $body->id, 'Title', {
             detail => "this report\nis split across\nseveral lines",
+            category => 'Problem one',
             areas => ",$alt_area_id,2651,",
         });
         $mech->get_ok('/dashboard?export=1');
         my @rows = $mech->content_as_csv;
         is scalar @rows, 19, '1 (header) + 18 (reports) = 19 lines';
 
-        is scalar @{$rows[0]}, 20, '20 columns present';
+        is scalar @{$rows[0]}, 21, '21 columns present';
 
         is_deeply $rows[0],
             [
@@ -189,6 +191,7 @@ FixMyStreet::override_config {
                 'Detail',
                 'User Name',
                 'Category',
+                'Subcategory',
                 'Created',
                 'Confirmed',
                 'Acknowledged',
@@ -207,9 +210,9 @@ FixMyStreet::override_config {
             ],
             'Column headers look correct';
 
-        is $rows[5]->[14], 'Trowbridge', 'Ward column is name not ID';
-        is $rows[5]->[15], '529025', 'Correct Easting conversion';
-        is $rows[5]->[16], '179716', 'Correct Northing conversion';
+        is $rows[5]->[15], 'Trowbridge', 'Ward column is name not ID';
+        is $rows[5]->[16], '529025', 'Correct Easting conversion';
+        is $rows[5]->[17], '179716', 'Correct Northing conversion';
     };
 
     subtest 'export updates as csv' => sub {
-- 
cgit v1.2.3


From 30de263a85621fcad51991661475cdc422730c12 Mon Sep 17 00:00:00 2001
From: Chris Mytton <chrism@mysociety.org>
Date: Mon, 20 Apr 2020 11:31:07 +0100
Subject: Extract identical photo upload forms into a partial

---
 templates/web/base/questionnaire/index.html       | 25 +----------------------
 templates/web/base/report/form/photo_upload.html  | 24 ++++++++++++++++++++++
 templates/web/base/report/update/form_update.html | 25 +----------------------
 3 files changed, 26 insertions(+), 48 deletions(-)
 create mode 100644 templates/web/base/report/form/photo_upload.html

diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html
index 36123013f..7a08d461d 100644
--- a/templates/web/base/questionnaire/index.html
+++ b/templates/web/base/questionnaire/index.html
@@ -74,30 +74,7 @@
 
 <p><textarea class="form-control" name="update" rows="7" cols="30">[% update | html %]</textarea></p>
 
-[% IF c.cobrand.allow_photo_upload %]
-    <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
-    <label for="form_photo">
-        <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
-    </label>
-
-      [% IF field_errors.photo %]
-        <p class='form-error'>[% field_errors.photo %]</p>
-      [% END %]
-
-    <div id="form_photos">
-      [% IF upload_fileid %]
-        <p>[% loc('You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p>
-        [% FOREACH id IN upload_fileid.split(',') %]
-        <img align="right" src="/photo/temp.[% id %]" alt="">
-        [% END %]
-    [% END %]
-        <input type="file" name="photo1" id="form_photo">
-        <label for="form_photo2">[% loc('Photo') %]</label>
-        <input type="file" name="photo2" id="form_photo2">
-        <label for="form_photo3">[% loc('Photo') %]</label>
-        <input type="file" name="photo3" id="form_photo3">
-    </div>
-[% END %]
+[% INCLUDE report/form/photo_upload.html %]
 
 <div class="js-another-questionnaire">
     <p>4. [% loc('Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?') %]</p>
diff --git a/templates/web/base/report/form/photo_upload.html b/templates/web/base/report/form/photo_upload.html
new file mode 100644
index 000000000..960141210
--- /dev/null
+++ b/templates/web/base/report/form/photo_upload.html
@@ -0,0 +1,24 @@
+[% IF c.cobrand.allow_photo_upload %]
+    <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
+    <label for="form_photo">
+        <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
+    </label>
+
+      [% IF field_errors.photo %]
+        <p class='form-error'>[% field_errors.photo %]</p>
+      [% END %]
+
+    <div id="form_photos">
+      [% IF upload_fileid %]
+        <p>[% loc('You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p>
+        [% FOREACH id IN upload_fileid.split(',') %]
+        <img align="right" src="/photo/temp.[% id %]" alt="">
+        [% END %]
+    [% END %]
+        <input type="file" name="photo1" id="form_photo">
+        <label for="form_photo2">[% loc('Photo') %]</label>
+        <input type="file" name="photo2" id="form_photo2">
+        <label for="form_photo3">[% loc('Photo') %]</label>
+        <input type="file" name="photo3" id="form_photo3">
+    </div>
+[% END %]
diff --git a/templates/web/base/report/update/form_update.html b/templates/web/base/report/update/form_update.html
index 089d63f55..7132331bc 100644
--- a/templates/web/base/report/update/form_update.html
+++ b/templates/web/base/report/update/form_update.html
@@ -1,30 +1,7 @@
 <input type="hidden" name="submit_update" value="1">
 <input type="hidden" name="id" value="[% problem.id | html %]">
 
-[% IF c.cobrand.allow_photo_upload %]
-    <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
-    <label for="form_photo">
-        <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
-    </label>
-
-      [% IF field_errors.photo %]
-        <p class='form-error'>[% field_errors.photo %]</p>
-      [% END %]
-
-    <div id="form_photos">
-      [% IF upload_fileid %]
-        <p>[% loc('You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed).') %]</p>
-        [% FOREACH id IN upload_fileid.split(',') %]
-        <img align="right" src="/photo/temp.[% id %]" alt="">
-        [% END %]
-    [% END %]
-        <input type="file" name="photo1" id="form_photo">
-        <label for="form_photo2">[% loc('Photo') %]</label>
-        <input type="file" name="photo2" id="form_photo2">
-        <label for="form_photo3">[% loc('Photo') %]</label>
-        <input type="file" name="photo3" id="form_photo3">
-    </div>
-[% END %]
+[% INCLUDE report/form/photo_upload.html %]
 
 [% TRY %][% PROCESS 'report/update/before_update.html' %][% CATCH file %][% END %]
 
-- 
cgit v1.2.3


From ed0002b0d76560cc3d5b1e62f8395bbfae74403c Mon Sep 17 00:00:00 2001
From: Chris Mytton <chrism@mysociety.org>
Date: Wed, 8 Apr 2020 14:39:19 +0100
Subject: Add photo upload field to inspector form

This adds the code for photo uploads from the regular update form to the
inspector form, and adds details to the documentation.
---
 CHANGELOG.md                                       |   1 +
 docs/_includes/admin-tasks-content.md              |   3 ++
 .../img/pro-user-guide/report-public-update.png    | Bin 10740 -> 39301 bytes
 perllib/FixMyStreet/App/Controller/Report.pm       |   7 +++++
 t/app/controller/report_inspect.t                  |  31 +++++++++++++++++++--
 templates/web/base/report/_inspect.html            |   2 +-
 .../web/base/report/inspect/public_update.html     |   3 ++
 web/cobrands/fixmystreet/fixmystreet.js            |  11 ++++----
 web/cobrands/fixmystreet/staff.js                  |   8 ++++--
 9 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7f42fdc0..de9b71d38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@
         - Disable category rename on Open311 categories when unprotected. #2957
         - In category admin, group is already shown elsewhere.
         - Add assigned_(users|categories)_only functionality.
+        - Inspectors can now include a photo with public updates. #2902
     - Bugfixes:
         - Application user in Docker container can't install packages. #2914
         - Look at all categories when sending reports.
diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index ac9e81f9e..cd6043c25 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -350,6 +350,9 @@ If ‘Create reports/updates as the council’ is ticked in the staff user’s a
 updates will be labeled as from the council rather than the staff member’s name. For the sake of
 staff privacy, this is usually preferable.
 
+Staff with appropriate permissions can also attach an image to the update, which will then be
+displayed publicly alongside the text update.
+
 This option is also available via the general 'Update' box under the main report.
 
 #### Requests for more information
diff --git a/docs/assets/img/pro-user-guide/report-public-update.png b/docs/assets/img/pro-user-guide/report-public-update.png
index e6b4ac587..d4b390a70 100644
Binary files a/docs/assets/img/pro-user-guide/report-public-update.png and b/docs/assets/img/pro-user-guide/report-public-update.png differ
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index dd7abc563..991064f55 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -554,6 +554,12 @@ sub inspect : Private {
 
         $c->cobrand->call_hook(report_inspect_update_extra => $problem);
 
+        $c->forward('/photo/process_photo');
+        if ( my $photo_error  = delete $c->stash->{photo_error} ) {
+            $valid = 0;
+            push @{ $c->stash->{errors} }, $photo_error;
+        }
+
         if ($valid) {
             $problem->lastupdate( \'current_timestamp' );
             $problem->update;
@@ -574,6 +580,7 @@ sub inspect : Private {
                     created => $timestamp,
                     confirmed => $timestamp,
                     user => $c->user->obj,
+                    photo => $c->stash->{upload_fileid} || undef,
                     %update_params,
                 } );
             }
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index de9d689cd..48dceaf04 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -1,5 +1,6 @@
 use FixMyStreet::TestMech;
 use Test::MockModule;
+use Path::Class;
 
 my $mech = FixMyStreet::TestMech->new;
 
@@ -42,6 +43,9 @@ my $user = $mech->log_in_ok('body@example.com');
 $user->set_extra_metadata('categories', [ $contact->id ]);
 $user->update( { from_body => $oxon } );
 
+my $sample_file = file(__FILE__)->parent->file("sample.jpg")->stringify;
+ok -e $sample_file, "sample file $sample_file exists";
+
 FixMyStreet::override_config {
     MAPIT_URL => 'http://mapit.uk/',
     ALLOWED_COBRANDS => 'fixmystreet',
@@ -589,7 +593,27 @@ FixMyStreet::override_config {
         $mech->get_ok("/report/$report_id");
         $mech->content_contains('Nearest calculated address', 'Address displayed');
         $mech->content_contains('Constitution Hill, London, SW1A', 'Correct address displayed');
-    }
+    };
+
+    subtest "test upload photo with public updates" => sub {
+        $user->user_body_permissions->delete;
+        $user->user_body_permissions->create({ body => $oxon, permission_type => 'report_inspect' });
+
+        $report->state('confirmed');
+        $report->update;
+        $mech->get_ok("/report/$report_id");
+        $mech->submit_form_ok({ button => 'save', with_fields => {
+            public_update => "This is a public update.", include_update => "1",
+            state => 'action scheduled',
+            photo1 => [ [ $sample_file, undef, Content_Type => 'image/jpeg' ], 1 ],
+        } });
+        $report->discard_changes;
+        my $comment = $report->comments(undef, { rows => 1, order_by => { -desc => "id" }})->first;
+        is $comment->photo, '74e3362283b6ef0c48686fb0e161da4043bbcc97.jpeg', 'photo added to comment';
+        $mech->get_ok("/report/$report_id");
+        $mech->content_contains("/photo/c/" . $comment->id . ".0.jpeg");
+    };
+
 };
 
 foreach my $test (
@@ -705,7 +729,10 @@ FixMyStreet::override_config {
           priority => $rp->id,
           include_update => '1',
           detailed_information => 'XXX164XXXxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
-          traffic_information => ''
+          traffic_information => '',
+          photo1 => '',
+          photo2 => '',
+          photo3 => '',
         };
         my $values = $mech->visible_form_values('report_inspect_form');
         is_deeply $values, $expected_fields, 'correct form fields present';
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 88fbdd70b..30848b5d4 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -5,7 +5,7 @@
 
     [% INCLUDE 'errors.html' %]
 
-    <form name="report_inspect_form" id="report_inspect_form" method="post" action="[% c.uri_for( '/report', problem.id ) %]" class="validate">
+    <form name="report_inspect_form" id="report_inspect_form" method="post" action="[% c.uri_for( '/report', problem.id ) %]" class="validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]>
 
     [% INCLUDE 'report/inspect/information.html' %]
 
diff --git a/templates/web/base/report/inspect/public_update.html b/templates/web/base/report/inspect/public_update.html
index be07d7b89..31940b6ee 100644
--- a/templates/web/base/report/inspect/public_update.html
+++ b/templates/web/base/report/inspect/public_update.html
@@ -7,8 +7,11 @@
               [% loc('Save with a public update') %]
             </label>
           </p>
+          <div id="public_update_form_fields">
+          [% INCLUDE report/form/photo_upload.html %]
           <p>
             <label for="public_update">[% loc('Public update:') %]</label>
             [% INCLUDE 'admin/response_templates_select.html' for='public_update' %]
             <textarea rows="2" name="public_update" id="public_update" class="form-control">[% public_update | html %]</textarea>
           </p>
+          </div>
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 032140298..8073530c6 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -660,6 +660,11 @@ $.extend(fixmystreet.set_up, {
   },
 
   dropzone: function($context) {
+    if ('Dropzone' in window) {
+        Dropzone.autoDiscover = false;
+      } else {
+        return;
+      }
 
     // Pass a jQuery element, eg $('.foobar'), into this function
     // to limit all the selectors to that element. Handy if you want
@@ -670,12 +675,6 @@ $.extend(fixmystreet.set_up, {
         $context = $(document);
     }
 
-    if ('Dropzone' in window) {
-      Dropzone.autoDiscover = false;
-    } else {
-      return;
-    }
-
     var forms = $('[for="form_photo"], .js-photo-label', $context).closest('form');
     forms.each(function() {
       // Internal $context is the individual form with the photo upload inside
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index 89d7cab39..e62ae6ba7 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -137,6 +137,10 @@ fixmystreet.staff_set_up = {
         document.getElementById('side-inspect').scrollIntoView();
     }
 
+    // make sure dropzone is set up, otherwise loading problem with
+    // JS leaves this uninitialized.
+    fixmystreet.set_up.dropzone($inspect_form);
+
     function updateTemplates(opts) {
         opts.category = opts.category || $inspect_form.find('[name=category]').val();
         opts.state = opts.state || $inspect_form.find('[name=state]').val();
@@ -212,9 +216,9 @@ fixmystreet.staff_set_up = {
         var $checkbox = $(this);
         var toggle_public_update = function() {
             if ($checkbox.prop('checked')) {
-                $('#public_update').parents('p').show();
+                $('#public_update_form_fields').show();
             } else {
-                $('#public_update').parents('p').hide();
+                $('#public_update_form_fields').hide();
             }
         };
         $checkbox.on('change', function() {
-- 
cgit v1.2.3


From ae687e6dd042982f2423d4e7e79e41c54d729e7b Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Mon, 4 May 2020 17:38:39 +0100
Subject: Handle multipart inspector form in service worker.

This manually reconstructs the POST as there is no support for formData
in safari, plus our storage mechanism does not handle formData as it's
not a simple object.
---
 templates/web/base/offline/service_worker.html | 27 ++++++++++---
 web/cobrands/fixmystreet/fixmystreet.js        |  6 +++
 web/cobrands/fixmystreet/offline.js            | 52 ++++++++++++++++++++++++--
 3 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/templates/web/base/offline/service_worker.html b/templates/web/base/offline/service_worker.html
index 3c480f9b1..71e5c282a 100644
--- a/templates/web/base/offline/service_worker.html
+++ b/templates/web/base/offline/service_worker.html
@@ -52,15 +52,30 @@ addEventListener('fetch',  fetchEvent => {
       }
       catch {
         fetchEvent.waitUntil(async function() {
-          var text = await request.text();
-          let formData = new URLSearchParams(text);
-          formData.set('save', 2);
-          formData.set('saved_at', Math.floor(+new Date() / 1000));
-          formData = formData.toString();
+          var request_buffer = await request.arrayBuffer();
+          var headers = request.headers;
+          let formData = {};
+          formData.contentType = headers.get('Content-Type');
+          let boundary_re = /.*boundary=(.*)/;
+          let bound = formData.contentType.match(boundary_re);
+
+          let saved = '--' + bound[1] + "\r\nContent-Disposition: form-data; name=\"saved_at\"\r\n\r\n" + Math.floor(+new Date() / 1000) + "\r\n";
+          var savedBuffer = new ArrayBuffer(saved.length);
+          var bufView = new Uint8Array(savedBuffer);
+          for (var i=0; i<saved.length; i++) {
+            bufView[i] = saved.charCodeAt(i);
+          }
+
+          var tmp = new Uint8Array(request_buffer.byteLength + savedBuffer.byteLength);
+          tmp.set(new Uint8Array(request_buffer), 0);
+          tmp.set(bufView, 0);
+          tmp.set(new Uint8Array(request_buffer), savedBuffer.byteLength);
+
+          formData.text = tmp.buffer;
 
           var data = await idbKeyval.get('offlineData') || { cachedReports: {}, forms: [] };
           var forms = data.forms;
-          if (!forms.length || formData != forms[forms.length - 1][1]) {
+          if (!forms.length || tmp.toString() != new Uint8Array(forms[forms.length - 1][1].text).toString()) {
             forms.push([request.url, formData]);
           }
           return idbKeyval.set('offlineData', data);
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 8073530c6..ad29ab470 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -666,6 +666,12 @@ $.extend(fixmystreet.set_up, {
         return;
       }
 
+    // we don't want to create this if we're offline (e.g using the inspector
+    // panel to add a photo) as the server side bit does not work.
+    if (!navigator.onLine) {
+      return;
+    }
+
     // Pass a jQuery element, eg $('.foobar'), into this function
     // to limit all the selectors to that element. Handy if you want
     // to only bind/detect Dropzones in a particular part of the page,
diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js
index 908326a69..c6609fe1a 100644
--- a/web/cobrands/fixmystreet/offline.js
+++ b/web/cobrands/fixmystreet/offline.js
@@ -28,6 +28,23 @@ fixmystreet.offlineBanner = (function() {
         $('.top_banner--offline').slideUp();
     }
 
+    // Compare two typed arrays for equality
+    function isEqual(view1, view2) {
+        for (var i=0; i != view1.byteLength; i++) {
+            if (view1[i] != view2[i]) return false;
+        }
+        return true;
+    }
+
+    // Create a Uint8Array of a string
+    function makeView(str) {
+        var view = new Uint8Array(str.length);
+        for (var i=0; i<str.length; i++) {
+            view[i] = str.charCodeAt(i);
+        }
+        return view;
+    }
+
     return {
         make: function(offline) {
             fixmystreet.offlineData.getFormsLength().then(function(num) {
@@ -61,7 +78,13 @@ fixmystreet.offlineBanner = (function() {
             }
 
             function postForm(url, data) {
-                return $.ajax({ url: url, data: data, type: 'POST' }).done(nextForm);
+                return $.ajax({
+                    url: url,
+                    contentType: data.contentType,
+                    data: data.text,
+                    type: 'POST',
+                    processData: false
+                }).done(nextForm);
             }
 
             $(document).on('click', '#oFN', function(e) {
@@ -83,8 +106,23 @@ fixmystreet.offlineBanner = (function() {
                                 if (!token) {
                                     return nextForm();
                                 }
-                                var param = form[1].replace(/&token=[^&]*/, '&token=' + token);
-                                return postForm(form[0], param).fail(nextForm);
+
+                                var tokenView = makeView(token);
+                                var tokenName = makeView('name="token"\r\n\r\n');
+
+                                // Make a typed array to update the request body with
+                                // This only works because tokens are always the same length
+                                var curView = new Uint8Array(form[1].text);
+
+                                // Find the spot at which the token is in the buffer
+                                var idxS = curView.findIndex(function isToken(element, i, array) {
+                                    var sl = array.slice(i, i+tokenName.byteLength);
+                                    return isEqual(sl, tokenName);
+                                });
+                                // Replace the old token with the new one in the right spot
+                                curView.set(tokenView, idxS + tokenName.byteLength);
+
+                                return postForm(form[0], form[1]).fail(nextForm);
                             });
                         });
                     });
@@ -302,6 +340,14 @@ fixmystreet.offline = (function() {
         $('.moderate-display.segmented-control, .shadow-wrap, #update_form, #report-cta, .mysoc-footer, .nav-wrapper').hide();
         $('.js-back-to-report-list').attr('href', '/my/planned');
 
+        // On iOS we want to hide the photo fields on the offline inspector
+        // form because including a photo entirely breaks the form submission.
+        if (/iPad|iPhone|iPod/.test(navigator.platform) ||
+            (/Mac/.test(navigator.userAgent) && 'ontouchend' in document)) // iPadOS 13 pretends to be a desktop Mac
+        {
+            $("#form_photos, label[for=form_photo]").hide();
+        }
+
         // Refill form with saved data if there is any
         fixmystreet.offlineData.getForms().then(function(forms) {
             var savedForm;
-- 
cgit v1.2.3


From 1e7cba67a53eead8cedcbf6aa7af12eb7ff4bf63 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 6 Aug 2020 09:43:53 +0100
Subject: [Open311] use staff categories when fetching reports

At the moment if you fetch a report in a staff category it will still be
created but will be in the Other category. Given that some staff
categories are marked as private this can allow reports that should be
private to be put in a public category.
---
 perllib/Open311/GetServiceRequests.pm |  2 +-
 t/open311/getservicerequests.t        | 40 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/perllib/Open311/GetServiceRequests.pm b/perllib/Open311/GetServiceRequests.pm
index 2545f6f29..eea7c0f26 100644
--- a/perllib/Open311/GetServiceRequests.pm
+++ b/perllib/Open311/GetServiceRequests.pm
@@ -81,7 +81,7 @@ sub create_problems {
     }
 
     my $contacts = $self->schema->resultset('Contact')
-        ->active
+        ->not_deleted_admin
         ->search( { body_id => $body->id } );
 
     for my $request (@$requests) {
diff --git a/t/open311/getservicerequests.t b/t/open311/getservicerequests.t
index 672459f3f..7a69d0ff6 100644
--- a/t/open311/getservicerequests.t
+++ b/t/open311/getservicerequests.t
@@ -534,6 +534,46 @@ subtest "non_public contacts result in non_public reports" => sub {
 
 };
 
+subtest "staff and non_public contacts result in non_public reports" => sub {
+
+    $contact->update({
+        non_public => 1,
+        state => 'staff'
+    });
+    my $o = Open311->new(
+        jurisdiction => 'mysociety',
+        endpoint => 'http://example.com',
+        test_mode => 1,
+        test_get_returns => { 'requests.xml' => prepare_xml( {} ) }
+    );
+
+    my $update = Open311::GetServiceRequests->new(
+        system_user => $user,
+        start_date => $start_date,
+        end_date => $end_date
+    );
+
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $update->create_problems( $o, $body );
+    };
+
+    my $p = FixMyStreet::DB->resultset('Problem')->search(
+        { external_id => 123456, category => $contact->category }
+    )->first;
+
+    ok $p, 'problem created';
+    is $p->non_public, 1, "report non_public is set correctly";
+
+    $p->delete;
+    $contact->update({
+        non_public => 0,
+        state => 'confirmed'
+    });
+
+};
+
 for my $test (
   {
       test_desc => 'filters out phone numbers',
-- 
cgit v1.2.3


From 52b1410f91669fab5f22cae9a9d9a040a0144c9a Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 31 Jul 2020 15:27:42 +0100
Subject: Add extra ordering to search query to force full text index use.

---
 perllib/FixMyStreet/App/Controller/Admin/Reports.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
index 052230643..e3a425632 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
@@ -92,6 +92,9 @@ sub index : Path {
             ];
         } else {
             $problems = $problems->search_text($search);
+            # The below is added so that PostgreSQL does not try and use other indexes
+            # besides the full text search. It should have no impact on results shown.
+            $order = [ $order, { -desc => "me.id" }, { -desc => "me.created" } ];
         }
 
         $problems = $problems->search(
@@ -109,6 +112,7 @@ sub index : Path {
         $c->stash->{problems_pager} = $problems->pager;
 
         my $updates = $c->cobrand->updates;
+        $order = { -desc => 'me.id' };
         if ($valid_email) {
             $query = [
                 'user.email' => { ilike => $like_search },
@@ -126,6 +130,7 @@ sub index : Path {
             $query = 0;
         } else {
             $updates = $updates->search_text($search);
+            $order = [ $order, { -desc => "me.created" } ];
             $query = 1;
         }
 
@@ -140,7 +145,7 @@ sub index : Path {
                     join => 'user',
                     prefetch => [qw/problem/],
                     rows => 50,
-                    order_by => { -desc => 'me.id' }
+                    order_by => $order,
                 }
             )->page( $u_page );
             $c->stash->{updates} = [ $updates->all ];
-- 
cgit v1.2.3


From 21efead606530cb754bb7b54586dbb8c1a1502ca Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Wed, 5 Aug 2020 15:55:29 +0100
Subject: Perform translate on full text search query too.

---
 perllib/FixMyStreet/Roles/FullTextSearch.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/Roles/FullTextSearch.pm b/perllib/FixMyStreet/Roles/FullTextSearch.pm
index 78dbd5c18..dc7730798 100644
--- a/perllib/FixMyStreet/Roles/FullTextSearch.pm
+++ b/perllib/FixMyStreet/Roles/FullTextSearch.pm
@@ -13,9 +13,11 @@ sub search_text {
         my $col = $rs->me($_);
         $nulls{$_} ? "coalesce($col, '')" : $col;
     } $rs->text_search_columns;
-    my $vector = "translate(" . join(" || ' ' || ", @cols) . ", '/.', '  ')";
+    my $vector = join(" || ' ' || ", @cols);
+    $vector = "translate($vector, '/.', '  ')";
+    my $bind = "translate(?, '/.', '  ')";
     my $config = FixMyStreet->config('DB_FULL_TEXT_SEARCH_CONFIG') || 'english';
-    $rs->search(\[ "to_tsvector('$config', $vector) @@ plainto_tsquery('$config', ?)", $query ]);
+    $rs->search(\[ "to_tsvector('$config', $vector) @@ plainto_tsquery('$config', $bind)", $query ]);
 }
 
 1;
-- 
cgit v1.2.3


From 7af4f2cc87cd6ff55501bb2856193a03fe72158c Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Wed, 5 Aug 2020 15:56:10 +0100
Subject: Add database index for user full text search.

---
 bin/update-schema                                   |  1 +
 db/downgrade_0074---0073.sql                        |  1 +
 db/schema.sql                                       |  6 ++++++
 db/schema_0074-add-users-full-text-search-index.sql |  6 ++++++
 perllib/FixMyStreet/App/Controller/Admin/Users.pm   | 17 +----------------
 perllib/FixMyStreet/DB/ResultSet/Comment.pm         |  1 +
 perllib/FixMyStreet/DB/ResultSet/Problem.pm         |  1 +
 perllib/FixMyStreet/DB/ResultSet/User.pm            |  5 +++++
 perllib/FixMyStreet/Roles/FullTextSearch.pm         |  9 +++++++--
 t/app/controller/admin/users.t                      |  2 --
 10 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 db/downgrade_0074---0073.sql
 create mode 100644 db/schema_0074-add-users-full-text-search-index.sql

diff --git a/bin/update-schema b/bin/update-schema
index 90876cf76..1cfb59f52 100755
--- a/bin/update-schema
+++ b/bin/update-schema
@@ -215,6 +215,7 @@ else {
 # (assuming schema change files are never half-applied, which should be the case)
 sub get_db_version {
     return 'EMPTY' if ! table_exists('problem');
+    return '0074' if index_exists('users_fulltext_idx');
     return '0073' if index_exists('problem_fulltext_idx');
     return '0072' if constraint_contains('contacts_state_check', 'staff');
     return '0071' if table_exists('manifest_theme');
diff --git a/db/downgrade_0074---0073.sql b/db/downgrade_0074---0073.sql
new file mode 100644
index 000000000..f900cc1d7
--- /dev/null
+++ b/db/downgrade_0074---0073.sql
@@ -0,0 +1 @@
+DROP INDEX users_fulltext_idx;
diff --git a/db/schema.sql b/db/schema.sql
index f198a287b..2c0cedb8d 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -41,6 +41,12 @@ create table users (
 );
 CREATE UNIQUE INDEX users_email_verified_unique ON users (email) WHERE email_verified;
 CREATE UNIQUE INDEX users_phone_verified_unique ON users (phone) WHERE phone_verified;
+create index users_fulltext_idx on users USING GIN(
+    to_tsvector(
+        'english',
+        translate(id || ' ' || coalesce(name,'') || ' ' || coalesce(email,'') || ' ' || coalesce(phone,''), '@.', '  ')
+    )
+);
 
 -- Record details of reporting bodies, including open311 configuration details
 create table body (
diff --git a/db/schema_0074-add-users-full-text-search-index.sql b/db/schema_0074-add-users-full-text-search-index.sql
new file mode 100644
index 000000000..dc743bd47
--- /dev/null
+++ b/db/schema_0074-add-users-full-text-search-index.sql
@@ -0,0 +1,6 @@
+CREATE INDEX CONCURRENTLY users_fulltext_idx on users USING GIN(
+    to_tsvector(
+        'DB_FULL_TEXT_SEARCH_CONFIG',
+        translate(id || ' ' || coalesce(name,'') || ' ' || coalesce(email,'') || ' ' || coalesce(phone,''), '@.', '  ')
+    )
+);
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Users.pm b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
index 9fd4cd32d..a05e737ab 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Users.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
@@ -49,26 +49,11 @@ sub index :Path : Args(0) {
     my $role = $c->get_param('role');
     my $users = $c->cobrand->users;
     if ($search || $role) {
-        my $isearch;
         if ($search) {
             $search = $self->trim($search);
             $search =~ s/^<(.*)>$/$1/; # In case email wrapped in <...>
             $c->stash->{searched} = $search;
-
-            $isearch = '%' . $search . '%';
-            my $search_n = 0;
-            $search_n = int($search) if $search =~ /^\d+$/;
-
-            $users = $users->search(
-                {
-                    -or => [
-                        email => { ilike => $isearch },
-                        phone => { ilike => $isearch },
-                        'me.name' => { ilike => $isearch },
-                        from_body => $search_n,
-                    ]
-                }
-            );
+            $users = $users->search_text($search);
         }
         if ($role) {
             $c->stash->{role_selected} = $role;
diff --git a/perllib/FixMyStreet/DB/ResultSet/Comment.pm b/perllib/FixMyStreet/DB/ResultSet/Comment.pm
index 0a4403e52..ea38b3e14 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Comment.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Comment.pm
@@ -9,6 +9,7 @@ with 'FixMyStreet::Roles::FullTextSearch';
 __PACKAGE__->load_components('Helper::ResultSet::Me');
 sub text_search_columns { qw(id problem_id name text) }
 sub text_search_nulls { qw(name) }
+sub text_search_translate { '/.' }
 
 sub to_body {
     my ($rs, $bodies) = @_;
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index 3ac9187ee..a7c365c1e 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -13,6 +13,7 @@ with 'FixMyStreet::Roles::FullTextSearch';
 __PACKAGE__->load_components('Helper::ResultSet::Me');
 sub text_search_columns { qw(id external_id bodies_str name title detail) }
 sub text_search_nulls { qw(external_id bodies_str) }
+sub text_search_translate { '/.' }
 
 my $site_key;
 
diff --git a/perllib/FixMyStreet/DB/ResultSet/User.pm b/perllib/FixMyStreet/DB/ResultSet/User.pm
index 9a8a50559..baae024bf 100644
--- a/perllib/FixMyStreet/DB/ResultSet/User.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/User.pm
@@ -5,6 +5,11 @@ use strict;
 use warnings;
 
 use Moo;
+with 'FixMyStreet::Roles::FullTextSearch';
+__PACKAGE__->load_components('Helper::ResultSet::Me');
+sub text_search_columns { qw(id name email phone) }
+sub text_search_nulls { qw(name email phone) }
+sub text_search_translate { '@.' }
 
 # The database has a partial unique index on email (when email_verified is
 # true), and phone (when phone_verified is true). In the code, we can only
diff --git a/perllib/FixMyStreet/Roles/FullTextSearch.pm b/perllib/FixMyStreet/Roles/FullTextSearch.pm
index dc7730798..871b1d185 100644
--- a/perllib/FixMyStreet/Roles/FullTextSearch.pm
+++ b/perllib/FixMyStreet/Roles/FullTextSearch.pm
@@ -5,6 +5,7 @@ use FixMyStreet;
 
 requires 'text_search_columns';
 requires 'text_search_nulls';
+requires 'text_search_translate';
 
 sub search_text {
     my ($rs, $query) = @_;
@@ -14,8 +15,12 @@ sub search_text {
         $nulls{$_} ? "coalesce($col, '')" : $col;
     } $rs->text_search_columns;
     my $vector = join(" || ' ' || ", @cols);
-    $vector = "translate($vector, '/.', '  ')";
-    my $bind = "translate(?, '/.', '  ')";
+    my $bind = '?';
+    if (my $trans = $rs->text_search_translate) {
+        my $replace = ' ' x length $trans;
+        $vector = "translate($vector, '$trans', '$replace')";
+        $bind = "translate(?, '$trans', '$replace')";
+    }
     my $config = FixMyStreet->config('DB_FULL_TEXT_SEARCH_CONFIG') || 'english';
     $rs->search(\[ "to_tsvector('$config', $vector) @@ plainto_tsquery('$config', $bind)", $query ]);
 }
diff --git a/t/app/controller/admin/users.t b/t/app/controller/admin/users.t
index bc8d28e2d..a3bd4a784 100644
--- a/t/app/controller/admin/users.t
+++ b/t/app/controller/admin/users.t
@@ -84,8 +84,6 @@ subtest 'user search' => sub {
         permissions => ['moderate', 'user_edit'],
     });
     $user->add_to_roles($role);
-    $mech->get_ok('/admin/users?search=' . $haringey->id );
-    $mech->content_contains('test@example.com');
     $mech->get_ok('/admin/users?role=' . $role->id);
     $mech->content_contains('selected>Role A');
     $mech->content_contains('test@example.com');
-- 
cgit v1.2.3


From 615ddb00265386849f32405426c5232b9127669a Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Wed, 5 Aug 2020 17:36:18 +0100
Subject: Remove use of $c from various functions.

This means these functions can more easily be used in a non-web context.
---
 perllib/FixMyStreet/App/Controller/Around.pm       |  2 +-
 perllib/FixMyStreet/App/Controller/Dashboard.pm    | 12 ++++---
 perllib/FixMyStreet/App/Controller/My.pm           |  2 +-
 perllib/FixMyStreet/App/Controller/Report.pm       |  8 ++---
 perllib/FixMyStreet/App/Controller/Reports.pm      |  2 +-
 perllib/FixMyStreet/Cobrand/BathNES.pm             | 37 +++++++++-----------
 perllib/FixMyStreet/Cobrand/Buckinghamshire.pm     | 15 ++++----
 perllib/FixMyStreet/Cobrand/Default.pm             |  4 +--
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm         |  9 +++--
 perllib/FixMyStreet/Cobrand/TfL.pm                 | 21 ++++++------
 perllib/FixMyStreet/Cobrand/UK.pm                  |  4 +--
 perllib/FixMyStreet/Cobrand/Zurich.pm              |  8 ++---
 perllib/FixMyStreet/DB/Result/Comment.pm           | 26 ++++++++------
 perllib/FixMyStreet/DB/Result/Problem.pm           | 40 ++++++++++++----------
 templates/web/base/my/anonymize.html               |  2 +-
 templates/web/base/questionnaire/index.html        |  2 +-
 templates/web/base/report/_council_sent_info.html  |  2 +-
 templates/web/base/report/_report_meta_info.html   |  2 +-
 templates/web/base/report/_update_state.html       |  2 +-
 templates/web/base/report/updates.html             |  2 +-
 .../web/bathnes/report/_council_sent_info.html     |  2 +-
 .../cheshireeast/report/_council_sent_info.html    |  2 +-
 .../fixmystreet.com/report/_report_meta_info.html  |  2 +-
 .../web/hounslow/report/_council_sent_info.html    |  2 +-
 .../web/isleofwight/report/_council_sent_info.html |  2 +-
 .../report/_council_sent_info.html                 |  2 +-
 .../web/oxfordshire/report/_main_sent_info.html    |  2 +-
 .../peterborough/report/_council_sent_info.html    |  2 +-
 templates/web/tfl/report/_council_sent_info.html   |  2 +-
 templates/web/zurich/admin/problem_row.html        |  2 +-
 templates/web/zurich/admin/reports/edit.html       |  2 +-
 templates/web/zurich/report/banner.html            |  2 +-
 32 files changed, 114 insertions(+), 112 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index 0e87d1e70..4c5c36106 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -295,7 +295,7 @@ sub map_features : Private {
         @pins = map {
             # Here we might have a DB::Problem or a DB::Result::Nearby, we always want the problem.
             my $p = (ref $_ eq 'FixMyStreet::DB::Result::Nearby') ? $_->problem : $_;
-            $p->pin_data($c, 'around');
+            $p->pin_data('around');
         } @$on_map, @$nearby;
     }
 
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index f7273ca0e..6fd4154b9 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -339,8 +339,9 @@ sub export_as_csv_updates : Private {
             'text', 'user_name_display', 'reported_as',
         ],
         filename => $self->csv_filename($c, 1),
+        user => $c->user_exists ? $c->user->obj : undef,
     };
-    $c->cobrand->call_hook("dashboard_export_updates_add_columns");
+    $c->cobrand->call_hook(dashboard_export_updates_add_columns => $csv);
     $c->forward('generate_csv');
 }
 
@@ -407,8 +408,11 @@ sub export_as_csv : Private {
             'reported_as',
         ],
         filename => $self->csv_filename($c, 0),
+        user => $c->user_exists ? $c->user->obj : undef,
+        category => $c->stash->{category},
+        contacts => $c->stash->{contacts},
     };
-    $c->cobrand->call_hook("dashboard_export_problems_add_columns");
+    $c->cobrand->call_hook(dashboard_export_problems_add_columns => $csv);
     $c->forward('generate_csv');
 }
 
@@ -460,7 +464,7 @@ sub generate_csv : Private {
 
     my $objects = $c->stash->{csv}->{objects};
     while ( my $obj = $objects->next ) {
-        my $hashref = $obj->as_hashref($c, \%asked_for);
+        my $hashref = $obj->as_hashref(\%asked_for);
 
         $hashref->{user_name_display} = $obj->anonymous
             ? '(anonymous)' : $obj->name;
@@ -554,7 +558,7 @@ sub heatmap : Local : Args(0) {
     if ($c->get_param('ajax')) {
         my @pins;
         while ( my $problem = $problems->next ) {
-            push @pins, $problem->pin_data($c, 'reports');
+            push @pins, $problem->pin_data('reports');
         }
         $c->stash->{pins} = \@pins;
         $c->detach('/reports/ajax', [ 'dashboard/heatmap-list.html' ]);
diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm
index f5c06d926..9d57c5e1d 100644
--- a/perllib/FixMyStreet/App/Controller/My.pm
+++ b/perllib/FixMyStreet/App/Controller/My.pm
@@ -157,7 +157,7 @@ sub get_problems : Private {
 
     while ( my $problem = $rs->next ) {
         $c->stash->{has_content}++;
-        push @$pins, $problem->pin_data($c, 'my', private => 1);
+        push @$pins, $problem->pin_data('my', private => 1);
         push @$problems, $problem;
     }
 
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 991064f55..81d5b18b5 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -325,7 +325,7 @@ sub format_problem_for_display : Private {
         $c->res->content_type('application/json; charset=utf-8');
 
         # encode_json doesn't like DateTime objects, so strip them out
-        my $report_hashref = $c->cobrand->problem_as_hashref( $problem, $c );
+        my $report_hashref = $c->cobrand->problem_as_hashref( $problem );
         delete $report_hashref->{created};
         delete $report_hashref->{confirmed};
 
@@ -333,7 +333,7 @@ sub format_problem_for_display : Private {
         my $content = $json->encode(
             {
                 report => $report_hashref,
-                updates => $c->cobrand->updates_as_hashref( $problem, $c ),
+                updates => $c->cobrand->updates_as_hashref( $problem ),
             }
         );
         $c->res->body( $content );
@@ -354,7 +354,7 @@ sub generate_map_tags : Private {
         latitude  => $problem->latitude,
         longitude => $problem->longitude,
         pins      => $problem->used_map
-            ? [ $problem->pin_data($c, 'report', type => 'big', draggable => 1) ]
+            ? [ $problem->pin_data('report', type => 'big', draggable => 1) ]
             : [],
     );
 
@@ -670,7 +670,7 @@ sub _nearby_json :Private {
     # Want to treat these as if they were on map
     $nearby = [ map { $_->problem } @$nearby ];
     my @pins = map {
-        my $p = $_->pin_data($c, 'around');
+        my $p = $_->pin_data('around');
         [ $p->{latitude}, $p->{longitude}, $p->{colour},
           $p->{id}, $p->{title}, $pin_size, JSON->false
         ]
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index 10902eab9..d0f2a9394 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -826,7 +826,7 @@ sub stash_report_sort : Private {
 sub add_row {
     my ( $c, $problem, $body, $problems, $pins ) = @_;
     push @{$problems->{$body}}, $problem;
-    push @$pins, $problem->pin_data($c, 'reports');
+    push @$pins, $problem->pin_data('reports');
 }
 
 sub ajax : Private {
diff --git a/perllib/FixMyStreet/Cobrand/BathNES.pm b/perllib/FixMyStreet/Cobrand/BathNES.pm
index 10e74056f..2dc1a4297 100644
--- a/perllib/FixMyStreet/Cobrand/BathNES.pm
+++ b/perllib/FixMyStreet/Cobrand/BathNES.pm
@@ -163,9 +163,8 @@ sub categories_restriction {
 # Do a manual prefetch of all staff users for contributed_by lookup
 sub _dashboard_user_lookup {
     my $self = shift;
-    my $c = $self->{c};
 
-    my @user_ids = $c->model('DB::User')->search(
+    my @user_ids = FixMyStreet::DB->resultset('User')->search(
         { from_body => { '!=' => undef } },
         { columns => [ 'id', 'email' ] })->all;
 
@@ -174,23 +173,22 @@ sub _dashboard_user_lookup {
 }
 
 sub dashboard_export_updates_add_columns {
-    my $self = shift;
-    my $c = $self->{c};
+    my ($self, $csv) = @_;
 
-    return unless $c->user->has_body_permission_to('export_extra_columns');
+    return unless $csv->{user}->has_body_permission_to('export_extra_columns');
 
-    push @{$c->stash->{csv}->{headers}}, "Staff User";
-    push @{$c->stash->{csv}->{headers}}, "User Email";
-    push @{$c->stash->{csv}->{columns}}, "staff_user";
-    push @{$c->stash->{csv}->{columns}}, "user_email";
+    push @{$csv->{headers}}, "Staff User";
+    push @{$csv->{headers}}, "User Email";
+    push @{$csv->{columns}}, "staff_user";
+    push @{$csv->{columns}}, "user_email";
 
-    $c->stash->{csv}->{objects} = $c->stash->{csv}->{objects}->search(undef, {
+    $csv->{objects} = $csv->{objects}->search(undef, {
         '+columns' => ['user.email'],
         join => 'user',
     });
     my $user_lookup = $self->_dashboard_user_lookup;
 
-    $c->stash->{csv}->{extra_data} = sub {
+    $csv->{extra_data} = sub {
         my $report = shift;
 
         my $staff_user = '';
@@ -206,34 +204,33 @@ sub dashboard_export_updates_add_columns {
 }
 
 sub dashboard_export_problems_add_columns {
-    my $self = shift;
-    my $c = $self->{c};
+    my ($self, $csv) = @_;
 
-    return unless $c->user->has_body_permission_to('export_extra_columns');
+    return unless $csv->{user}->has_body_permission_to('export_extra_columns');
 
-    $c->stash->{csv}->{headers} = [
-        @{ $c->stash->{csv}->{headers} },
+    $csv->{headers} = [
+        @{ $csv->{headers} },
         "User Email",
         "User Phone",
         "Staff User",
         "Attribute Data",
     ];
 
-    $c->stash->{csv}->{columns} = [
-        @{ $c->stash->{csv}->{columns} },
+    $csv->{columns} = [
+        @{ $csv->{columns} },
         "user_email",
         "user_phone",
         "staff_user",
         "attribute_data",
     ];
 
-    $c->stash->{csv}->{objects} = $c->stash->{csv}->{objects}->search(undef, {
+    $csv->{objects} = $csv->{objects}->search(undef, {
         '+columns' => ['user.email', 'user.phone'],
         join => 'user',
     });
     my $user_lookup = $self->_dashboard_user_lookup;
 
-    $c->stash->{csv}->{extra_data} = sub {
+    $csv->{extra_data} = sub {
         my $report = shift;
 
         my $staff_user = '';
diff --git a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
index 00264afea..75356dc87 100644
--- a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
@@ -124,19 +124,18 @@ sub map_type { 'Buckinghamshire' }
 sub default_map_zoom { 3 }
 
 sub _dashboard_export_add_columns {
-    my $self = shift;
-    my $c = $self->{c};
+    my ($self, $csv) = @_;
 
-    push @{$c->stash->{csv}->{headers}}, "Staff User";
-    push @{$c->stash->{csv}->{columns}}, "staff_user";
+    push @{$csv->{headers}}, "Staff User";
+    push @{$csv->{columns}}, "staff_user";
 
     # All staff users, for contributed_by lookup
-    my @user_ids = $c->model('DB::User')->search(
+    my @user_ids = FixMyStreet::DB->resultset('User')->search(
         { from_body => $self->body->id },
         { columns => [ 'id', 'email', ] })->all;
     my %user_lookup = map { $_->id => $_->email } @user_ids;
 
-    $c->stash->{csv}->{extra_data} = sub {
+    $csv->{extra_data} = sub {
         my $report = shift;
         my $staff_user = '';
         if (my $contributed_by = $report->get_extra_metadata('contributed_by')) {
@@ -149,11 +148,11 @@ sub _dashboard_export_add_columns {
 }
 
 sub dashboard_export_updates_add_columns {
-    shift->_dashboard_export_add_columns;
+    shift->_dashboard_export_add_columns(@_);
 }
 
 sub dashboard_export_problems_add_columns {
-    shift->_dashboard_export_add_columns;
+    shift->_dashboard_export_add_columns(@_);
 }
 
 # Enable adding/editing of parish councils in the admin
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index bd8b7e4b4..82b3b7f45 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -1248,15 +1248,13 @@ sub get_geocoder {
 sub problem_as_hashref {
     my $self = shift;
     my $problem = shift;
-    my $ctx = shift;
 
-    return $problem->as_hashref( $ctx );
+    return $problem->as_hashref;
 }
 
 sub updates_as_hashref {
     my $self = shift;
     my $problem = shift;
-    my $ctx = shift;
 
     return {};
 }
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index aa6c9a5a5..31db0fd4e 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -203,13 +203,12 @@ sub available_permissions {
 }
 
 sub dashboard_export_problems_add_columns {
-    my $self = shift;
-    my $c = $self->{c};
+    my ($self, $csv) = @_;
 
-    push @{$c->stash->{csv}->{headers}}, "HIAMS/Exor Ref";
-    push @{$c->stash->{csv}->{columns}}, "external_ref";
+    push @{$csv->{headers}}, "HIAMS/Exor Ref";
+    push @{$csv->{columns}}, "external_ref";
 
-    $c->stash->{csv}->{extra_data} = sub {
+    $csv->{extra_data} = sub {
         my $report = shift;
         # Try and get a HIAMS reference first of all
         my $ref = $report->get_extra_metadata('customer_reference');
diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm
index 9620c6b9e..e085b8bd6 100644
--- a/perllib/FixMyStreet/Cobrand/TfL.pm
+++ b/perllib/FixMyStreet/Cobrand/TfL.pm
@@ -242,11 +242,10 @@ sub available_permissions {
 }
 
 sub dashboard_export_problems_add_columns {
-    my $self = shift;
-    my $c = $self->{c};
+    my ($self, $csv) = @_;
 
-    $c->stash->{csv}->{headers} = [
-        map { $_ eq 'Ward' ? 'Borough' : $_ } @{ $c->stash->{csv}->{headers} },
+    $csv->{headers} = [
+        map { $_ eq 'Ward' ? 'Borough' : $_ } @{ $csv->{headers} },
         "Agent responsible",
         "Safety critical",
         "Delivered to",
@@ -255,8 +254,8 @@ sub dashboard_export_problems_add_columns {
         "Reassigned by",
     ];
 
-    $c->stash->{csv}->{columns} = [
-        @{ $c->stash->{csv}->{columns} },
+    $csv->{columns} = [
+        @{ $csv->{columns} },
         "agent_responsible",
         "safety_critical",
         "delivered_to",
@@ -265,18 +264,18 @@ sub dashboard_export_problems_add_columns {
         "reassigned_by",
     ];
 
-    if ($c->stash->{category}) {
-        my ($contact) = grep { $_->category eq $c->stash->{category} } @{$c->stash->{contacts}};
+    if ($csv->{category}) {
+        my ($contact) = grep { $_->category eq $csv->{category} } @{$csv->{contacts}};
         if ($contact) {
             foreach (@{$contact->get_metadata_for_storage}) {
                 next if $_->{code} eq 'safety_critical';
-                push @{$c->stash->{csv}->{columns}}, "extra.$_->{code}";
-                push @{$c->stash->{csv}->{headers}}, $_->{description};
+                push @{$csv->{columns}}, "extra.$_->{code}";
+                push @{$csv->{headers}}, $_->{description};
             }
         }
     }
 
-    $c->stash->{csv}->{extra_data} = sub {
+    $csv->{extra_data} = sub {
         my $report = shift;
 
         my $agent = $report->shortlisted_user;
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index 772310545..8d464ca7b 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -398,9 +398,9 @@ sub link_to_council_cobrand {
          $handler->moniker ne $self->{c}->cobrand->moniker
        ) {
         my $url = sprintf("%s%s", $handler->base_url, $problem->url);
-        return sprintf("<a href='%s'>%s</a>", $url, $problem->body( $self->{c} ));
+        return sprintf("<a href='%s'>%s</a>", $url, $problem->body);
     } else {
-        return $problem->body( $self->{c} );
+        return $problem->body;
     }
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 4551fcc4a..e33edc792 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -131,9 +131,8 @@ sub problem_has_user_response {
 sub problem_as_hashref {
     my $self = shift;
     my $problem = shift;
-    my $ctx = shift;
 
-    my $hashref = $problem->as_hashref( $ctx );
+    my $hashref = $problem->as_hashref;
 
     if ( $problem->state eq 'submitted' ) {
         for my $var ( qw( photo is_fixed meta ) ) {
@@ -171,7 +170,6 @@ sub problem_as_hashref {
 sub updates_as_hashref {
     my $self = shift;
     my $problem = shift;
-    my $ctx = shift;
 
     my $hashref = {};
 
@@ -182,7 +180,7 @@ sub updates_as_hashref {
             $hashref->{details} = FixMyStreet::App::View::Web::add_links(
                 $problem->get_extra_metadata('public_response') || '' );
         } else {
-            $hashref->{details} = sprintf( _('Assigned to %s'), $problem->body($ctx)->name );
+            $hashref->{details} = sprintf( _('Assigned to %s'), $problem->body->name );
         }
     }
 
@@ -1319,7 +1317,7 @@ sub export_as_csv {
             my $report = shift;
 
             my $body_name = "";
-            if ( my $external_body = $report->body($c) ) {
+            if ( my $external_body = $report->body ) {
                 $body_name = $external_body->name || '[Unknown body]';
             }
 
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index 2ef8925e6..a20c336a5 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -262,7 +262,8 @@ about an update. Can include HTML.
 =cut
 
 sub meta_line {
-    my ( $self, $c ) = @_;
+    my ( $self, $user ) = @_;
+    my $cobrand = $self->result_source->schema->cobrand;
 
     my $meta = '';
 
@@ -292,9 +293,9 @@ sub meta_line {
                 $body = 'Island Roads';
             }
         }
-        my $cobrand_always_view_body_user = $c->cobrand->call_hook("always_view_body_contribute_details");
+        my $cobrand_always_view_body_user = $cobrand->call_hook("always_view_body_contribute_details");
         my $can_view_contribute = $cobrand_always_view_body_user ||
-            ($c->user_exists && $c->user->has_permission_to('view_body_contribute_details', $self->problem->bodies_str_ids));
+            ($user && $user->has_permission_to('view_body_contribute_details', $self->problem->bodies_str_ids));
         if ($self->text) {
             if ($can_view_contribute) {
                 $meta = sprintf( _( 'Posted by <strong>%s</strong> (%s) at %s' ), $body, $user_name, Utils::prettify_dt( $self->confirmed ) );
@@ -320,21 +321,23 @@ sub meta_line {
 };
 
 sub problem_state_processed {
-    my ( $self, $c ) = @_;
+    my $self = shift;
     return 'fixed - user' if $self->mark_fixed;
     return 'confirmed' if $self->mark_open;
-    my $cobrand_state = $c->cobrand->call_hook(problem_state_processed => $self);
+    my $cobrand = $self->result_source->schema->cobrand;
+    my $cobrand_state = $cobrand->call_hook(problem_state_processed => $self);
 
     return $cobrand_state || $self->problem_state;
 }
 
 sub problem_state_display {
-    my ( $self, $c ) = @_;
+    my $self = shift;
 
-    my $state = $self->problem_state_processed($c);
+    my $state = $self->problem_state_processed;
     return '' unless $state;
 
-    my $cobrand_name = $c->cobrand->moniker;
+    my $cobrand = $self->result_source->schema->cobrand;
+    my $cobrand_name = $cobrand->moniker;
     my $names = join(',,', @{$self->problem->body_names});
     if ($names =~ /(Bromley|Isle of Wight|TfL)/) {
         ($cobrand_name = lc $1) =~ s/ //g;
@@ -370,7 +373,8 @@ sub hide {
 }
 
 sub as_hashref {
-    my ($self, $c, $cols) = @_;
+    my ($self, $cols) = @_;
+    my $cobrand = $self->result_source->schema->cobrand;
 
     my $out = {
         id => $self->id,
@@ -380,13 +384,13 @@ sub as_hashref {
         created => $self->created,
     };
 
-    $out->{problem_state} = $self->problem_state_processed($c);
+    $out->{problem_state} = $self->problem_state_processed;
 
     $out->{photos} = [ map { $_->{url} } @{$self->photos} ] if !$cols || $cols->{photos};
 
     if ($self->confirmed) {
         $out->{confirmed} = $self->confirmed if !$cols || $cols->{confirmed};
-        $out->{confirmed_pp} = $c->cobrand->prettify_dt( $self->confirmed ) if !$cols || $cols->{confirmed_pp};
+        $out->{confirmed_pp} = $cobrand->prettify_dt( $self->confirmed ) if !$cols || $cols->{confirmed_pp};
     }
 
     return $out;
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 0653de32b..705f07f79 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -631,13 +631,14 @@ meta data about the report.
 =cut
 
 sub meta_line {
-    my ( $problem, $c ) = @_;
+    my ( $problem, $user ) = @_;
+    my $cobrand = $problem->result_source->schema->cobrand;
 
     my $date_time = Utils::prettify_dt( $problem->confirmed );
     my $meta = '';
 
     my $category = $problem->category_display;
-    $category = $c->cobrand->call_hook(change_category_text => $category) || $category;
+    $category = $cobrand->call_hook(change_category_text => $category) || $category;
 
     if ( $problem->anonymous ) {
         if ( $problem->service and $category && $category ne _('Other') ) {
@@ -656,8 +657,8 @@ sub meta_line {
     } else {
         my $problem_name = $problem->name;
 
-        if ($c->user_exists and
-            $c->user->has_permission_to('view_body_contribute_details', $problem->bodies_str_ids) and
+        if ($user and
+            $user->has_permission_to('view_body_contribute_details', $problem->bodies_str_ids) and
             $problem->name ne $problem->user->name) {
             $problem_name = sprintf('%s (%s)', $problem->name, $problem->user->name );
         }
@@ -692,12 +693,12 @@ sub nearest_address {
 }
 
 sub body {
-    my ( $problem, $c ) = @_;
+    my ( $problem, $link ) = @_;
     my $body;
     if ($problem->external_body) {
         if ($problem->cobrand eq 'zurich') {
             my $cache = $problem->result_source->schema->cache;
-            return $cache->{bodies}{$problem->external_body} //= $c->model('DB::Body')->find({ id => $problem->external_body });
+            return $cache->{bodies}{$problem->external_body} //= FixMyStreet::DB->resultset('Body')->find({ id => $problem->external_body });
         } else {
             $body = FixMyStreet::Template::html_filter($problem->external_body);
         }
@@ -705,7 +706,7 @@ sub body {
         my $bodies = $problem->bodies;
         my @body_names = sort map {
             my $name = $_->name;
-            if ($c and FixMyStreet->config('AREA_LINKS_FROM_PROBLEMS')) {
+            if ($link and FixMyStreet->config('AREA_LINKS_FROM_PROBLEMS')) {
                 '<a href="' . $_->url . '">' . FixMyStreet::Template::html_filter($name) . '</a>';
             } else {
                 FixMyStreet::Template::html_filter($name);
@@ -810,9 +811,10 @@ sub can_display_external_id {
 
 # This can return HTML and is safe, so returns a FixMyStreet::Template::SafeString
 sub duration_string {
-    my ( $problem, $c ) = @_;
-    my $body = $c->cobrand->call_hook(link_to_council_cobrand => $problem) || $problem->body($c);
-    my $handler = $c->cobrand->call_hook(get_body_handler_for_problem => $problem);
+    my $problem = shift;
+    my $cobrand = $problem->result_source->schema->cobrand;
+    my $body = $cobrand->call_hook(link_to_council_cobrand => $problem) || $problem->body(1);
+    my $handler = $cobrand->call_hook(get_body_handler_for_problem => $problem);
     if ( $handler && $handler->call_hook('is_council_with_case_management') ) {
         my $s = sprintf(_('Received by %s moments later'), $body);
         return FixMyStreet::Template::SafeString->new($s);
@@ -896,7 +898,8 @@ sub resend {
 }
 
 sub as_hashref {
-    my ($self, $c, $cols) = @_;
+    my ($self, $cols) = @_;
+    my $cobrand = $self->result_source->schema->cobrand;
 
     my $state_t = FixMyStreet::DB->resultset("State")->display($self->state);
 
@@ -916,11 +919,11 @@ sub as_hashref {
     };
     $out->{is_fixed} = $self->fixed_states->{ $self->state } ? 1 : 0 if !$cols || $cols->{is_fixed};
     $out->{photos} = [ map { $_->{url} } @{$self->photos} ] if !$cols || $cols->{photos};
-    $out->{meta} = $self->confirmed ? $self->meta_line( $c ) : '' if !$cols || $cols->{meta};
-    $out->{created_pp} = $c->cobrand->prettify_dt( $self->created ) if !$cols || $cols->{created_pp};
+    $out->{meta} = $self->confirmed ? $self->meta_line : '' if !$cols || $cols->{meta};
+    $out->{created_pp} = $cobrand->prettify_dt( $self->created ) if !$cols || $cols->{created_pp};
     if ($self->confirmed) {
         $out->{confirmed} = $self->confirmed if !$cols || $cols->{confirmed};
-        $out->{confirmed_pp} = $c->cobrand->prettify_dt( $self->confirmed ) if !$cols || $cols->{confirmed_pp};
+        $out->{confirmed_pp} = $cobrand->prettify_dt( $self->confirmed ) if !$cols || $cols->{confirmed_pp};
     }
     return $out;
 }
@@ -973,10 +976,11 @@ has get_cobrand_logged => (
 
 
 sub pin_data {
-    my ($self, $c, $page, %opts) = @_;
-    my $colour = $c->cobrand->pin_colour($self, $page);
+    my ($self, $page, %opts) = @_;
+    my $cobrand = $self->result_source->schema->cobrand;
+    my $colour = $cobrand->pin_colour($self, $page);
     my $title = $opts{private} ? $self->title : $self->title_safe;
-    $title = $c->cobrand->call_hook(pin_hover_title => $self, $title) || $title;
+    $title = $cobrand->call_hook(pin_hover_title => $self, $title) || $title;
     {
         latitude => $self->latitude,
         longitude => $self->longitude,
@@ -986,7 +990,7 @@ sub pin_data {
         problem => $self,
         draggable => $opts{draggable},
         type => $opts{type},
-        base_url => $c->cobrand->relative_url_for_report($self),
+        base_url => $cobrand->relative_url_for_report($self),
     }
 };
 
diff --git a/templates/web/base/my/anonymize.html b/templates/web/base/my/anonymize.html
index e82a03ce0..1159d4ebc 100644
--- a/templates/web/base/my/anonymize.html
+++ b/templates/web/base/my/anonymize.html
@@ -10,7 +10,7 @@
     <input class="btn-primary" type="submit" name="hide" value="[% loc('Hide my name in this update') %]">
   [% ELSIF problem %]
     [% IF problem.bodies_str %]
-      <p>[% tprintf(loc('Your name has already been sent to %s, but we can hide it on this page:'), problem.body(c)) %]</p>
+      <p>[% tprintf(loc('Your name has already been sent to %s, but we can hide it on this page:'), problem.body) %]</p>
     [% END %]
     <input type="hidden" name="problem" value="[% problem.id %]">
     <input class="btn-primary" type="submit" name="hide" value="[% loc('Hide my name on this report') %]">
diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html
index 7a08d461d..00911c5b1 100644
--- a/templates/web/base/questionnaire/index.html
+++ b/templates/web/base/questionnaire/index.html
@@ -49,7 +49,7 @@
     <h3 class="questionnaire-report-reminder__report-title">
         <a href="/report/[% problem.id %]">[% problem.title | html %]</a>
     </h3>
-    <p class="questionnaire-report-reminder__report-meta">[% problem.meta_line(c) | html %]</p>
+    <p class="questionnaire-report-reminder__report-meta">[% problem.meta_line(c.user) | html %]</p>
   [% IF updates.size %]
     <p class="questionnaire-report-reminder__last-update-header">
         <strong>[% loc('Last update') %]</strong>
diff --git a/templates/web/base/report/_council_sent_info.html b/templates/web/base/report/_council_sent_info.html
index dca74f994..ae0f80a2e 100644
--- a/templates/web/base/report/_council_sent_info.html
+++ b/templates/web/base/report/_council_sent_info.html
@@ -1,4 +1,4 @@
-[% SET duration_clause = problem.duration_string(c) %]
+[% SET duration_clause = problem.duration_string %]
 [% IF duration_clause || problem.can_display_external_id %]
     <p class="council_sent_info">
     [%- IF problem.can_display_external_id %]
diff --git a/templates/web/base/report/_report_meta_info.html b/templates/web/base/report/_report_meta_info.html
index e2a6412a3..73e897e34 100644
--- a/templates/web/base/report/_report_meta_info.html
+++ b/templates/web/base/report/_report_meta_info.html
@@ -1,4 +1,4 @@
-[% problem.meta_line(c) | html %]
+[% problem.meta_line(c.user) | html %]
 [% IF c.user_exists AND c.user.id == problem.user_id AND !problem.anonymous %]
     <small>(<a href="/my/anonymize?problem=[% problem.id | uri %]" class="js-hide-name">[% loc('Hide your name?') %]</a>)</small>
 [% END %]
diff --git a/templates/web/base/report/_update_state.html b/templates/web/base/report/_update_state.html
index 0274d7695..0bc4bfb52 100644
--- a/templates/web/base/report/_update_state.html
+++ b/templates/web/base/report/_update_state.html
@@ -4,7 +4,7 @@
       OR update.mark_fixed
       OR update.mark_open
 %]
-    <p class="meta-2">[% loc('State changed to:') %] [% update.problem_state_display(c) %]</p>
+    <p class="meta-2">[% loc('State changed to:') %] [% update.problem_state_display %]</p>
     [%- global.last_state = update_state %]
     [%- IF update_state == "" AND update.mark_fixed %][% global.last_state = 'fixed - user' %][% END %]
     [%- IF update_state == "" AND update.mark_open %][% global.last_state = 'confirmed' %][% END %]
diff --git a/templates/web/base/report/updates.html b/templates/web/base/report/updates.html
index 93bae4d64..d65f1a287 100644
--- a/templates/web/base/report/updates.html
+++ b/templates/web/base/report/updates.html
@@ -27,6 +27,6 @@
       [% RETURN %]
     [% END %]
 
-    [% update.meta_line(c) %]
+    [% update.meta_line(c.user) %]
 
 [% END %]
diff --git a/templates/web/bathnes/report/_council_sent_info.html b/templates/web/bathnes/report/_council_sent_info.html
index 1963020bc..c7e1eaf1d 100644
--- a/templates/web/bathnes/report/_council_sent_info.html
+++ b/templates/web/bathnes/report/_council_sent_info.html
@@ -1,4 +1,4 @@
-[% SET duration_clause = problem.duration_string(c) %]
+[% SET duration_clause = problem.duration_string %]
 [% IF duration_clause || problem.whensent %]
     <p class="council_sent_info">
     [%- IF problem.whensent %]
diff --git a/templates/web/cheshireeast/report/_council_sent_info.html b/templates/web/cheshireeast/report/_council_sent_info.html
index 1963020bc..c7e1eaf1d 100644
--- a/templates/web/cheshireeast/report/_council_sent_info.html
+++ b/templates/web/cheshireeast/report/_council_sent_info.html
@@ -1,4 +1,4 @@
-[% SET duration_clause = problem.duration_string(c) %]
+[% SET duration_clause = problem.duration_string %]
 [% IF duration_clause || problem.whensent %]
     <p class="council_sent_info">
     [%- IF problem.whensent %]
diff --git a/templates/web/fixmystreet.com/report/_report_meta_info.html b/templates/web/fixmystreet.com/report/_report_meta_info.html
index 2eab84c9e..82d4b289a 100644
--- a/templates/web/fixmystreet.com/report/_report_meta_info.html
+++ b/templates/web/fixmystreet.com/report/_report_meta_info.html
@@ -1,4 +1,4 @@
-[% problem.meta_line(c) | html %]
+[% problem.meta_line(c.user) | html %]
 [% IF c.cobrand.moniker != problem.get_cobrand_logged.moniker AND problem.get_cobrand_logged.is_council %]
     using <a href="https://www.fixmystreet.com/pro/">FixMyStreet Pro</a>
 [% END %]
diff --git a/templates/web/hounslow/report/_council_sent_info.html b/templates/web/hounslow/report/_council_sent_info.html
index 921f17f5f..97a7c4ca5 100644
--- a/templates/web/hounslow/report/_council_sent_info.html
+++ b/templates/web/hounslow/report/_council_sent_info.html
@@ -1,5 +1,5 @@
 [% SET can_display_external_id = problem.external_id AND c.user_exists AND c.user.belongs_to_body(problem.bodies_str) %]
-[% SET duration_clause = problem.duration_string(c) %]
+[% SET duration_clause = problem.duration_string %]
 [% IF duration_clause || can_display_external_id %]
     <p class="council_sent_info">
     [% duration_clause %]
diff --git a/templates/web/isleofwight/report/_council_sent_info.html b/templates/web/isleofwight/report/_council_sent_info.html
index d9edac902..a2933d81e 100644
--- a/templates/web/isleofwight/report/_council_sent_info.html
+++ b/templates/web/isleofwight/report/_council_sent_info.html
@@ -1,4 +1,4 @@
-[% SET duration_clause = problem.duration_string(c) %]
+[% SET duration_clause = problem.duration_string %]
 [% IF duration_clause || problem.can_display_external_id %]
     <p class="council_sent_info">
     [%- IF problem.can_display_external_id %]
diff --git a/templates/web/northamptonshire/report/_council_sent_info.html b/templates/web/northamptonshire/report/_council_sent_info.html
index 6329c51ad..5a53f2034 100644
--- a/templates/web/northamptonshire/report/_council_sent_info.html
+++ b/templates/web/northamptonshire/report/_council_sent_info.html
@@ -1,4 +1,4 @@
-[% SET duration_clause = problem.duration_string(c) %]
+[% SET duration_clause = problem.duration_string %]
 [% IF duration_clause || problem.whensent %]
     <p class="council_sent_info">
     [%- IF problem.whensent AND NOT c.cobrand.is_defect(problem) %]
diff --git a/templates/web/oxfordshire/report/_main_sent_info.html b/templates/web/oxfordshire/report/_main_sent_info.html
index 9865153d3..7066ebe5d 100644
--- a/templates/web/oxfordshire/report/_main_sent_info.html
+++ b/templates/web/oxfordshire/report/_main_sent_info.html
@@ -1,4 +1,4 @@
-[% SET duration_clause = problem.duration_string(c) %]
+[% SET duration_clause = problem.duration_string %]
 [% IF duration_clause %]
     <p class="council_sent_info">[% duration_clause %]</p>
 [% END %]
diff --git a/templates/web/peterborough/report/_council_sent_info.html b/templates/web/peterborough/report/_council_sent_info.html
index 1963020bc..c7e1eaf1d 100644
--- a/templates/web/peterborough/report/_council_sent_info.html
+++ b/templates/web/peterborough/report/_council_sent_info.html
@@ -1,4 +1,4 @@
-[% SET duration_clause = problem.duration_string(c) %]
+[% SET duration_clause = problem.duration_string %]
 [% IF duration_clause || problem.whensent %]
     <p class="council_sent_info">
     [%- IF problem.whensent %]
diff --git a/templates/web/tfl/report/_council_sent_info.html b/templates/web/tfl/report/_council_sent_info.html
index ef6cca079..472c6ce10 100644
--- a/templates/web/tfl/report/_council_sent_info.html
+++ b/templates/web/tfl/report/_council_sent_info.html
@@ -1,4 +1,4 @@
-[% SET duration_clause = problem.duration_string(c) %]
+[% SET duration_clause = problem.duration_string %]
 [% IF duration_clause || problem.whensent %]
     <p class="council_sent_info">
     [%- IF problem.whensent %]
diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html
index 08857f165..a2805d6dc 100644
--- a/templates/web/zurich/admin/problem_row.html
+++ b/templates/web/zurich/admin/problem_row.html
@@ -31,7 +31,7 @@
                 [%- IF p_body.parent.parent.id -%][%# ...it's a subdivision %]
                     [% PROCESS value_or_nbsp value=p_body.name %]
                 [%- ELSIF problem.external_body %]
-                    [% PROCESS value_or_nbsp value=problem.body(c).name %]
+                    [% PROCESS value_or_nbsp value=problem.body.name %]
                 [%- ELSE -%]
                     &nbsp;
                 [%- END -%]
diff --git a/templates/web/zurich/admin/reports/edit.html b/templates/web/zurich/admin/reports/edit.html
index c88c63307..4a35192f0 100644
--- a/templates/web/zurich/admin/reports/edit.html
+++ b/templates/web/zurich/admin/reports/edit.html
@@ -272,7 +272,7 @@
           [% ELSE %]
             [% loc('Message to competent body:') %]
           [% END %]
-        [% problem.body(c).endpoint %]
+        [% problem.body.endpoint %]
     </h2>
     <div class="admin-external-message">
         [% problem.extra.external_message | html_para %]
diff --git a/templates/web/zurich/report/banner.html b/templates/web/zurich/report/banner.html
index 8814dc986..b8ba7fa43 100644
--- a/templates/web/zurich/report/banner.html
+++ b/templates/web/zurich/report/banner.html
@@ -1,5 +1,5 @@
 [% USE date %]
-[% problem_hashref = c.cobrand.problem_as_hashref(problem, c) %]
+[% problem_hashref = c.cobrand.problem_as_hashref(problem) %]
 <div class="banner banner--[% problem_hashref.banner_id %]">
     <p>[% problem_hashref.state_t %]</p>
 </div>
-- 
cgit v1.2.3


From 530ced2b6ba9ca394567572e66a50917ae49586c Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 30 Jul 2020 19:13:28 +0100
Subject: =?UTF-8?q?[Docs]=20Remove=20jekyll-livereload,=20it=E2=80=99s=20n?=
 =?UTF-8?q?ow=20included=20in=20Jekyll=20itself?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/Gemfile      | 4 ----
 docs/Gemfile.lock | 6 +-----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/docs/Gemfile b/docs/Gemfile
index 62a36141d..53aaf9102 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 gem 'github-pages'
 
-# https://github.com/RobertDeRose/jekyll-livereload/
-group :jekyll_plugins do
-    gem 'jekyll-livereload'
-end
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index c6eb7aa83..c99d41c26 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -120,9 +120,6 @@ GEM
     jekyll-github-metadata (2.13.0)
       jekyll (>= 3.4, < 5.0)
       octokit (~> 4.0, != 4.4.0)
-    jekyll-livereload (0.2.2)
-      em-websocket (~> 0.5)
-      jekyll (~> 3.0)
     jekyll-mentions (1.5.1)
       html-pipeline (~> 2.3)
       jekyll (>= 3.7, < 5.0)
@@ -246,7 +243,6 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
-  jekyll-livereload
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
-- 
cgit v1.2.3


From 5a0dd3f573f7aba771fe916a65138dfbbb258982 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 30 Jul 2020 19:14:42 +0100
Subject: [Docs] Add instructions & example for including HTML in notice fields

For https://github.com/mysociety/fixmystreet-commercial/issues/1905
---
 docs/_includes/admin-tasks-content.md              |  44 +++++++++++++++++++++
 .../img/pro-user-guide/blocked-drains-guidance.png | Bin 0 -> 378727 bytes
 2 files changed, 44 insertions(+)
 create mode 100644 docs/assets/img/pro-user-guide/blocked-drains-guidance.png

diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index cd6043c25..13ee4aa51 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -656,6 +656,50 @@ selected. This can be used to provide extra information about the category,
 point specific cases elsewhere (e.g. a phone number for urgent enquiries), or
 anything else you think the reporter may find useful.
 
+##### HTML content in notices
+
+Sometimes it can be helpful to use different text formatting or include images
+in the notices shown to users. You could, for example, include photos that
+illustrate the sorts of issues users should report in a particular category.
+
+<img alt="Screenshot illustrating how the notice can include guidance for the user as well as a comparison photo."
+    src="/assets/img/pro-user-guide/blocked-drains-guidance.png" class="admin-screenshot" />
+
+The **Notice text** field allows you to include HTML tags to apply text
+formatting, add links, or include images in the notice shown to the user. The
+above notice was generated from this HTML:
+
+```html
+We take different action depending on how a drain is blocked.<br>
+
+<span style="font-weight: normal">A blockage on the surface of a drain could be caused by leaves or litter. These blockages can usually be cleared by carrying out street sweeping.</span><br>
+
+<img src="https://www.borsetshire.gov.uk/images/BlockedDrainExamples.jpeg" alt="Compared with a surface blockage, an internal blockage could be caused by leaves, mud, or stones and need specialist equipment.">
+
+```
+
+The following HTML tags are allowed for use:
+
+ - `p`
+ - `ul`
+ - `ol`
+ - `li`
+ - `br`
+ - `b`
+ - `i`
+ - `strong`
+ - `em`
+ - `a`
+   - The following attributes are allowed: `href`, `style`, `target="_blank"`, `title`
+ - `img`
+   - The following attributes are allowed: `src`, `alt`, `width`, `height`, `hspace`, `vspace`, `align`, `sizes`, `srcset`
+   - **NB** The `alt` attribute is required if you're giving information only present in the image.
+ - `span`
+   - The following attributes are allowed: `style`
+
+Any other tags or attributes not allowed by the above list will be stripped out
+when you save your changes on the form.
+
 #### Questions
 
 A question can ask the user to provide some specific additional information
diff --git a/docs/assets/img/pro-user-guide/blocked-drains-guidance.png b/docs/assets/img/pro-user-guide/blocked-drains-guidance.png
new file mode 100644
index 000000000..95cb052a1
Binary files /dev/null and b/docs/assets/img/pro-user-guide/blocked-drains-guidance.png differ
-- 
cgit v1.2.3


From 00fe7b548cee48c9683e4fa99ed148cdf911cc84 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 16 Jan 2020 18:30:10 +0000
Subject: [Oxfordshire] add asset layers

Trees, street lights, traffic lights, grit bins and gullies
---
 templates/web/fixmystreet.com/footer_extra_js.html |   1 +
 templates/web/oxfordshire/footer_extra_js.html     |   2 +-
 web/cobrands/fixmystreet/assets.js                 |  20 +--
 web/cobrands/oxfordshire/assets.js                 | 138 +++++++++++++++++++++
 web/cobrands/oxfordshire/base.scss                 |   4 +
 5 files changed, 155 insertions(+), 10 deletions(-)
 create mode 100644 web/cobrands/oxfordshire/assets.js

diff --git a/templates/web/fixmystreet.com/footer_extra_js.html b/templates/web/fixmystreet.com/footer_extra_js.html
index 289e230e7..2a4f9ed9c 100644
--- a/templates/web/fixmystreet.com/footer_extra_js.html
+++ b/templates/web/fixmystreet.com/footer_extra_js.html
@@ -16,6 +16,7 @@ IF bodyclass.match('mappage');
     scripts.push( version('/cobrands/lincolnshire/assets.js') );
     scripts.push( version('/cobrands/northamptonshire/assets.js') );
     scripts.push( version('/cobrands/hounslow/assets.js') );
+    scripts.push( version('/cobrands/oxfordshire/assets.js') );
     scripts.push( version('/cobrands/westminster/assets.js') );
     scripts.push( version('/cobrands/peterborough/assets.js') );
     scripts.push( version('/cobrands/tfl/assets.js') );
diff --git a/templates/web/oxfordshire/footer_extra_js.html b/templates/web/oxfordshire/footer_extra_js.html
index 12a42c0d2..bb65cec8b 100644
--- a/templates/web/oxfordshire/footer_extra_js.html
+++ b/templates/web/oxfordshire/footer_extra_js.html
@@ -1 +1 @@
-[% PROCESS 'footer_extra_js_base.html' highways=1 validation=1 roadworks=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 validation=1 roadworks=1 cobrand_js=1 %]
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index 56055ec52..c42d900fc 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -549,15 +549,7 @@ function get_asset_stylemap() {
     return new OpenLayers.StyleMap({
         'default': fixmystreet.assets.style_default,
         'select': fixmystreet.assets.style_default_select,
-        'hover': new OpenLayers.Style({
-            fillColor: "#55BB00",
-            fillOpacity: 0.8,
-            strokeColor: "#000000",
-            strokeOpacity: 1,
-            strokeWidth: 2,
-            pointRadius: 8,
-            cursor: 'pointer'
-        })
+        'hover': fixmystreet.assets.style_default_hover
     });
 }
 
@@ -824,6 +816,16 @@ fixmystreet.assets = {
         pointRadius: 6
     }),
 
+    style_default_hover: new OpenLayers.Style({
+        fillColor: "#55BB00",
+        fillOpacity: 0.8,
+        strokeColor: "#000000",
+        strokeOpacity: 1,
+        strokeWidth: 2,
+        pointRadius: 8,
+        cursor: 'pointer'
+    }),
+
     style_default_select: new OpenLayers.Style({
         externalGraphic: pin_prefix + "pin-spot.png",
         fillColor: "#55BB00",
diff --git a/web/cobrands/oxfordshire/assets.js b/web/cobrands/oxfordshire/assets.js
new file mode 100644
index 000000000..9bd38acac
--- /dev/null
+++ b/web/cobrands/oxfordshire/assets.js
@@ -0,0 +1,138 @@
+(function(){
+
+if (!fixmystreet.maps) {
+    return;
+}
+
+var wfs_host = fixmystreet.staging ? 'tilma.staging.mysociety.org' : 'tilma.mysociety.org';
+var tilma_url = "https://" + wfs_host + "/mapserver/oxfordshire";
+var proxy_base_url = "https://" + wfs_host + "/proxy/occ/";
+
+var defaults = {
+    wfs_url: tilma_url,
+    asset_type: 'spot',
+    max_resolution: 4.777314267158508,
+    geometryName: 'msGeometry',
+    srsName: "EPSG:3857",
+    body: "Oxfordshire County Council",
+    strategy_class: OpenLayers.Strategy.FixMyStreet
+};
+
+var occ_default = $.extend({}, fixmystreet.assets.style_default.defaultStyle, {
+    fillColor: "#007258"
+});
+
+var occ_hover = new OpenLayers.Style({
+    pointRadius: 8,
+    cursor: 'pointer'
+});
+
+var occ_stylemap = new OpenLayers.StyleMap({
+    'default': occ_default,
+    'select': fixmystreet.assets.style_default_select,
+    'hover': occ_hover
+});
+
+fixmystreet.assets.add(defaults, {
+    stylemap: occ_stylemap,
+    wfs_feature: "Trees",
+    asset_id_field: 'Ref',
+    attributes: {
+        feature_id: 'Ref'
+    },
+    asset_category: ["Trees"],
+    asset_item: 'tree'
+});
+
+fixmystreet.assets.add(defaults, {
+    stylemap: occ_stylemap,
+    wfs_feature: "Traffic_Lights",
+    asset_id_field: 'Site',
+    attributes: {
+        feature_id: 'Site'
+    },
+    asset_category: ["Traffic Lights (permanent only)"],
+    asset_item: 'traffic light'
+});
+
+var streetlight_select = $.extend({
+    label: "${UNITNO}",
+    fontColor: "#FFD800",
+    labelOutlineColor: "black",
+    labelOutlineWidth: 3,
+    labelYOffset: 69,
+    fontSize: '18px',
+    fontWeight: 'bold'
+}, fixmystreet.assets.style_default_select.defaultStyle);
+
+var streetlight_stylemap = new OpenLayers.StyleMap({
+  'default': occ_default,
+  'select': new OpenLayers.Style(streetlight_select),
+  'hover': occ_hover
+});
+
+fixmystreet.assets.add(defaults, {
+    select_action: true,
+    stylemap: streetlight_stylemap,
+    wfs_feature: "Street_Lights",
+    asset_id_field: 'UNITID',
+    attributes: {
+        feature_id: 'UNITID',
+        column_no: 'UNITNO'
+    },
+    asset_category: ["Street lighting"],
+    asset_item: 'street light',
+    feature_code: 'UNITNO',
+    actions: {
+        asset_found: fixmystreet.assets.named_select_action_found,
+        asset_not_found: fixmystreet.assets.named_select_action_not_found
+    }
+});
+
+var owned_defaults = $.extend({}, defaults, {
+    stylemap: occ_stylemap,
+    // have to do this by hand rather than using wfs_* options
+    // as the server does not like being POSTed xml with application/xml
+    // as the Content-Type which is what using those options results in.
+    http_options: {
+        headers: {
+            'Content-Type': 'text/plain'
+        },
+        params: {
+            SERVICE: "WFS",
+            VERSION: "1.1.0",
+            REQUEST: "GetFeature",
+            SRSNAME: "urn:ogc:def:crs:EPSG::27700",
+            propertyName: 'id,maintained_by,msGeometry'
+        }
+    },
+    srsName: "EPSG:27700",
+    asset_id_field: 'id',
+    attributes: {
+        feature_id: 'id'
+    }
+});
+
+fixmystreet.assets.add(owned_defaults, {
+    http_options: {
+        url: proxy_base_url + 'drains/wfs',
+        params: {
+            TYPENAME: "junctions"
+        }
+    },
+    asset_category: ["Gully and Catchpits"],
+    asset_item: 'drain'
+});
+
+fixmystreet.assets.add(owned_defaults, {
+    http_options: {
+        url: proxy_base_url + 'grit/wfs',
+        params: {
+            TYPENAME: "Grit_bins"
+        }
+    },
+    asset_category: ["Ice/Snow"],
+    asset_item: 'grit bin'
+});
+
+})();
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index 9fd4bc2ad..a5f7a43d6 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -279,6 +279,10 @@ textarea {
     color: $color-oxfordshire-link-blue;
 }
 
+.asset-spot:before {
+    background-color: #007258;
+}
+
 @media print {
     body {
         background-color: #fff !important;
-- 
cgit v1.2.3


From 2b6d5e5dac59b6a8a9af89cc4a51a9c3dff7fee8 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Wed, 22 Jan 2020 17:54:44 +0000
Subject: [Oxfordshire] include asset id in council problem emails

---
 templates/email/oxfordshire/submit.html | 77 +++++++++++++++++++++++++++++++++
 templates/email/oxfordshire/submit.txt  | 52 ++++++++++++++++++++++
 2 files changed, 129 insertions(+)
 create mode 100644 templates/email/oxfordshire/submit.html
 create mode 100644 templates/email/oxfordshire/submit.txt

diff --git a/templates/email/oxfordshire/submit.html b/templates/email/oxfordshire/submit.html
new file mode 100644
index 000000000..d26f3d44e
--- /dev/null
+++ b/templates/email/oxfordshire/submit.html
@@ -0,0 +1,77 @@
+[%
+
+PROCESS '_email_settings.html';
+
+email_summary = "A new problem in your area has been reported by a " _ site_name _ " user.";
+email_footer = PROCESS '_submit_footer.html';
+email_columns = 2;
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+  [% start_padded_box | safe %]
+  <h1 style="[% h1_style %]">New problem in your&nbsp;area</h1>
+  <p style="[% p_style %]">[% missing %][% multiple %]A user of [% site_name %] has submitted the following report
+of a local problem that they believe might require your attention.</p>
+
+  <p style="margin: 20px auto; text-align: center">
+    <a style="[% button_style %]" href="[% url %]">Show full report</a>
+  </p>
+  <h2 style="[% h2_style %] margin: 30px 0 10px 0">Reported by:</h2>
+  <table [% table_reset | safe %]>
+    <tr>
+      <th style="[% contact_th_style %]">Name</th>
+      <td style="[% contact_td_style %]">[% report.name | html %]</td>
+    </tr>
+    <tr>
+      <th style="[% contact_th_style %]">Email</th>
+      <td style="[% contact_td_style %]">
+        [%~ IF report.user.email ~%]
+          <a href="mailto:[% report.user.email | html %]">[% report.user.email | html %]</a>
+        [%~ ELSE ~%]
+          <strong>No email address provided, only phone number</strong>
+        [%~ END ~%]
+      </td>
+    </tr>
+    [%~ IF report.user.phone %]
+      <tr>
+        <th style="[% contact_th_style %]">Phone</th>
+        <td style="[% contact_td_style %]"><a href="tel:[% report.user.phone | html %]">[% report.user.phone | html %]</a></td>
+      </tr>
+    [%~ END %]
+  </table>
+  <p style="[% p_style %] margin-top: 0.5em;">Replies to this message will go directly to [% report.name | html %], the user who reported the problem.</p>
+  [% end_padded_box | safe %]
+</th>
+[% WRAPPER '_email_sidebar.html' object = report %]
+    <h2 style="[% h2_style %]">[% report.title | html %]</h2>
+    <p style="[% secondary_p_style %]"><strong>Category:</strong> [% report.category | html %]</p>
+    <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
+    [%~ IF additional_information %]
+    <p style="[% secondary_p_style %]">[% additional_information %]</p>
+    [%~ END %]
+    <p style="[% secondary_p_style %]">
+      <strong>Location:</strong>
+      <br>Easting/Northing
+      [%~ " (IE)" IF coordsyst == "I" ~%]
+      : [% easting %]/[% northing %]
+      (<a href="[% osm_url %]" title="View OpenStreetMap of this location">
+        [%~ report.latitude %], [% report.longitude ~%]
+      </a>)
+      [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %]
+    </p>
+    [% IF report.get_extra_field_value('feature_id') %]
+    <p style="[% secondary_p_style %]">
+        <strong>Asset id:</strong> [% report.get_extra_field_value('feature_id') %]
+    </p>
+    [% END %]
+    [% IF report.get_extra_field_value('column_no') %]
+    <p style="[% secondary_p_style %]">
+        <strong>Column Number:</strong> [% report.get_extra_field_value('column_no') %]
+    </p>
+    [% END %]
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/oxfordshire/submit.txt b/templates/email/oxfordshire/submit.txt
new file mode 100644
index 000000000..90de2e60c
--- /dev/null
+++ b/templates/email/oxfordshire/submit.txt
@@ -0,0 +1,52 @@
+Subject: Problem Report: [% report.title %]
+
+Dear [% bodies_name %],
+
+[% missing %][% multiple %]A user of
+[% site_name %] has submitted the following report
+of a local problem that they believe might require your attention.
+
+[% fuzzy %], or to provide an update on the problem,
+please visit the following link:
+
+    [% url %]
+
+[% has_photo %]----------
+
+Name: [% report.name %]
+
+Email: [% report.user.email OR 'None provided' %]
+
+Phone: [% report.user.phone OR 'None provided' %]
+
+Category: [% report.category %]
+
+Subject: [% report.title %]
+
+Details: [% report.detail %]
+
+[% additional_information %]
+
+[%- IF report.get_extra_field_value('feature_id') %]
+Asset id: [% report.get_extra_field_value('feature_id') %]
+[%- END %]
+
+[%- IF report.get_extra_field_value('column_no') %]
+Column number: [% report.get_extra_field_value('column_no') %]
+[%- END %]
+
+Easting/Northing
+[%- " (IE)" IF coordsyst == "I" -%]
+: [% easting %]/[% northing %]
+
+Latitude: [% report.latitude %]
+
+Longitude: [% report.longitude %]
+
+View OpenStreetMap of this location: [% osm_url %]
+
+[% closest_address %]----------
+
+Replies to this email will go to the user who submitted the problem.
+
+[% signature %]
-- 
cgit v1.2.3


From a86acd036ad52a15ee3cf546f7f496f212be3cf5 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 23 Jan 2020 16:01:57 +0000
Subject: [Oxfordshire] include asset id in open311 description

---
 perllib/FixMyStreet/Cobrand/Bromley.pm       |  5 +++
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm   | 17 ++++++++++
 perllib/Open311/PostServiceRequestUpdates.pm |  2 +-
 t/cobrand/oxfordshire.t                      | 47 ++++++++++++++++++++++++++--
 4 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index e63d722fd..90e5895d5 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -232,6 +232,11 @@ sub open311_pre_send {
     }
 }
 
+sub open311_pre_send_updates {
+    my ($self, $row) = @_;
+    return $self->open311_pre_send($row);
+}
+
 sub open311_munge_update_params {
     my ($self, $params, $comment, $body) = @_;
     delete $params->{update_id};
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 31db0fd4e..cf88495f8 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -138,6 +138,23 @@ sub open311_config_updates {
     $params->{use_customer_reference} = 1;
 }
 
+sub open311_pre_send {
+    my ($self, $row, $open311) = @_;
+
+    $self->{ox_original_detail} = $row->detail;
+
+    if (my $fid = $row->get_extra_field_value('feature_id')) {
+        my $text = $row->detail . "\n\nAsset Id: $fid\n";
+        $row->detail($text);
+    }
+}
+
+sub open311_post_send {
+    my ($self, $row, $h, $contact) = @_;
+
+    $row->detail($self->{ox_original_detail});
+}
+
 sub should_skip_sending_update {
     my ($self, $update ) = @_;
 
diff --git a/perllib/Open311/PostServiceRequestUpdates.pm b/perllib/Open311/PostServiceRequestUpdates.pm
index a31bca8f7..b9aa9ed50 100755
--- a/perllib/Open311/PostServiceRequestUpdates.pm
+++ b/perllib/Open311/PostServiceRequestUpdates.pm
@@ -126,7 +126,7 @@ sub process_update {
 
     my $o = $self->construct_open311($body, $comment);
 
-    $cobrand->call_hook(open311_pre_send => $comment, $o);
+    $cobrand->call_hook(open311_pre_send_updates => $comment);
 
     my $id = $o->post_service_request_update( $comment );
 
diff --git a/t/cobrand/oxfordshire.t b/t/cobrand/oxfordshire.t
index 65c6a3864..16b7e5714 100644
--- a/t/cobrand/oxfordshire.t
+++ b/t/cobrand/oxfordshire.t
@@ -1,7 +1,9 @@
 use Test::MockModule;
 
+use CGI::Simple;
 use FixMyStreet::TestMech;
 use FixMyStreet::Script::Alerts;
+use FixMyStreet::Script::Reports;
 my $mech = FixMyStreet::TestMech->new;
 
 my $oxon = $mech->create_body_ok(2237, 'Oxfordshire County Council');
@@ -50,6 +52,7 @@ subtest 'check /around?ajax defaults to open reports only' => sub {
 my @problems = FixMyStreet::DB->resultset('Problem')->search({}, { rows => 3, order_by => 'id' })->all;
 
 FixMyStreet::override_config {
+    STAGING_FLAGS => { send_reports => 1, skip_checks => 1 },
     ALLOWED_COBRANDS => 'oxfordshire',
     MAPIT_URL => 'http://mapit.uk/',
 }, sub {
@@ -63,10 +66,10 @@ FixMyStreet::override_config {
         is $mech->uri->path, '/report/' . $problem->id, 'redirects to report';
     };
 
-    subtest 'check unable to fix label' => sub {
-        my $user = $mech->create_user_ok( 'user@example.com', name => 'Test User' );
-        my $user2 = $mech->create_user_ok( 'user2@example.com', name => 'Test User2' );
+    my $user = $mech->create_user_ok( 'user@example.com', name => 'Test User' );
+    my $user2 = $mech->create_user_ok( 'user2@example.com', name => 'Test User2' );
 
+    subtest 'check unable to fix label' => sub {
         my $problem = $problems[0];
         $problem->state( 'unable to fix' );
         $problem->update;
@@ -128,6 +131,44 @@ FixMyStreet::override_config {
         is $rows[2]->[20], '', 'Report without HIAMS ref has empty ref field';
         is $rows[3]->[20], '123098123', 'Older Exor report has correct ref';
     };
+
+    $oxon->update({
+        send_method => 'Open311',
+        endpoint => 'endpoint',
+        api_key => 'key',
+        jurisdiction => 'home',
+    });
+    my $contact = $mech->create_contact_ok( body_id => $oxon->id, category => 'Gullies and Catchpits', email => 'GC' );
+    $contact->set_extra_fields( (
+        { code => 'feature_id', datatype => 'hidden', variable => 'true' },
+    ) );
+    $contact->update;
+    FixMyStreet::Script::Reports::send(); # Make sure no waiting reports
+
+    subtest 'Check special Open311 request handling', sub {
+        my ($p) = $mech->create_problems_for_body( 1, $oxon->id, 'Test', {
+            cobrand => 'oxfordshire',
+            category => 'Gullies and Catchpits',
+            user => $user,
+            latitude => 51.754926,
+            longitude => -1.256179,
+        });
+        $p->set_extra_fields({ name => 'feature_id', value => 9875432});
+        $p->update;
+
+        my $test_data = FixMyStreet::Script::Reports::send();
+
+        $p->discard_changes;
+        ok $p->whensent, 'Report marked as sent';
+        is $p->send_method_used, 'Open311', 'Report sent via Open311';
+        is $p->external_id, 248, 'Report has right external ID';
+        unlike $p->detail, qr/Asset Id:/, 'asset id not saved to report detail';
+
+        my $req = $test_data->{test_req_used};
+        my $c = CGI::Simple->new($req->content);
+        like $c->param('description'), qr/Asset Id: 9875432/, 'asset id included in body';
+    };
+
 };
 
 done_testing();
-- 
cgit v1.2.3


From cb257d9b2f4dcb9c9fa54836e6e08378194ff393 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Wed, 5 Feb 2020 15:04:07 +0000
Subject: [Oxfordshire] Add NSG roads layer.

Prevent reports on areas not on a road for relevant categories,
and do not allow reporting on private roads.
---
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm         |  5 ++
 t/cobrand/oxfordshire.t                            | 60 +++++++++++++---------
 .../web/oxfordshire/report/new/roads_message.html  |  7 +++
 web/cobrands/oxfordshire/assets.js                 | 50 ++++++++++++++++++
 4 files changed, 99 insertions(+), 23 deletions(-)
 create mode 100644 templates/web/oxfordshire/report/new/roads_message.html

diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index cf88495f8..6021827cb 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -147,6 +147,11 @@ sub open311_pre_send {
         my $text = $row->detail . "\n\nAsset Id: $fid\n";
         $row->detail($text);
     }
+
+    if (my $usrn = $row->get_extra_field_value('usrn')) {
+        my $text = $row->detail . "\n\nUSRN: $usrn\n";
+        $row->detail($text);
+    }
 }
 
 sub open311_post_send {
diff --git a/t/cobrand/oxfordshire.t b/t/cobrand/oxfordshire.t
index 16b7e5714..5207ba916 100644
--- a/t/cobrand/oxfordshire.t
+++ b/t/cobrand/oxfordshire.t
@@ -141,33 +141,47 @@ FixMyStreet::override_config {
     my $contact = $mech->create_contact_ok( body_id => $oxon->id, category => 'Gullies and Catchpits', email => 'GC' );
     $contact->set_extra_fields( (
         { code => 'feature_id', datatype => 'hidden', variable => 'true' },
+        { code => 'usrn', datatype => 'hidden', variable => 'true' },
     ) );
     $contact->update;
     FixMyStreet::Script::Reports::send(); # Make sure no waiting reports
 
-    subtest 'Check special Open311 request handling', sub {
-        my ($p) = $mech->create_problems_for_body( 1, $oxon->id, 'Test', {
-            cobrand => 'oxfordshire',
-            category => 'Gullies and Catchpits',
-            user => $user,
-            latitude => 51.754926,
-            longitude => -1.256179,
-        });
-        $p->set_extra_fields({ name => 'feature_id', value => 9875432});
-        $p->update;
-
-        my $test_data = FixMyStreet::Script::Reports::send();
-
-        $p->discard_changes;
-        ok $p->whensent, 'Report marked as sent';
-        is $p->send_method_used, 'Open311', 'Report sent via Open311';
-        is $p->external_id, 248, 'Report has right external ID';
-        unlike $p->detail, qr/Asset Id:/, 'asset id not saved to report detail';
-
-        my $req = $test_data->{test_req_used};
-        my $c = CGI::Simple->new($req->content);
-        like $c->param('description'), qr/Asset Id: 9875432/, 'asset id included in body';
-    };
+    for my $test (
+        {
+            field => 'usrn',
+            value => '12345',
+            text => 'USRN',
+        },
+        {
+            field => 'feature_id',
+            value => '12345',
+            text => 'Asset Id',
+        },
+    ) {
+        subtest 'Check special Open311 request handling of ' . $test->{text}, sub {
+            my ($p) = $mech->create_problems_for_body( 1, $oxon->id, 'Test', {
+                cobrand => 'oxfordshire',
+                category => 'Gullies and Catchpits',
+                user => $user,
+                latitude => 51.754926,
+                longitude => -1.256179,
+            });
+            $p->set_extra_fields({ name => $test->{field}, value => $test->{value}});
+            $p->update;
+
+            my $test_data = FixMyStreet::Script::Reports::send();
+
+            $p->discard_changes;
+            ok $p->whensent, 'Report marked as sent';
+            is $p->send_method_used, 'Open311', 'Report sent via Open311';
+            is $p->external_id, 248, 'Report has right external ID';
+            unlike $p->detail, qr/$test->{text}:/, $test->{text} . ' not saved to report detail';
+
+            my $req = $test_data->{test_req_used};
+            my $c = CGI::Simple->new($req->content);
+            like $c->param('description'), qr/$test->{text}: $test->{value}/, $test->{text} . ' included in body';
+        };
+    }
 
 };
 
diff --git a/templates/web/oxfordshire/report/new/roads_message.html b/templates/web/oxfordshire/report/new/roads_message.html
new file mode 100644
index 000000000..1c1dd66b0
--- /dev/null
+++ b/templates/web/oxfordshire/report/new/roads_message.html
@@ -0,0 +1,7 @@
+<div id="js-roads-responsibility" class="box-warning hidden">
+    <div id="js-not-a-road" class="hidden js-responsibility-message">
+        <p>This area is not under the responsibility of Oxfordshire
+        County Council and therefore we are unable to accept reports in
+        this area / street.</p>
+    </div>
+</div>
diff --git a/web/cobrands/oxfordshire/assets.js b/web/cobrands/oxfordshire/assets.js
index 9bd38acac..1f7a7808d 100644
--- a/web/cobrands/oxfordshire/assets.js
+++ b/web/cobrands/oxfordshire/assets.js
@@ -135,4 +135,54 @@ fixmystreet.assets.add(owned_defaults, {
     asset_item: 'grit bin'
 });
 
+var road_occ_maintainable = 'Maintainable at Public Expense';
+
+function road_owned(f) {
+    return f &&
+           f.attributes &&
+           f.attributes.STREET_MAINTENANCE_RESPONSIBILITY_NAME &&
+           f.attributes.STREET_MAINTENANCE_RESPONSIBILITY_NAME.lastIndexOf(road_occ_maintainable, 0) === 0;
+}
+
+fixmystreet.assets.add(defaults, {
+    stylemap: fixmystreet.assets.stylemap_invisible,
+    wfs_url: proxy_base_url + 'nsg/',
+    wfs_feature: "WFS_STREETS_CLASSIFIED_ROADS_INTERESTS",
+    propertyNames: ['TYPE1_2_USRN', 'STREET_MAINTENANCE_RESPONSIBILITY_NAME', 'SHAPE_GEOMETRY'],
+    srsName: "EPSG:27700",
+    geometryName: null,
+    usrn: {
+        attribute: 'TYPE1_2_USRN',
+        field: 'usrn'
+    },
+    non_interactive: true,
+    road: true,
+    no_asset_msg_id: '#js-not-a-road',
+    asset_item: 'road',
+    asset_type: 'road',
+    actions: {
+        found: function(layer, feature) {
+            fixmystreet.message_controller.road_found(layer, feature, road_owned, '#js-not-a-road');
+        },
+        not_found: fixmystreet.message_controller.road_not_found
+    },
+    asset_category: [
+        "Bridges",
+        "Carriageway Defect",
+        "Current Roadworks",
+        "Drainage",
+        "Gully and Catchpits",
+        "Highway Schemes",
+        "Ice/Snow",
+        "Manhole",
+        "Pavements",
+        "Pothole",
+        "Road Traffic Signs and Road Markings",
+        "Roads/highways",
+        "Street lighting",
+        "Traffic Lights (permanent only)",
+        "Trees"
+    ]
+});
+
 })();
-- 
cgit v1.2.3


From 07c053c4b5d49c20f24024154b5e154bb0239347 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Mon, 6 Apr 2020 17:25:28 +0100
Subject: [Oxfordshire] prevent reports on non OCC assets

also improve contrast between assets and labels
---
 .../web/oxfordshire/report/new/roads_message.html  |  6 ++
 web/cobrands/oxfordshire/assets.js                 | 67 +++++++++++++++++++++-
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/templates/web/oxfordshire/report/new/roads_message.html b/templates/web/oxfordshire/report/new/roads_message.html
index 1c1dd66b0..4572b07bd 100644
--- a/templates/web/oxfordshire/report/new/roads_message.html
+++ b/templates/web/oxfordshire/report/new/roads_message.html
@@ -4,4 +4,10 @@
         County Council and therefore we are unable to accept reports in
         this area / street.</p>
     </div>
+    <div id="js-not-an-asset" class="hidden js-responsibility-message">
+        <p>This item is not maintained by Oxfordshire
+            County Council and therefore we are unable to accept reports about it. Please
+            Contact your Parish or District Council.
+        </p>
+    </div>
 </div>
diff --git a/web/cobrands/oxfordshire/assets.js b/web/cobrands/oxfordshire/assets.js
index 1f7a7808d..caa4d5e2c 100644
--- a/web/cobrands/oxfordshire/assets.js
+++ b/web/cobrands/oxfordshire/assets.js
@@ -33,6 +33,58 @@ var occ_stylemap = new OpenLayers.StyleMap({
     'hover': occ_hover
 });
 
+var occ_ownernames = [
+    "LocalAuthority", "CountyCouncil", 'ODS'
+];
+
+function occ_owns_feature(f) {
+    return f &&
+           f.attributes &&
+           f.attributes.maintained_by &&
+           OpenLayers.Util.indexOf(occ_ownernames, f.attributes.maintained_by) > -1;
+}
+
+function occ_does_not_own_feature(f) {
+    return !occ_owns_feature(f);
+}
+
+var owned_default_style = new OpenLayers.Style({
+    fillColor: "#868686",
+    fillOpacity: 0.6,
+    strokeColor: "#000000",
+    strokeOpacity: 0.6,
+    strokeWidth: 2,
+    pointRadius: 4,
+    title: 'Not maintained by Oxfordshire County Council. Maintained by ${maintained_by}.'
+});
+
+var rule_owned = new OpenLayers.Rule({
+    filter: new OpenLayers.Filter.FeatureId({
+        type: OpenLayers.Filter.Function,
+        evaluate: occ_owns_feature
+    }),
+    symbolizer: {
+        fillColor: "#007258",
+        pointRadius: 6,
+        title: ''
+    }
+});
+
+var rule_not_owned = new OpenLayers.Rule({
+    filter: new OpenLayers.Filter.FeatureId({
+        type: OpenLayers.Filter.Function,
+        evaluate: occ_does_not_own_feature
+    })
+});
+
+owned_default_style.addRules([rule_owned, rule_not_owned]);
+
+var owned_stylemap = new OpenLayers.StyleMap({
+    'default': owned_default_style,
+    'select': fixmystreet.assets.style_default_select,
+    'hover': occ_hover
+});
+
 fixmystreet.assets.add(defaults, {
     stylemap: occ_stylemap,
     wfs_feature: "Trees",
@@ -90,7 +142,8 @@ fixmystreet.assets.add(defaults, {
 });
 
 var owned_defaults = $.extend({}, defaults, {
-    stylemap: occ_stylemap,
+    stylemap: owned_stylemap,
+    select_action: true,
     // have to do this by hand rather than using wfs_* options
     // as the server does not like being POSTed xml with application/xml
     // as the Content-Type which is what using those options results in.
@@ -110,6 +163,18 @@ var owned_defaults = $.extend({}, defaults, {
     asset_id_field: 'id',
     attributes: {
         feature_id: 'id'
+    },
+    actions: {
+        asset_found: function(asset) {
+          var is_occ = occ_owns_feature(asset);
+          if (!is_occ) {
+              fixmystreet.message_controller.asset_not_found.call(this);
+          } else {
+              fixmystreet.message_controller.asset_found.call(this);
+          }
+        },
+        // Not a typo, asset selection is not mandatory
+        asset_not_found: fixmystreet.message_controller.asset_found
     }
 });
 
-- 
cgit v1.2.3


From 045f362b3a37bd1c5f446674be4033852a7b4b22 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 10 Aug 2020 15:37:49 +0100
Subject: [Oxfordshire] Switch to our own server for NSG.

---
 web/cobrands/oxfordshire/assets.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/web/cobrands/oxfordshire/assets.js b/web/cobrands/oxfordshire/assets.js
index caa4d5e2c..fc9f87064 100644
--- a/web/cobrands/oxfordshire/assets.js
+++ b/web/cobrands/oxfordshire/assets.js
@@ -211,11 +211,9 @@ function road_owned(f) {
 
 fixmystreet.assets.add(defaults, {
     stylemap: fixmystreet.assets.stylemap_invisible,
-    wfs_url: proxy_base_url + 'nsg/',
-    wfs_feature: "WFS_STREETS_CLASSIFIED_ROADS_INTERESTS",
-    propertyNames: ['TYPE1_2_USRN', 'STREET_MAINTENANCE_RESPONSIBILITY_NAME', 'SHAPE_GEOMETRY'],
+    wfs_feature: "OCCRoads",
+    propertyNames: ['TYPE1_2_USRN', 'STREET_MAINTENANCE_RESPONSIBILITY_NAME', 'msGeometry'],
     srsName: "EPSG:27700",
-    geometryName: null,
     usrn: {
         attribute: 'TYPE1_2_USRN',
         field: 'usrn'
-- 
cgit v1.2.3


From ca0868c438832ea1611c0a00599f9240306ebd8b Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Fri, 7 Aug 2020 11:04:37 +0100
Subject: [fixmystreet.org] Update "pro" layout to latest SocietyWorks content

The Pro manual at `/pro-manual` uses a separate jekyll layout that
mimics the output of the WordPress site at societyworks.org.

Our copy had fallen out of date. This commit:

* Updates the Google Fonts requested (was Rubik, now Lato and Lora).
* Updates the header nav menu content to match the live site.
* Replaces fixmystreet.com/pro URLs with societyworks.org URLs.
* Updates the footer legal text to match the live site.
---
 docs/_layouts/pro.html | 159 +++++++++++++++++++++++++++----------------------
 1 file changed, 89 insertions(+), 70 deletions(-)

diff --git a/docs/_layouts/pro.html b/docs/_layouts/pro.html
index f1e764c8b..e01d61688 100644
--- a/docs/_layouts/pro.html
+++ b/docs/_layouts/pro.html
@@ -2,21 +2,22 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>{{ page.title }} | FixMyStreet Platform | mySociety</title>
+    <meta name="viewport" content="initial-scale=1">
+    <title>{{ page.title }} – SocietyWorks</title>
+    <link rel="dns-prefetch" href="//fonts.googleapis.com" />
+    <link rel="stylesheet" id="google-fonts-css"  href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&family=Lora:wght@700&display=swap" type="text/css" media="all" />
     <link rel="stylesheet" href="{{ "/assets/css/fixmystreet-org.css" | absolute_url }}">
     <link rel="stylesheet" href="{{ "/assets/css/fixmystreet-pro.css" | absolute_url }}">
     <link rel="stylesheet" href="{{ "/assets/css/fixmystreet-pro-print.css" | absolute_url }}" media="print">
-    <link rel="stylesheet" href="https://www.fixmystreet.com/pro/wp-content/themes/fixmystreet-pro/assets/css/main.css" />
+    <link rel="stylesheet" href="https://www.societyworks.org/wp-content/themes/fixmystreet-pro/assets/css/main.css" />
     <link href="{{ "/atom.xml" | absolute_url }}" rel="alternate" title="FixMyStreet Platform" type="application/atom+xml">
-    <meta name="viewport" content="initial-scale=1">
-    <link rel="stylesheet" id="google-fonts-css" href="https://fonts.googleapis.com/css?family=Rubik%3A400%2C500%2C700&amp;ver=4.9.4" type="text/css" media="all">
     <!--[if lt IE 9]>
     <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
     <script type="text/javascript" src="{{ "/assets/vendor/jquery.min.js" | absolute_url }}"></script>
     <script type="text/javascript" src="{{ "/assets/vendor/jquery-migrate.min.js" | absolute_url }}"></script>
-    <script type="text/javascript" src="https://www.fixmystreet.com/pro/wp-content/themes/fixmystreet-pro/assets/javascript/bootstrap.min.js"></script>
-    <script type="text/javascript" src="https://www.fixmystreet.com/pro/wp-content/themes/fixmystreet-pro/assets/javascript/main.js"></script>
+    <script type="text/javascript" src="https://www.societyworks.org/wp-content/themes/fixmystreet-pro/assets/javascript/bootstrap.min.js"></script>
+    <script type="text/javascript" src="https://www.societyworks.org/wp-content/themes/fixmystreet-pro/assets/javascript/main.js"></script>
   </head>
   <body{% if page.bodyclass %} class="{{ page.bodyclass }}"{% endif %}>
 
@@ -36,36 +37,50 @@
 
     <header class="site-header">
       <div class="container">
-          <a href="https://www.fixmystreet.com/pro/" class="site-logo" aria-label="FixMyStreet Pro home">
-              FixMyStreet Pro            </a>
-          <a href="#main-nav" role="button" data-toggle="collapse" aria-expanded="false" aria-controls="main-nav">
-              Menu
-          </a>
-          <nav id="main-nav" class="site-nav collapse">
-            <ul id="menu-main-menu" class="menu js-dropdown-sub-menus">
-              <li id="menu-item-29" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-29"><a href="https://www.fixmystreet.com/pro/take-a-tour/">Take a tour</a></li>
-              <li id="menu-item-537" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-537"><a href="https://www.fixmystreet.com/pro/case-studies/">Case Studies</a>
+        <a href="https://www.societyworks.org/" class="site-logo" aria-label="SocietyWorks home">SocietyWorks</a>
+        <a href="#main-nav" role="button" data-toggle="collapse" aria-expanded="false" aria-controls="main-nav">Menu</a>
+        <nav id="main-nav" class="site-nav collapse">
+          <ul id="menu-main-menu" class="menu js-dropdown-sub-menus">
+            <li id="menu-item-1801" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-1801"><a href="https://www.societyworks.org/services/">Services</a>
+              <ul class="sub-menu">
+                <li id="menu-item-1803" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1803"><a href="https://www.societyworks.org/services/highways/">Streets and highways</a></li>
+                <li id="menu-item-1805" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1805"><a href="https://www.societyworks.org/services/waste/">Bins and waste</a></li>
+                <li id="menu-item-1804" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1804"><a href="https://www.societyworks.org/services/noise/">Noise and social complaints</a></li>
+                <li id="menu-item-1808" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1808"><a href="https://www.societyworks.org/services/green-spaces/">Parks, trees and green spaces</a></li>
+                <li id="menu-item-1802" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1802"><a href="https://www.societyworks.org/services/licensing/">Licence applications</a></li>
+                <li id="menu-item-1817" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1817"><a href="https://www.societyworks.org/features/housing/">Estate maintenance</a></li>
+                <li id="menu-item-1806" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1806"><a href="https://www.societyworks.org/services/foi/">FOI</a></li>
+                <li id="menu-item-1807" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1807"><a href="https://www.societyworks.org/services/discovery/">Service transformation</a></li>
+              </ul>
+            </li>
+            <li id="menu-item-537" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-537"><a href="https://www.societyworks.org/case-studies/">Case Studies</a>
               <ul class="sub-menu">
-                <li id="menu-item-615" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-615"><a href="https://www.fixmystreet.com/pro/take-a-tour/banes/">Bath &amp; North East Somerset Council</a></li>
-                <li id="menu-item-538" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-538"><a href="https://www.fixmystreet.com/pro/take-a-tour/bristol/">Bristol Council</a></li>
-                <li id="menu-item-630" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-630"><a href="https://www.fixmystreet.com/pro/take-a-tour/east-herts/">East Herts District Council</a></li>
-                <li id="menu-item-588" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-588"><a href="https://www.fixmystreet.com/pro/take-a-tour/ground-control/">Ground Control</a></li>
-                <li id="menu-item-539" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-539"><a href="https://www.fixmystreet.com/pro/take-a-tour/oxfordshire/">Oxfordshire County Council</a></li>
+                <li id="menu-item-1065" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1065"><a href="https://www.societyworks.org/case-studies/banes/">Bath &#038; North East Somerset District Council</a></li>
+                <li id="menu-item-538" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-538"><a href="https://www.societyworks.org/case-studies/bristol/">Bristol Council</a></li>
+                <li id="menu-item-1272" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1272"><a href="https://www.societyworks.org/case-studies/bromley-borough-council/">Bromley Borough Council</a></li>
+                <li id="menu-item-588" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-588"><a href="https://www.societyworks.org/case-studies/ground-control/">Ground Control</a></li>
+                <li id="menu-item-1077" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1077"><a href="https://www.societyworks.org/case-studies/lincolnshire-county-council/">Lincolnshire County Council</a></li>
+                <li id="menu-item-539" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-539"><a href="https://www.societyworks.org/case-studies/oxfordshire/">Oxfordshire County Council</a></li>
+                <li id="menu-item-947" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-947"><a href="https://www.societyworks.org/case-studies/rutland-county-council/">Rutland County Council</a></li>
+                <li id="menu-item-1080" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1080"><a href="https://www.societyworks.org/case-studies/buckinghamshire/">Buckinghamshire Council</a></li>
               </ul>
-              </li>
-              <li id="menu-item-30" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-30"><a href="https://www.fixmystreet.com/pro/features/">Features</a>
+            </li>
+            <li id="menu-item-30" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-30"><a href="https://www.societyworks.org/features/">Features</a>
               <ul class="sub-menu">
-                <li id="menu-item-32" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-32"><a href="https://www.fixmystreet.com/pro/features/fully-integrated/">Fully integrated</a></li>
-                <li id="menu-item-34" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-34"><a href="https://www.fixmystreet.com/pro/features/open-standards/">Open standards</a></li>
-                <li id="menu-item-28" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-28"><a href="https://www.fixmystreet.com/pro/training/">Training</a></li>
-                <li id="menu-item-33" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-33"><a href="https://www.fixmystreet.com/pro/features/hosted-secure/">Hosted &amp; Secure</a></li>
-                <li id="menu-item-752" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-752"><a href="https://www.fixmystreet.com/pro/features/gdpr-and-fixmystreet-pro/">GDPR and FixMyStreet Pro</a></li>
-                <li id="menu-item-35" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-35"><a href="https://www.fixmystreet.com/pro/features/accessible/">Accessible</a></li>
-                <li id="menu-item-31" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-31"><a href="https://www.fixmystreet.com/pro/features/privacy/">Privacy</a></li>
+                <li id="menu-item-1813" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1813"><a href="https://www.societyworks.org/features/reporting/">Reporting</a></li>
+                <li id="menu-item-1812" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1812"><a href="https://www.societyworks.org/features/customer-contact/">Customer contact</a></li>
+                <li id="menu-item-1816" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1816"><a href="https://www.societyworks.org/features/inspections/">Inspections</a></li>
+                <li id="menu-item-1815" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1815"><a href="https://www.societyworks.org/features/case-management/">Case management</a></li>
+                <li id="menu-item-32" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-32"><a href="https://www.societyworks.org/features/fully-integrated/">Integrations</a></li>
+                <li id="menu-item-1814" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1814"><a href="https://www.societyworks.org/features/data-assets/">Data and assets</a></li>
+                <li id="menu-item-33" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-33"><a href="https://www.societyworks.org/features/hosted-secure/">Secure hosting</a></li>
+                <li id="menu-item-34" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-34"><a href="https://www.societyworks.org/features/open-standards/">Open standards</a></li>
+                <li id="menu-item-28" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-28"><a href="https://www.societyworks.org/training/">Training and onboarding</a></li>
+                <li id="menu-item-35" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-35"><a href="https://www.societyworks.org/features/accessible/">Accessibilty</a></li>
               </ul>
             </li>
-            <li id="menu-item-36" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-36"><a href="https://www.fixmystreet.com/pro/how-to-buy/">How to buy</a></li>
-            <li id="menu-item-800" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-800"><a href="https://www.fixmystreet.com/pro/blog/">Blog</a></li>
+            <li id="menu-item-36" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-36"><a href="https://www.societyworks.org/how-to-buy/">How to buy</a></li>
+            <li id="menu-item-1800" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1800"><a href="https://www.societyworks.org/blog/">Blog</a></li>
           </ul>
         </nav>
       </div>
@@ -117,48 +132,52 @@
         </div>
       </div>
     </div>
-<div class="site-footer mysoc-footer">
-    <div class="container">
-              <div class="site-footer__primary">
-                      <div class="footer-widget-area">
-                <span class="hidden">Footer Contact Details</span><div class="textwidget custom-html-widget"><ul class="list-inline">
-<li><a href="mailto:enquiries@fixmystreet.com">enquiries@fixmystreet.com</a></li>
-<li><a href="tel:+442032879859">020 3287 9859</a></li>
-</ul></div>            </div>
-                                <nav class="menu-footer-menu-container">
-                                  <ul id="menu-footer-menu" class="footer-nav-menu list-inline">
-                                    <li id="" class="menu-item menu-item-type-post_type menu-item-object-page"><a href="/pro-manual/">User guide</a></li>
-                                    <li id="menu-item-261" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-261"><a href="https://www.fixmystreet.com/pro/contact/">Contact</a></li>
-                                    <li id="menu-item-51" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-51"><a href="https://www.mysociety.org/subscribe/">Newsletter</a></li>
-                                    <li id="menu-item-282" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-282"><a href="https://www.fixmystreet.com/pro/features/privacy/">Privacy</a></li>
-                                    </ul>
-                                  </nav>                  
-                                </div>
-        <hr class="mysoc-footer__divider" role="presentation">
-              <div class="row">
-            <div class="col-sm-4">
-                <a href="https://www.mysociety.org?utm_source=fixmystreet.com%2Fpro&amp;utm_content=footer+logo&amp;utm_medium=link&amp;utm_campaign=mysoc_footer" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a>
-            </div>
-            <div class="col-sm-6">
-                <div class="mysoc-footer__legal">
-                    <p>
-                        <a href="https://www.societyworks.org?utm_source=fixmystreet.com%2Fpro&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">SocietyWorks</a>
-                        is a limited company (05798215). It is a trading subsidiary of
-                        <a href="https://www.mysociety.org?utm_source=fixmystreet.com%2Fpro&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">mySociety</a>,
-                        a registered charity in England and Wales (1076346).
-                    </p>
-                </div>
+
+    <div class="site-footer mysoc-footer">
+      <div class="container">
+        <div class="site-footer__primary">
+          <div class="footer-widget-area">
+            <span class="hidden">Footer Contact Details</span>
+            <div class="textwidget custom-html-widget">
+              <ul class="list-inline">
+                <li><a href="mailto:enquiries@fixmystreet.com">enquiries@fixmystreet.com</a></li>
+                <li><a href="tel:+442032879859">020 3287 9859</a></li>
+              </ul>
             </div>
-            <div class="col-sm-2">
-                <ul class="mysoc-footer__badges">
-                    <li role="presentation"><a href="https://github.com/mysociety/" class="mysoc-footer__badge mysoc-footer__badge--github">Github</a></li>
-                    <li role="presentation"><a href="https://twitter.com/fixmystreet/" class="mysoc-footer__badge mysoc-footer__badge--twitter">Twitter</a></li>
-                    <li role="presentation"><a href="https://www.facebook.com/fixmystreet" class="mysoc-footer__badge mysoc-footer__badge--facebook">Facebook</a></li>
-                </ul>
+          </div>
+          <nav class="menu-footer-menu-container">
+            <ul id="menu-footer-menu" class="footer-nav-menu list-inline">
+              <li id="menu-item-261" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-261"><a href="https://www.societyworks.org/contact/">Contact</a></li>
+              <li id="menu-item-51" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-51"><a href="https://www.mysociety.org/subscribe/">Newsletter</a></li>
+              <li id="menu-item-282" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-282"><a href="https://www.societyworks.org/features/privacy/">Privacy</a></li>
+            </ul>
+          </nav>
+        </div>
+        <hr class="mysoc-footer__divider" role="presentation">
+        <div class="row">
+          <div class="col-sm-4">
+            <a href="https://www.mysociety.org?utm_source=fixmystreet.com/pro&amp;utm_content=footer+logo&amp;utm_medium=link&amp;utm_campaign=mysoc_footer" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a>
+          </div>
+          <div class="col-sm-6">
+            <div class="mysoc-footer__legal">
+              <p>
+                <a href="https://www.societyworks.org?utm_source=fixmystreet.com/pro&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">SocietyWorks Ltd</a>
+                (05798215) is a wholly owned subsidiary of
+                <a href="https://www.mysociety.org?utm_source=fixmystreet.com/pro&amp;utm_content=footer+full+legal+details&amp;utm_medium=link&amp;utm_campaign=mysoc_footer">mySociety</a>,
+                a registered charity in England and Wales (1076346) and limited company (03277032).
+              </p>
             </div>
+          </div>
+          <div class="col-sm-2">
+            <ul class="mysoc-footer__badges">
+              <li role="presentation"><a href="https://github.com/mysociety/" class="mysoc-footer__badge mysoc-footer__badge--github">Github</a></li>
+              <li role="presentation"><a href="https://twitter.com/fixmystreet/" class="mysoc-footer__badge mysoc-footer__badge--twitter">Twitter</a></li>
+              <li role="presentation"><a href="https://www.facebook.com/fixmystreet" class="mysoc-footer__badge mysoc-footer__badge--facebook">Facebook</a></li>
+            </ul>
+          </div>
         </div>
+      </div>
     </div>
-</div>
 
-</body>
+  </body>
 </html>
-- 
cgit v1.2.3


From 2922479643acbe379ef7540dab3358b27baf0832 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 11 Aug 2020 11:13:48 +0100
Subject: [UK] Add recaptcha template.

---
 templates/web/fixmystreet-uk-councils/auth/form_extra.html | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 templates/web/fixmystreet-uk-councils/auth/form_extra.html

diff --git a/templates/web/fixmystreet-uk-councils/auth/form_extra.html b/templates/web/fixmystreet-uk-councils/auth/form_extra.html
new file mode 100644
index 000000000..92cc31050
--- /dev/null
+++ b/templates/web/fixmystreet-uk-councils/auth/form_extra.html
@@ -0,0 +1,4 @@
+[% IF c.cobrand.requires_recaptcha %]
+    <script nonce="[% csp_nonce %]" src="https://www.google.com/recaptcha/api.js" async defer></script>
+    <div class="g-recaptcha" data-sitekey="[% c.config.RECAPTCHA.site_key %]"></div>
+[% END %]
-- 
cgit v1.2.3


From b4d322bf40f88dbab1717e7620178b3641ecd3fa Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 6 Aug 2020 18:05:52 +0100
Subject: Refactor out CSV generation to its own package.

---
 perllib/FixMyStreet/App/Controller/Dashboard.pm | 270 +------------------
 perllib/FixMyStreet/App/Controller/Reports.pm   |  54 ++--
 perllib/FixMyStreet/Cobrand/BathNES.pm          |  49 ++--
 perllib/FixMyStreet/Cobrand/Buckinghamshire.pm  |   7 +-
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm      |   7 +-
 perllib/FixMyStreet/Cobrand/TfL.pm              |  43 ++-
 perllib/FixMyStreet/Cobrand/Zurich.pm           |  14 +-
 perllib/FixMyStreet/Reporting.pm                | 337 ++++++++++++++++++++++++
 8 files changed, 421 insertions(+), 360 deletions(-)
 create mode 100644 perllib/FixMyStreet/Reporting.pm

diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index 6fd4154b9..0d0a704bb 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -6,9 +6,9 @@ use DateTime;
 use Encode;
 use JSON::MaybeXS;
 use Path::Tiny;
-use Text::CSV;
 use Time::Piece;
 use FixMyStreet::DateRange;
+use FixMyStreet::Reporting;
 
 BEGIN { extends 'Catalyst::Controller'; }
 
@@ -135,14 +135,11 @@ sub index : Path : Args(0) {
     $c->stash->{end_date} = $c->get_param('end_date');
     $c->stash->{q_state} = $c->get_param('state') || '';
 
-    $c->forward('construct_rs_filter', [ $c->get_param('updates') ]);
+    my $reporting = $c->forward('construct_rs_filter', [ $c->get_param('updates') ]);
 
     if ( $c->get_param('export') ) {
-        if ($c->get_param('updates')) {
-            $c->forward('export_as_csv_updates');
-        } else {
-            $c->forward('export_as_csv');
-        }
+        $reporting->csv_parameters;
+        $reporting->generate_csv_http($c);
     } else {
         $c->forward('generate_grouped_data');
         $self->generate_summary_figures($c);
@@ -152,37 +149,19 @@ sub index : Path : Args(0) {
 sub construct_rs_filter : Private {
     my ($self, $c, $updates) = @_;
 
-    my $table_name = $updates ? 'problem' : 'me';
-
-    my %where;
-    $where{areas} = [ map { { 'like', "%,$_,%" } } @{$c->stash->{ward}} ]
-        if @{$c->stash->{ward}};
-    $where{"$table_name.category"} = $c->stash->{category}
-        if $c->stash->{category};
-
-    my $state = $c->stash->{q_state};
-    if ( FixMyStreet::DB::Result::Problem->fixed_states->{$state} ) { # Probably fixed - council
-        $where{"$table_name.state"} = [ FixMyStreet::DB::Result::Problem->fixed_states() ];
-    } elsif ( $state ) {
-        $where{"$table_name.state"} = $state;
-    } else {
-        $where{"$table_name.state"} = [ FixMyStreet::DB::Result::Problem->visible_states() ];
-    }
-
-    my $days30 = DateTime->now(time_zone => FixMyStreet->time_zone || FixMyStreet->local_time_zone)->subtract(days => 30);
-    $days30->truncate( to => 'day' );
-
-    my $range = FixMyStreet::DateRange->new(
+    my $reporting = FixMyStreet::Reporting->new(
+        type => $updates ? 'updates' : 'problems',
+        category => $c->stash->{category},
+        state => $c->stash->{q_state},
+        wards => $c->stash->{ward},
+        body => $c->stash->{body} || undef,
         start_date => $c->stash->{start_date},
-        start_default => $days30,
         end_date => $c->stash->{end_date},
-        formatter => $c->model('DB')->storage->datetime_parser,
+        user => $c->user_exists ? $c->user->obj : undef,
     );
-    $where{"$table_name.confirmed"} = $range->sql;
 
-    $c->stash->{params} = \%where;
-    my $rs = $updates ? $c->cobrand->updates : $c->cobrand->problems;
-    $c->stash->{objects_rs} = $rs->to_body($c->stash->{body})->search( \%where );
+    $c->stash($reporting->construct_rs_filter);
+    return $reporting;
 }
 
 sub generate_grouped_data : Private {
@@ -304,229 +283,6 @@ sub generate_body_response_time : Private {
     $c->stash->{body_average} = $avg ? int($avg / 60 / 60 / 24 + 0.5) : 0;
 }
 
-sub csv_filename {
-    my ($self, $c, $updates) = @_;
-    my %where = (
-        category => $c->stash->{category},
-        state => $c->stash->{q_state},
-        ward => join(',', @{$c->stash->{ward}}),
-    );
-    $where{body} = $c->stash->{body}->id if $c->stash->{body};
-    join '-',
-        $c->req->uri->host,
-        $updates ? ('updates') : (),
-        map {
-            my $value = $where{$_};
-            (defined $value and length $value) ? ($_, $value) : ()
-        } sort keys %where
-};
-
-sub export_as_csv_updates : Private {
-    my ($self, $c) = @_;
-
-    my $csv = $c->stash->{csv} = {
-        objects => $c->stash->{objects_rs}->search_rs({}, {
-            order_by => ['me.confirmed', 'me.id'],
-            '+columns' => ['problem.bodies_str'],
-            cursor_page_size => 1000,
-        }),
-        headers => [
-            'Report ID', 'Update ID', 'Date', 'Status', 'Problem state',
-            'Text', 'User Name', 'Reported As',
-        ],
-        columns => [
-            'problem_id', 'id', 'confirmed', 'state', 'problem_state',
-            'text', 'user_name_display', 'reported_as',
-        ],
-        filename => $self->csv_filename($c, 1),
-        user => $c->user_exists ? $c->user->obj : undef,
-    };
-    $c->cobrand->call_hook(dashboard_export_updates_add_columns => $csv);
-    $c->forward('generate_csv');
-}
-
-sub export_as_csv : Private {
-    my ($self, $c) = @_;
-
-    my $groups = $c->cobrand->enable_category_groups ? 1 : 0;
-    my $join = ['comments'];
-    my $columns = ['comments.id', 'comments.problem_state', 'comments.state', 'comments.confirmed', 'comments.mark_fixed'];
-    if ($groups) {
-        push @$join, 'contact';
-        push @$columns, 'contact.id', 'contact.extra';
-    }
-    my $csv = $c->stash->{csv} = {
-        objects => $c->stash->{objects_rs}->search_rs({}, {
-            join => $join,
-            collapse => 1,
-            '+columns' => $columns,
-            order_by => ['me.confirmed', 'me.id'],
-            cursor_page_size => 1000,
-        }),
-        headers => [
-            'Report ID',
-            'Title',
-            'Detail',
-            'User Name',
-            'Category',
-            $groups ? ('Subcategory') : (),
-            'Created',
-            'Confirmed',
-            'Acknowledged',
-            'Fixed',
-            'Closed',
-            'Status',
-            'Latitude', 'Longitude',
-            'Query',
-            'Ward',
-            'Easting',
-            'Northing',
-            'Report URL',
-            'Site Used',
-            'Reported As',
-        ],
-        columns => [
-            'id',
-            'title',
-            'detail',
-            'user_name_display',
-            'category',
-            $groups ? ('subcategory') : (),
-            'created',
-            'confirmed',
-            'acknowledged',
-            'fixed',
-            'closed',
-            'state',
-            'latitude', 'longitude',
-            'postcode',
-            'wards',
-            'local_coords_x',
-            'local_coords_y',
-            'url',
-            'site_used',
-            'reported_as',
-        ],
-        filename => $self->csv_filename($c, 0),
-        user => $c->user_exists ? $c->user->obj : undef,
-        category => $c->stash->{category},
-        contacts => $c->stash->{contacts},
-    };
-    $c->cobrand->call_hook(dashboard_export_problems_add_columns => $csv);
-    $c->forward('generate_csv');
-}
-
-=head2 generate_csv
-
-Generates a CSV output, given a 'csv' stash hashref containing:
-* filename: filename to be used in output
-* problems: a resultset of the rows to output
-* headers: an arrayref of the header row strings
-* columns: an arrayref of the columns (looked up in the row's as_hashref, plus
-the following: user_name_display, acknowledged, fixed, closed, wards,
-local_coords_x, local_coords_y, url).
-* extra_data: If present, a function that is passed the report and returns a
-hashref of extra data to include that can be used by 'columns'.
-
-=cut
-
-sub generate_csv : Private {
-    my ($self, $c) = @_;
-
-    my $filename = $c->stash->{csv}->{filename};
-    $c->res->content_type('text/csv; charset=utf-8');
-    $c->res->header('content-disposition' => "attachment; filename=\"${filename}.csv\"");
-
-    # Emit a header (copying Drupal's naming) telling an intermediary (e.g.
-    # Varnish) not to buffer the output. Varnish will need to know this, e.g.:
-    #   if (beresp.http.Surrogate-Control ~ "BigPipe/1.0") {
-    #     set beresp.do_stream = true;
-    #     set beresp.ttl = 0s;
-    #   }
-    $c->res->header('Surrogate-Control' => 'content="BigPipe/1.0"');
-
-    # Tell nginx not to buffer this response
-    $c->res->header('X-Accel-Buffering' => 'no');
-
-    # Define an empty body so the web view doesn't get added at the end
-    $c->res->body("");
-
-    # Old parameter renaming
-    $c->stash->{csv}->{objects} //= $c->stash->{csv}->{problems};
-
-    my $csv = Text::CSV->new({ binary => 1, eol => "\n" });
-    $csv->print($c->response, $c->stash->{csv}->{headers});
-
-    my $fixed_states = FixMyStreet::DB::Result::Problem->fixed_states;
-    my $closed_states = FixMyStreet::DB::Result::Problem->closed_states;
-
-    my %asked_for = map { $_ => 1 } @{$c->stash->{csv}->{columns}};
-
-    my $objects = $c->stash->{csv}->{objects};
-    while ( my $obj = $objects->next ) {
-        my $hashref = $obj->as_hashref(\%asked_for);
-
-        $hashref->{user_name_display} = $obj->anonymous
-            ? '(anonymous)' : $obj->name;
-
-        if ($asked_for{acknowledged}) {
-            for my $comment ($obj->comments) {
-                my $problem_state = $comment->problem_state or next;
-                next unless $comment->state eq 'confirmed';
-                next if $problem_state eq 'confirmed';
-                $hashref->{acknowledged} //= $comment->confirmed;
-                $hashref->{fixed} //= $fixed_states->{ $problem_state } || $comment->mark_fixed ?
-                    $comment->confirmed : undef;
-                if ($closed_states->{ $problem_state }) {
-                    $hashref->{closed} = $comment->confirmed;
-                    last;
-                }
-            }
-        }
-
-        if ($asked_for{wards}) {
-            $hashref->{wards} = join ', ',
-              map { $c->stash->{children}->{$_}->{name} }
-              grep {$c->stash->{children}->{$_} }
-              split ',', $hashref->{areas};
-        }
-
-        if ($obj->can('local_coords') && $asked_for{local_coords_x}) {
-            ($hashref->{local_coords_x}, $hashref->{local_coords_y}) =
-                $obj->local_coords;
-        }
-
-        if ($asked_for{subcategory}) {
-            my $group = $obj->contact ? $obj->contact->groups : [];
-            $group = join(',', @$group);
-            if ($group) {
-                $hashref->{subcategory} = $obj->category;
-                $hashref->{category} = $group;
-            }
-        }
-
-        if ($obj->can('url')) {
-            my $base = $c->cobrand->base_url_for_report($obj->can('problem') ? $obj->problem : $obj);
-            $hashref->{url} = join '', $base, $obj->url;
-        }
-
-        $hashref->{site_used} = $obj->can('service') ? ($obj->service || $obj->cobrand) : $obj->cobrand;
-
-        $hashref->{reported_as} = $obj->get_extra_metadata('contributed_as') || '';
-
-        if (my $fn = $c->stash->{csv}->{extra_data}) {
-            my $extra = $fn->($obj);
-            $hashref = { %$hashref, %$extra };
-        }
-
-        $csv->print($c->response, [
-            @{$hashref}{
-                @{$c->stash->{csv}->{columns}}
-            },
-        ] );
-    }
-}
-
 sub heatmap : Local : Args(0) {
     my ($self, $c) = @_;
 
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index d0f2a9394..e65810b91 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -481,10 +481,10 @@ sub summary : Private {
     $c->forward('/admin/fetch_contacts');
     $c->stash->{contacts} = [ $c->stash->{contacts}->all ];
 
-    $c->forward('/dashboard/construct_rs_filter', []);
+    my $reporting = $c->forward('/dashboard/construct_rs_filter', []);
 
     if ( $c->get_param('csv') ) {
-        $c->detach('export_summary_csv');
+        $c->detach('export_summary_csv', [ $reporting ]);
     }
 
     $c->forward('/dashboard/generate_grouped_data');
@@ -494,38 +494,26 @@ sub summary : Private {
 }
 
 sub export_summary_csv : Private {
-    my ( $self, $c ) = @_;
+    my ( $self, $c, $reporting ) = @_;
 
-    $c->stash->{csv} = {
-        objects => $c->stash->{objects_rs}->search_rs({}, {
-            rows => 100,
-            order_by => { '-desc' => 'me.confirmed' },
-        }),
-        headers => [
-            'Report ID',
-            'Title',
-            'Category',
-            'Created',
-            'Confirmed',
-            'Status',
-            'Latitude', 'Longitude',
-            'Query',
-            'Report URL',
-        ],
-        columns => [
-            'id',
-            'title',
-            'category',
-            'created',
-            'confirmed',
-            'state',
-            'latitude', 'longitude',
-            'postcode',
-            'url',
-        ],
-        filename => 'fixmystreet-data',
-    };
-    $c->forward('/dashboard/generate_csv');
+    $reporting->objects_attrs({
+        rows => 100,
+        order_by => { '-desc' => 'me.confirmed' },
+    });
+    $reporting->add_csv_columns(
+        id => 'Report ID',
+        title => 'Title',
+        category => 'Category',
+        created => 'Created',
+        confirmed => 'Confirmed',
+        state => 'Status',
+        latitude => 'Latitude',
+        longitude => 'Longitude',
+        postcode => 'Query',
+        url => 'Report URL',
+    );
+    $reporting->filename('fixmystreet-data');
+    $reporting->generate_csv_http($c);
 }
 
 =head2 check_canonical_url
diff --git a/perllib/FixMyStreet/Cobrand/BathNES.pm b/perllib/FixMyStreet/Cobrand/BathNES.pm
index 2dc1a4297..e8e2c5427 100644
--- a/perllib/FixMyStreet/Cobrand/BathNES.pm
+++ b/perllib/FixMyStreet/Cobrand/BathNES.pm
@@ -175,20 +175,20 @@ sub _dashboard_user_lookup {
 sub dashboard_export_updates_add_columns {
     my ($self, $csv) = @_;
 
-    return unless $csv->{user}->has_body_permission_to('export_extra_columns');
+    return unless $csv->user->has_body_permission_to('export_extra_columns');
 
-    push @{$csv->{headers}}, "Staff User";
-    push @{$csv->{headers}}, "User Email";
-    push @{$csv->{columns}}, "staff_user";
-    push @{$csv->{columns}}, "user_email";
+    $csv->add_csv_columns(
+        staff_user => 'Staff User',
+        user_email => 'User Email',
+    );
 
-    $csv->{objects} = $csv->{objects}->search(undef, {
+    $csv->objects_attrs({
         '+columns' => ['user.email'],
         join => 'user',
     });
     my $user_lookup = $self->_dashboard_user_lookup;
 
-    $csv->{extra_data} = sub {
+    $csv->csv_extra_data(sub {
         my $report = shift;
 
         my $staff_user = '';
@@ -200,37 +200,28 @@ sub dashboard_export_updates_add_columns {
             user_email => $report->user->email || '',
             staff_user => $staff_user,
         };
-    };
+    });
 }
 
 sub dashboard_export_problems_add_columns {
     my ($self, $csv) = @_;
 
-    return unless $csv->{user}->has_body_permission_to('export_extra_columns');
-
-    $csv->{headers} = [
-        @{ $csv->{headers} },
-        "User Email",
-        "User Phone",
-        "Staff User",
-        "Attribute Data",
-    ];
-
-    $csv->{columns} = [
-        @{ $csv->{columns} },
-        "user_email",
-        "user_phone",
-        "staff_user",
-        "attribute_data",
-    ];
-
-    $csv->{objects} = $csv->{objects}->search(undef, {
+    return unless $csv->user->has_body_permission_to('export_extra_columns');
+
+    $csv->add_csv_columns(
+        user_email => 'User Email',
+        user_phone => 'User Phone',
+        staff_user => 'Staff User',
+        attribute_data => "Attribute Data",
+    );
+
+    $csv->objects_attrs({
         '+columns' => ['user.email', 'user.phone'],
         join => 'user',
     });
     my $user_lookup = $self->_dashboard_user_lookup;
 
-    $csv->{extra_data} = sub {
+    $csv->csv_extra_data(sub {
         my $report = shift;
 
         my $staff_user = '';
@@ -244,7 +235,7 @@ sub dashboard_export_problems_add_columns {
             staff_user => $staff_user,
             attribute_data => $attribute_data,
         };
-    };
+    });
 }
 
 1;
diff --git a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
index 75356dc87..f901c4e2f 100644
--- a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
@@ -126,8 +126,7 @@ sub default_map_zoom { 3 }
 sub _dashboard_export_add_columns {
     my ($self, $csv) = @_;
 
-    push @{$csv->{headers}}, "Staff User";
-    push @{$csv->{columns}}, "staff_user";
+    $csv->add_csv_columns( staff_user => 'Staff User' );
 
     # All staff users, for contributed_by lookup
     my @user_ids = FixMyStreet::DB->resultset('User')->search(
@@ -135,7 +134,7 @@ sub _dashboard_export_add_columns {
         { columns => [ 'id', 'email', ] })->all;
     my %user_lookup = map { $_->id => $_->email } @user_ids;
 
-    $csv->{extra_data} = sub {
+    $csv->csv_extra_data(sub {
         my $report = shift;
         my $staff_user = '';
         if (my $contributed_by = $report->get_extra_metadata('contributed_by')) {
@@ -144,7 +143,7 @@ sub _dashboard_export_add_columns {
         return {
             staff_user => $staff_user,
         };
-    };
+    });
 }
 
 sub dashboard_export_updates_add_columns {
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 6021827cb..1575d7cc1 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -227,10 +227,9 @@ sub available_permissions {
 sub dashboard_export_problems_add_columns {
     my ($self, $csv) = @_;
 
-    push @{$csv->{headers}}, "HIAMS/Exor Ref";
-    push @{$csv->{columns}}, "external_ref";
+    $csv->add_csv_columns( external_ref => 'HIAMS/Exor Ref' );
 
-    $csv->{extra_data} = sub {
+    $csv->csv_extra_data(sub {
         my $report = shift;
         # Try and get a HIAMS reference first of all
         my $ref = $report->get_extra_metadata('customer_reference');
@@ -243,7 +242,7 @@ sub dashboard_export_problems_add_columns {
         return {
             external_ref => ( $ref || '' ),
         };
-    };
+    });
 }
 
 1;
diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm
index e085b8bd6..31c7e4fe8 100644
--- a/perllib/FixMyStreet/Cobrand/TfL.pm
+++ b/perllib/FixMyStreet/Cobrand/TfL.pm
@@ -244,38 +244,29 @@ sub available_permissions {
 sub dashboard_export_problems_add_columns {
     my ($self, $csv) = @_;
 
-    $csv->{headers} = [
-        map { $_ eq 'Ward' ? 'Borough' : $_ } @{ $csv->{headers} },
-        "Agent responsible",
-        "Safety critical",
-        "Delivered to",
-        "Closure email at",
-        "Reassigned at",
-        "Reassigned by",
-    ];
-
-    $csv->{columns} = [
-        @{ $csv->{columns} },
-        "agent_responsible",
-        "safety_critical",
-        "delivered_to",
-        "closure_email_at",
-        "reassigned_at",
-        "reassigned_by",
-    ];
-
-    if ($csv->{category}) {
-        my ($contact) = grep { $_->category eq $csv->{category} } @{$csv->{contacts}};
+    $csv->modify_csv_header( Ward => 'Borough' );
+
+    $csv->add_csv_columns(
+        agent_responsible => "Agent responsible",
+        safety_critical => "Safety critical",
+        delivered_to => "Delivered to",
+        closure_email_at => "Closure email at",
+        reassigned_at => "Reassigned at",
+        reassigned_by => "Reassigned by",
+    );
+
+    if ($csv->category) {
+        my @contacts = $csv->body->contacts->search(undef, { order_by => [ 'category' ] } )->all;
+        my ($contact) = grep { $_->category eq $csv->category } @contacts;
         if ($contact) {
             foreach (@{$contact->get_metadata_for_storage}) {
                 next if $_->{code} eq 'safety_critical';
-                push @{$csv->{columns}}, "extra.$_->{code}";
-                push @{$csv->{headers}}, $_->{description};
+                $csv->add_csv_columns( "extra.$_->{code}" => $_->{description} );
             }
         }
     }
 
-    $csv->{extra_data} = sub {
+    $csv->csv_extra_data(sub {
         my $report = shift;
 
         my $agent = $report->shortlisted_user;
@@ -316,7 +307,7 @@ sub dashboard_export_problems_add_columns {
             $fields->{"extra.$_->{name}"} = $_->{value};
         }
         return $fields;
-    };
+    });
 }
 
 sub must_have_2fa {
diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index e33edc792..5635939ac 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -1275,8 +1275,8 @@ sub admin_stats {
 sub export_as_csv {
     my ($self, $c, $params) = @_;
 
-    my $csv = $c->stash->{csv} = {
-        objects => $c->model('DB::Problem')->search_rs(
+    my $reporting = FixMyStreet::Reporting->new(
+        objects_rs => $c->model('DB::Problem')->search_rs(
             $params,
             {
                 join => ['admin_log_entries', 'user'],
@@ -1297,7 +1297,7 @@ sub export_as_csv {
                 ]
             }
         ),
-        headers => [
+        csv_headers => [
             'Report ID', 'Created', 'Sent to Agency', 'Last Updated',
             'E', 'N', 'Category', 'Status', 'Closure Status',
             'UserID', 'User email', 'User phone', 'User name',
@@ -1305,7 +1305,7 @@ sub export_as_csv {
             'Media URL', 'Interface Used', 'Council Response',
             'Strasse', 'Mast-Nr.', 'Haus-Nr.', 'Hydranten-Nr.',
         ],
-        columns => [
+        csv_columns => [
             'id', 'created', 'whensent',' lastupdate', 'local_coords_x',
             'local_coords_y', 'category', 'state', 'closure_status',
             'user_id', 'user_email', 'user_phone', 'user_name',
@@ -1313,7 +1313,7 @@ sub export_as_csv {
             'media_url', 'service', 'public_response',
             'strasse', 'mast_nr',' haus_nr', 'hydranten_nr',
         ],
-        extra_data => sub {
+        csv_extra_data => sub {
             my $report = shift;
 
             my $body_name = "";
@@ -1360,8 +1360,8 @@ sub export_as_csv {
             };
         },
         filename => 'stats',
-    };
-    $c->forward('/dashboard/generate_csv');
+    );
+    $reporting->generate_csv_http($c);
 }
 
 sub problem_confirm_email_extras {
diff --git a/perllib/FixMyStreet/Reporting.pm b/perllib/FixMyStreet/Reporting.pm
new file mode 100644
index 000000000..7ee9fc41a
--- /dev/null
+++ b/perllib/FixMyStreet/Reporting.pm
@@ -0,0 +1,337 @@
+package FixMyStreet::Reporting;
+
+use DateTime;
+use Moo;
+use Text::CSV;
+use Types::Standard qw(ArrayRef CodeRef Enum HashRef InstanceOf Int Maybe Str);
+use FixMyStreet::DB;
+
+# What are we reporting on
+
+has type => ( is => 'ro', isa => Enum['problems','updates'] );
+has on_problems => ( is => 'lazy', default => sub { $_[0]->type eq 'problems' } );
+has on_updates => ( is => 'lazy', default => sub { $_[0]->type eq 'updates' } );
+
+# Filters to restrict the reporting to
+
+has body => ( is => 'ro', isa => Maybe[InstanceOf['FixMyStreet::DB::Result::Body']] );
+has wards => ( is => 'ro', isa => ArrayRef[Int], default => sub { [] } );
+has category => ( is => 'ro', isa => Maybe[Str] );
+has state => ( is => 'ro', isa => Maybe[Str] );
+has start_date => ( is => 'ro',
+    isa => Str,
+    default => sub {
+        my $days30 = DateTime->now(time_zone => FixMyStreet->time_zone || FixMyStreet->local_time_zone)->subtract(days => 30);
+        $days30->truncate( to => 'day' );
+        $days30->strftime('%Y-%m-%d');
+    }
+);
+has end_date => ( is => 'ro', isa => Maybe[Str] );
+
+# Things needed for cobrand specific extra data or checks
+
+has cobrand => ( is => 'ro', default => sub { FixMyStreet::DB->schema->cobrand } ); # Which cobrand is asking, to get the right data / hooks / base URL
+has user => ( is => 'ro', isa => Maybe[InstanceOf['FixMyStreet::DB::Result::User']] );
+
+# Things created in the process, that can be manually overridden
+
+has objects_rs => ( is => 'rwp' ); # ResultSet of rows
+
+sub objects_attrs {
+    my ($self, $attrs) = @_;
+    my $rs = $self->objects_rs->search(undef, $attrs);
+    $self->_set_objects_rs($rs);
+    return $rs;
+}
+
+# CSV header strings and column keys (looked up in the row's as_hashref, plus
+# the following: user_name_display, acknowledged, fixed, closed, wards,
+# local_coords_x, local_coords_y, url, subcategory, site_used, reported_as)
+has csv_headers => ( is => 'rwp', isa => ArrayRef[Str], default => sub { [] } );
+has csv_columns => ( is => 'rwp', isa => ArrayRef[Str], default => sub { [] } );
+
+sub modify_csv_header {
+    my ($self, %mapping) = @_;
+    $self->_set_csv_headers([
+        map { $mapping{$_} || $_ } @{ $self->csv_headers },
+    ]);
+}
+
+sub add_csv_columns {
+    my $self = shift;
+    for (my $i = 0; $i < @_; $i += 2) {
+        my $column = $_[$i];
+        my $header = $_[$i+1];
+        push @{$self->csv_columns}, $column;
+        push @{$self->csv_headers}, $header;
+    }
+}
+
+# A function that is passed the report and returns a hashref of extra data to
+# include that can be used by 'columns'
+has csv_extra_data => ( is => 'rw', isa => CodeRef );
+
+has filename => ( is => 'rw', isa => Str, lazy => 1, default => sub {
+    my $self = shift;
+    my %where = (
+        category => $self->category,
+        state => $self->state,
+        ward => join(',', @{$self->wards}),
+        start_date => $self->start_date,
+        end_date => $self->end_date,
+    );
+    $where{body} = $self->body->id if $self->body;
+    my $host = URI->new($self->cobrand->base_url)->host;
+    join '-',
+        $host,
+        $self->on_updates ? ('updates') : (),
+        map {
+            my $value = $where{$_};
+            (defined $value and length $value) ? ($_, $value) : ()
+        } sort keys %where
+});
+
+# Generation code
+
+sub construct_rs_filter {
+    my $self = shift;
+
+    my $table_name = $self->on_updates ? 'problem' : 'me';
+
+    my %where;
+    $where{areas} = [ map { { 'like', "%,$_,%" } } @{$self->wards} ]
+        if @{$self->wards};
+    $where{"$table_name.category"} = $self->category
+        if $self->category;
+
+    if ( $self->state && FixMyStreet::DB::Result::Problem->fixed_states->{$self->state} ) { # Probably fixed - council
+        $where{"$table_name.state"} = [ FixMyStreet::DB::Result::Problem->fixed_states() ];
+    } elsif ( $self->state ) {
+        $where{"$table_name.state"} = $self->state;
+    } else {
+        $where{"$table_name.state"} = [ FixMyStreet::DB::Result::Problem->visible_states() ];
+    }
+
+    my $range = FixMyStreet::DateRange->new(
+        start_date => $self->start_date,
+        end_date => $self->end_date,
+        formatter => FixMyStreet::DB->schema->storage->datetime_parser,
+    );
+    $where{"$table_name.confirmed"} = $range->sql;
+
+    my $rs = $self->on_updates ? $self->cobrand->updates : $self->cobrand->problems;
+    my $objects_rs = $rs->to_body($self->body)->search( \%where );
+    $self->_set_objects_rs($objects_rs);
+    return {
+        params => \%where,
+        objects_rs => $objects_rs,
+    }
+}
+
+sub csv_parameters {
+    my $self = shift;
+    if ($self->on_updates) {
+        $self->_csv_parameters_updates;
+    } else {
+        $self->_csv_parameters_problems;
+    }
+}
+
+sub _csv_parameters_updates {
+    my $self = shift;
+
+    $self->objects_attrs({
+        join => 'problem',
+        order_by => ['me.confirmed', 'me.id'],
+        '+columns' => ['problem.bodies_str'],
+        cursor_page_size => 1000,
+    });
+    $self->_set_csv_headers([
+        'Report ID', 'Update ID', 'Date', 'Status', 'Problem state',
+        'Text', 'User Name', 'Reported As',
+    ]);
+    $self->_set_csv_columns([
+        'problem_id', 'id', 'confirmed', 'state', 'problem_state',
+        'text', 'user_name_display', 'reported_as',
+    ]);
+    $self->cobrand->call_hook(dashboard_export_updates_add_columns => $self);
+}
+
+sub _csv_parameters_problems {
+    my $self = shift;
+
+    my $groups = $self->cobrand->enable_category_groups ? 1 : 0;
+    my $join = ['comments'];
+    my $columns = ['comments.id', 'comments.problem_state', 'comments.state', 'comments.confirmed', 'comments.mark_fixed'];
+    if ($groups) {
+        push @$join, 'contact';
+        push @$columns, 'contact.id', 'contact.extra';
+    }
+    $self->objects_attrs({
+        join => $join,
+        collapse => 1,
+        '+columns' => $columns,
+        order_by => ['me.confirmed', 'me.id'],
+        cursor_page_size => 1000,
+    });
+    $self->_set_csv_headers([
+        'Report ID',
+        'Title',
+        'Detail',
+        'User Name',
+        'Category',
+        $groups ? ('Subcategory') : (),
+        'Created',
+        'Confirmed',
+        'Acknowledged',
+        'Fixed',
+        'Closed',
+        'Status',
+        'Latitude', 'Longitude',
+        'Query',
+        'Ward',
+        'Easting',
+        'Northing',
+        'Report URL',
+        'Site Used',
+        'Reported As',
+    ]);
+    $self->_set_csv_columns([
+        'id',
+        'title',
+        'detail',
+        'user_name_display',
+        'category',
+        $groups ? ('subcategory') : (),
+        'created',
+        'confirmed',
+        'acknowledged',
+        'fixed',
+        'closed',
+        'state',
+        'latitude', 'longitude',
+        'postcode',
+        'wards',
+        'local_coords_x',
+        'local_coords_y',
+        'url',
+        'site_used',
+        'reported_as',
+    ]);
+    $self->cobrand->call_hook(dashboard_export_problems_add_columns => $self);
+}
+
+=head2 generate_csv
+
+Generates a CSV output to a file handler provided
+
+=cut
+
+sub generate_csv {
+    my ($self, $handle) = @_;
+
+    my $csv = Text::CSV->new({ binary => 1, eol => "\n" });
+    $csv->print($handle, $self->csv_headers);
+
+    my $fixed_states = FixMyStreet::DB::Result::Problem->fixed_states;
+    my $closed_states = FixMyStreet::DB::Result::Problem->closed_states;
+
+    my %asked_for = map { $_ => 1 } @{$self->csv_columns};
+
+    my $children = $self->body ? $self->body->first_area_children : {};
+
+    my $objects = $self->objects_rs;
+    while ( my $obj = $objects->next ) {
+        my $hashref = $obj->as_hashref(\%asked_for);
+
+        $hashref->{user_name_display} = $obj->anonymous
+            ? '(anonymous)' : $obj->name;
+
+        if ($asked_for{acknowledged}) {
+            for my $comment ($obj->comments) {
+                my $problem_state = $comment->problem_state or next;
+                next unless $comment->state eq 'confirmed';
+                next if $problem_state eq 'confirmed';
+                $hashref->{acknowledged} //= $comment->confirmed;
+                $hashref->{fixed} //= $fixed_states->{ $problem_state } || $comment->mark_fixed ?
+                    $comment->confirmed : undef;
+                if ($closed_states->{ $problem_state }) {
+                    $hashref->{closed} = $comment->confirmed;
+                    last;
+                }
+            }
+        }
+
+        if ($asked_for{wards}) {
+            $hashref->{wards} = join ', ',
+              map { $children->{$_}->{name} }
+              grep { $children->{$_} }
+              split ',', $hashref->{areas};
+        }
+
+        if ($obj->can('local_coords') && $asked_for{local_coords_x}) {
+            ($hashref->{local_coords_x}, $hashref->{local_coords_y}) =
+                $obj->local_coords;
+        }
+
+        if ($asked_for{subcategory}) {
+            my $group = $obj->contact ? $obj->contact->groups : [];
+            $group = join(',', @$group);
+            if ($group) {
+                $hashref->{subcategory} = $obj->category;
+                $hashref->{category} = $group;
+            }
+        }
+
+        my $base = $self->cobrand->base_url_for_report($obj->can('problem') ? $obj->problem : $obj);
+        $hashref->{url} = join '', $base, $obj->url;
+
+        $hashref->{site_used} = $obj->can('service') ? ($obj->service || $obj->cobrand) : $obj->cobrand;
+
+        $hashref->{reported_as} = $obj->get_extra_metadata('contributed_as') || '';
+
+        if (my $fn = $self->csv_extra_data) {
+            my $extra = $fn->($obj);
+            $hashref = { %$hashref, %$extra };
+        }
+
+        $csv->print($handle, [
+            @{$hashref}{
+                @{$self->csv_columns}
+            },
+        ] );
+    }
+}
+
+# Output code
+
+# Outputs relevant CSV HTTP headers, and then streams the CSV
+sub generate_csv_http {
+    my ($self, $c) = @_;
+    $self->http_setup($c);
+    $self->generate_csv($c->response);
+}
+
+sub http_setup {
+    my ($self, $c) = @_;
+    my $filename = $self->filename;
+
+    $c->res->content_type('text/csv; charset=utf-8');
+    $c->res->header('content-disposition' => "attachment; filename=\"${filename}.csv\"");
+
+    # Emit a header (copying Drupal's naming) telling an intermediary (e.g.
+    # Varnish) not to buffer the output. Varnish will need to know this, e.g.:
+    #   if (beresp.http.Surrogate-Control ~ "BigPipe/1.0") {
+    #     set beresp.do_stream = true;
+    #     set beresp.ttl = 0s;
+    #   }
+    $c->res->header('Surrogate-Control' => 'content="BigPipe/1.0"');
+
+    # Tell nginx not to buffer this response
+    $c->res->header('X-Accel-Buffering' => 'no');
+
+    # Define an empty body so the web view doesn't get added at the end
+    $c->res->body("");
+}
+
+1;
-- 
cgit v1.2.3


From e461de75b26e74c0d8c154a1a17d6019c2be30dd Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 7 Aug 2020 20:02:17 +0100
Subject: Offline process for CSV generation.

Include a status page, the option for access token requests to use this
system, and a script for manual generation.
---
 CHANGELOG.md                                       |  1 +
 bin/csv-export                                     | 77 ++++++++++++++++++++++
 .../Authentication/Credential/AccessToken.pm       | 12 +++-
 perllib/FixMyStreet/App/Controller/Dashboard.pm    | 75 ++++++++++++++++++++-
 perllib/FixMyStreet/Reporting.pm                   | 41 ++++++++++++
 t/app/controller/dashboard.t                       | 37 +++++++++++
 templates/web/base/dashboard/index.html            |  4 +-
 templates/web/base/dashboard/status.html           | 68 +++++++++++++++++++
 8 files changed, 308 insertions(+), 7 deletions(-)
 create mode 100755 bin/csv-export
 create mode 100644 templates/web/base/dashboard/status.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de9b71d38..6a27ea704 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
         - Better sort admin user table.
         - Centralise update creation to include fields.
         - Add full text index to speed up admin search.
+        - Offline process for CSV generation.
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
diff --git a/bin/csv-export b/bin/csv-export
new file mode 100755
index 000000000..29ca3388f
--- /dev/null
+++ b/bin/csv-export
@@ -0,0 +1,77 @@
+#!/usr/bin/env perl
+
+# csv-export
+# Offline creation of CSV export, first take
+
+use v5.14;
+use warnings;
+
+BEGIN {
+    use File::Basename qw(dirname);
+    use File::Spec;
+    my $d = dirname(File::Spec->rel2abs($0));
+    require "$d/../setenv.pl";
+}
+
+use open ':std', ':encoding(UTF-8)';
+use Getopt::Long::Descriptive;
+use Path::Tiny;
+use CronFns;
+use FixMyStreet::Cobrand;
+use FixMyStreet::DB;
+use FixMyStreet::Reporting;
+
+my $site = CronFns::site(FixMyStreet->config('BASE_URL'));
+CronFns::language($site);
+
+my ($opts, $usage) = describe_options(
+    '%c %o',
+    ['cobrand=s', 'which cobrand is asking for the data', { required => 1 }],
+    ['type=s', 'whether to export problems or updates', { required => 1 }],
+    ['out=s', 'where to output CSV data'],
+
+    ['body=i', 'Body ID to restrict export to'],
+    ['wards=s', 'Ward area IDs to restrict export to'],
+    ['category=s', 'Category to restrict export to'],
+    ['state=s', 'State to restrict export to'],
+    ['start_date=s', 'Start date for export (default 30 days ago)'],
+    ['end_date=s', 'End date for export'],
+
+    ['user=i', 'user ID which requested this export'],
+    ['verbose|v', 'more verbose output'],
+    ['help|h', "print usage message and exit" ],
+);
+$usage->die if $opts->help;
+
+my $use_stdout = !$opts->out || $opts->out eq '-';
+my ($file, $fh);
+if ($use_stdout) {
+    $fh = *STDOUT;
+} else {
+    $file = path($opts->out . '-part');
+    $fh = $file->openw_utf8;
+}
+
+my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($opts->cobrand);
+FixMyStreet::DB->schema->cobrand($cobrand);
+
+my $user = FixMyStreet::DB->resultset("User")->find($opts->user) if $opts->user;
+my $body = FixMyStreet::DB->resultset("Body")->find($opts->body) if $opts->body;
+my $wards = $opts->wards ? [split',', $opts->wards] : [];
+
+my $reporting = FixMyStreet::Reporting->new(
+    type => $opts->type,
+    user => $user,
+    category => $opts->category,
+    state => $opts->state,
+    wards => $wards,
+    body => $body,
+    $opts->start_date ? (start_date => $opts->start_date) : (),
+    end_date => $opts->end_date,
+);
+$reporting->construct_rs_filter;
+$reporting->csv_parameters;
+$reporting->generate_csv($fh);
+unless ($use_stdout) {
+    $file->move($opts->out);
+}
diff --git a/perllib/Catalyst/Authentication/Credential/AccessToken.pm b/perllib/Catalyst/Authentication/Credential/AccessToken.pm
index 24398823d..39364ad99 100644
--- a/perllib/Catalyst/Authentication/Credential/AccessToken.pm
+++ b/perllib/Catalyst/Authentication/Credential/AccessToken.pm
@@ -15,12 +15,18 @@ sub new {
     return $self;
 }
 
-sub authenticate {
-    my ( $self, $c, $realm, $authinfo_ignored ) = @_;
-
+sub get_token {
+    my ($self, $c) = @_;
     my $auth_header = $c->req->header('Authorization') || '';
     my ($token) = $auth_header =~ /^Bearer (.*)/i;
     $token ||= $c->get_param('access_token');
+    return $token;
+}
+
+sub authenticate {
+    my ( $self, $c, $realm, $authinfo_ignored ) = @_;
+
+    my $token = $self->get_token($c);
     return unless $token;
 
     my $id;
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index 0d0a704bb..5400a6209 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -137,9 +137,24 @@ sub index : Path : Args(0) {
 
     my $reporting = $c->forward('construct_rs_filter', [ $c->get_param('updates') ]);
 
-    if ( $c->get_param('export') ) {
+    if ( my $export = $c->get_param('export') ) {
         $reporting->csv_parameters;
-        $reporting->generate_csv_http($c);
+        if ($export == 1) {
+            # Existing method, generate and serve
+            $reporting->generate_csv_http($c);
+        } elsif ($export == 2) {
+            # New offline method
+            $reporting->kick_off_process;
+            my ($redirect, $code) = ('/dashboard/status', 303);
+            if (Catalyst::Authentication::Credential::AccessToken->get_token($c)) {
+                # Client knows to re-request until ready
+                $redirect = '/dashboard/csv/' . $reporting->filename . '.csv';
+                $c->res->body('');
+                $code = 202;
+            }
+            $c->res->redirect($redirect, $code);
+            $c->detach;
+        }
     } else {
         $c->forward('generate_grouped_data');
         $self->generate_summary_figures($c);
@@ -276,6 +291,62 @@ sub generate_summary_figures {
     }
 }
 
+sub status : Local : Args(0) {
+    my ($self, $c) = @_;
+
+    my $body = $c->stash->{body} = $c->forward('check_page_allowed');
+    $c->stash->{body_name} = $body->name if $body;
+
+    my $reporting = FixMyStreet::Reporting->new(
+        user => $c->user_exists ? $c->user->obj : undef,
+    );
+    my $dir = $reporting->cache_dir;
+    my @data;
+    foreach ($dir->children) {
+        my $stat = $_->stat;
+        my $name = $_->basename;
+        my $finished = $name =~ /part$/ ? 0 : 1;
+        $name =~ s/-part$//;
+        push @data, {
+            ctime => $stat->ctime,
+            size => $stat->size,
+            name => $name,
+            finished => $finished,
+        };
+    }
+    @data = sort { $b->{ctime} <=> $a->{ctime} } @data;
+    $c->stash->{rows} = \@data;
+}
+
+sub csv : Local : Args(1) {
+    my ($self, $c, $filename) = @_;
+
+    $c->authenticate(undef, "access_token");
+
+    my $body = $c->stash->{body} = $c->forward('check_page_allowed');
+
+    (my $basename = $filename) =~ s/\.csv$//;
+    my $reporting = FixMyStreet::Reporting->new(
+        user => $c->user_exists ? $c->user->obj : undef,
+        filename => $basename,
+    );
+    my $dir = $reporting->cache_dir;
+    my $csv = path($dir, $filename);
+
+    if (!$csv->exists) {
+        if (path($dir, "$filename-part")->exists && Catalyst::Authentication::Credential::AccessToken->get_token($c)) {
+            $c->res->body('');
+            $c->res->status(202);
+            $c->detach;
+        } else {
+            $c->detach( '/page_error_404_not_found', [] ) unless $csv->exists;
+        }
+    }
+
+    $reporting->http_setup($c);
+    $c->res->body($csv->openr_raw);
+}
+
 sub generate_body_response_time : Private {
     my ( $self, $c ) = @_;
 
diff --git a/perllib/FixMyStreet/Reporting.pm b/perllib/FixMyStreet/Reporting.pm
index 7ee9fc41a..08cdf1544 100644
--- a/perllib/FixMyStreet/Reporting.pm
+++ b/perllib/FixMyStreet/Reporting.pm
@@ -2,6 +2,7 @@ package FixMyStreet::Reporting;
 
 use DateTime;
 use Moo;
+use Path::Tiny;
 use Text::CSV;
 use Types::Standard qw(ArrayRef CodeRef Enum HashRef InstanceOf Int Maybe Str);
 use FixMyStreet::DB;
@@ -305,6 +306,46 @@ sub generate_csv {
 
 # Output code
 
+sub cache_dir {
+    my $self = shift;
+
+    my $cfg = FixMyStreet->config('PHOTO_STORAGE_OPTIONS');
+    my $dir = $cfg ? $cfg->{UPLOAD_DIR} : FixMyStreet->config('UPLOAD_DIR');
+    $dir = path($dir, "dashboard_csv")->absolute(FixMyStreet->path_to());
+    my $subdir = $self->user ? $self->user->id : 0;
+    $dir = $dir->child($subdir);
+    $dir->mkpath;
+    $dir;
+}
+
+sub kick_off_process {
+    my $self = shift;
+
+    return $self->_process if FixMyStreet->test_mode;
+
+    my $pid = fork;
+    unless ($pid) {
+        unless (fork) {
+            # eval so that it will definitely exit cleanly. Otherwise, an
+            # exception would turn this grandchild into a zombie app process
+            eval { $self->_process };
+            exit 0;
+        }
+        exit 0;
+    }
+    waitpid($pid, 0);
+}
+
+sub _process {
+    my $self = shift;
+    my $out = path($self->cache_dir, $self->filename . '.csv');
+    my $file = path($out . '-part');
+    if (!$file->exists) {
+        $self->generate_csv($file->openw_utf8);
+        $file->move($out);
+    }
+}
+
 # Outputs relevant CSV HTTP headers, and then streams the CSV
 sub generate_csv_http {
     my ($self, $c) = @_;
diff --git a/t/app/controller/dashboard.t b/t/app/controller/dashboard.t
index 526b1a4c3..fd491b540 100644
--- a/t/app/controller/dashboard.t
+++ b/t/app/controller/dashboard.t
@@ -20,6 +20,8 @@ use strict;
 use warnings;
 
 use FixMyStreet::TestMech;
+use File::Temp 'tempdir';
+use Path::Tiny;
 use Web::Scraper;
 
 set_absolute_time('2014-02-01T12:00:00');
@@ -81,10 +83,15 @@ my $categories = scraper {
     },
 };
 
+my $UPLOAD_DIR = tempdir( CLEANUP => 1 );
+
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => 'no2fa',
     COBRAND_FEATURES => { category_groups => { no2fa => 1 } },
     MAPIT_URL => 'http://mapit.uk/',
+    PHOTO_STORAGE_OPTIONS => {
+        UPLOAD_DIR => $UPLOAD_DIR,
+    },
 }, sub {
 
     subtest 'not logged in, redirected to login' => sub {
@@ -252,7 +259,37 @@ FixMyStreet::override_config {
         like $mech->res->header('Content-type'), qr'text/csv';
         $mech->content_contains('Report ID');
         $mech->delete_header('Authorization');
+
+        my $token = 'access_token=' . $counciluser->id . '-1234567890abcdefgh';
+        $mech->get_ok("/dashboard?export=2&$token");
+        is $mech->res->code, 202;
+        my $loc = $mech->res->header('Location');
+        like $loc, qr{/dashboard/csv/.*\.csv$};
+        $mech->get_ok("$loc?$token");
+        like $mech->res->header('Content-type'), qr'text/csv';
+        $mech->content_contains('Report ID');
     };
+
+    subtest 'view status page' => sub {
+        # Simulate a partly done file
+        my $f = Path::Tiny->tempfile(SUFFIX => '.csv-part', DIR => path($UPLOAD_DIR, 'dashboard_csv', $counciluser->id));
+        (my $name = $f->basename) =~ s/-part$//;;
+
+        my $token = 'access_token=' . $counciluser->id . '-1234567890abcdefgh';
+        $mech->get_ok("/dashboard/csv/$name?$token");
+        is $mech->res->code, 202;
+
+        $mech->log_in_ok( $counciluser->email );
+        $mech->get_ok('/dashboard/status');
+        $mech->content_contains('/dashboard/csv/www.example.org-body-' . $body->id . '-start_date-2014-01-02.csv');
+        $mech->content_like(qr/$name\s*<br>0KB\s*<i>In progress/);
+
+        $f->remove;
+        $mech->get_ok('/dashboard/status');
+        $mech->content_contains('/dashboard/csv/www.example.org-body-' . $body->id . '-start_date-2014-01-02.csv');
+        $mech->content_lacks('In progress');
+        $mech->content_lacks('setTimeout');
+    }
 };
 
 FixMyStreet::override_config {
diff --git a/templates/web/base/dashboard/index.html b/templates/web/base/dashboard/index.html
index 5ac414bde..6a3075c61 100644
--- a/templates/web/base/dashboard/index.html
+++ b/templates/web/base/dashboard/index.html
@@ -105,8 +105,8 @@
     <li>[% INCLUDE gb new_gb='device+site' text=loc('Device and Site') %]</li>
     <li class="pull-right">
         <span>[% loc('Export as CSV') %]:</span>
-        <a href="[% c.uri_with({ export => 1 }) %]">[% loc('Reports') %]</a>
-        <a href="[% c.uri_with({ export => 1, updates => 1 }) %]">[% loc('Updates') %]</a>
+        <a href="[% c.uri_with({ export => 2 }) %]">[% loc('Reports') %]</a>
+        <a href="[% c.uri_with({ export => 2, updates => 1 }) %]">[% loc('Updates') %]</a>
     </li>
 </ul>
 
diff --git a/templates/web/base/dashboard/status.html b/templates/web/base/dashboard/status.html
new file mode 100644
index 000000000..734bb9ad3
--- /dev/null
+++ b/templates/web/base/dashboard/status.html
@@ -0,0 +1,68 @@
+[% USE date %]
+[% IF NOT c.get_param('ajax') %]
+[% INCLUDE 'header.html'
+    title = loc('Dashboard')
+    robots = 'noindex, nofollow'
+    bodyclass = 'fullwidthpage';
+%]
+
+[% IF body %]
+<hgroup>
+    [% tprintf(loc('<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>'), body_name) %]
+</hgroup>
+[% ELSE %]
+<h1>[% loc('Summary statistics') %]</h1>
+[% END %]
+
+<p><a href="[% c.uri_for_action('dashboard/index') %]">[% loc('Back') %]</a></p>
+
+[% END %]
+
+<table id="overview" cellpadding=8 cellspacing=0>
+    <tr>
+        <th scope="col">[% loc('Created') %]</th>
+        <th scope="col">[% loc('CSV File') %]</th>
+    </tr>
+  [% in_progress = 0 %]
+  [% FOR file IN rows %]
+    <tr>
+        <td>[% date.format(file.ctime, format = '%Y-%m-%d %H:%M') %]</td>
+        <td>
+            [% IF file.finished %]
+                <a href="/dashboard/csv/[% file.name %]">[% file.name %]</a>
+                <br>[% file.size div 1024 %]KB
+            [% ELSE %]
+                [% file.name %]
+                <br>[% file.size div 1024 %]KB
+                <i>[% loc('In progress') %]</i>
+                [% in_progress = 1 %]
+            [% END %]
+        </td>
+    </tr>
+  [% END %]
+</table>
+
+[% IF NOT c.get_param('ajax') %]
+
+[% IF in_progress %]
+<script nonce="[% csp_nonce %]">
+(function() {
+    var wait = 1;
+    setTimeout(function refresh() {
+        $('#overview').load('[% c.uri_for_action('dashboard/status') %]?ajax=1', function() {
+            if ($(this).html().indexOf('<i>[% loc('In progress', "JS") %]</i>') === -1) {
+                return;
+            }
+            wait += 1;
+            if (wait > 10) {
+                wait = 10;
+            }
+            setTimeout(refresh, wait * 1000);
+        });
+    }, wait * 1000);
+})();
+</script>
+[% END %]
+
+[% INCLUDE 'footer.html' %]
+[% END %]
-- 
cgit v1.2.3


From 74366070ab45aaecd3e186fcc827252607422e82 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 11 Aug 2020 18:17:49 +0100
Subject: forking and FastCGI do not play nicely together.

---
 perllib/FixMyStreet/Reporting.pm | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/perllib/FixMyStreet/Reporting.pm b/perllib/FixMyStreet/Reporting.pm
index 08cdf1544..51dd6e97f 100644
--- a/perllib/FixMyStreet/Reporting.pm
+++ b/perllib/FixMyStreet/Reporting.pm
@@ -321,29 +321,24 @@ sub cache_dir {
 sub kick_off_process {
     my $self = shift;
 
-    return $self->_process if FixMyStreet->test_mode;
-
-    my $pid = fork;
-    unless ($pid) {
-        unless (fork) {
-            # eval so that it will definitely exit cleanly. Otherwise, an
-            # exception would turn this grandchild into a zombie app process
-            eval { $self->_process };
-            exit 0;
-        }
-        exit 0;
-    }
-    waitpid($pid, 0);
-}
-
-sub _process {
-    my $self = shift;
     my $out = path($self->cache_dir, $self->filename . '.csv');
     my $file = path($out . '-part');
-    if (!$file->exists) {
-        $self->generate_csv($file->openw_utf8);
-        $file->move($out);
+    return if $file->exists;
+    $file->touch; # So status page shows it even if process takes short while to spin up
+
+    my $cmd = FixMyStreet->path_to('bin/csv-export');
+    $cmd .= ' --cobrand ' . $self->cobrand->moniker;
+    $cmd .= " --out $out";
+    foreach (qw(type category state start_date end_date)) {
+        $cmd .= " --$_ " . $self->$_ if $self->$_;
+    }
+    foreach (qw(body user)) {
+        $cmd .= " --$_ " . $self->$_->id if $self->$_;
     }
+    $cmd .= " --wards " . join(',', @{$self->wards}) if @{$self->wards};
+    $cmd .= ' &' unless FixMyStreet->test_mode;
+
+    system($cmd);
 }
 
 # Outputs relevant CSV HTTP headers, and then streams the CSV
-- 
cgit v1.2.3


From 700217890e8afdc70b5224fc357a22195880cdc2 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 3 Aug 2020 17:24:22 +0100
Subject: Add asset layers at load before visibility changes

This is so any SelectFeature layers appear at the end of the layers
and the hover/click effects work on them.
---
 web/cobrands/fixmystreet/assets.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index c42d900fc..e301cf3dd 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -320,7 +320,6 @@ var fault_popup = null;
  */
 function init_asset_layer(layer, pins_layer) {
     layer.update_layer_visibility();
-    fixmystreet.map.addLayer(layer);
     if (layer.fixmystreet.asset_category || layer.fixmystreet.asset_group) {
         fixmystreet.map.events.register( 'zoomend', layer, check_zoom_message_visibility);
     }
@@ -945,13 +944,19 @@ fixmystreet.assets = {
             return hide_assets;
         })(fixmystreet.maps.display_around);
 
-        var pins_layer = fixmystreet.map.getLayersByName("Pins")[0];
+        var asset_layer;
         for (var i = 0; i < fixmystreet.assets.layers.length; i++) {
-            var asset_layer = fixmystreet.assets.layers[i];
+            asset_layer = fixmystreet.assets.layers[i];
             var controls = asset_layer.controls || [];
             for (var j = 0; j < controls.length; j++) {
                 fixmystreet.map.addControl(controls[j]);
             }
+            fixmystreet.map.addLayer(asset_layer);
+        }
+
+        var pins_layer = fixmystreet.map.getLayersByName("Pins")[0];
+        for (i = 0; i < fixmystreet.assets.layers.length; i++) {
+            asset_layer = fixmystreet.assets.layers[i];
             init_asset_layer(asset_layer, pins_layer);
         }
     }
-- 
cgit v1.2.3


From c0bead8312c3339ecce0a4886e15a45d5ceeaca8 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 3 Aug 2020 17:26:10 +0100
Subject: Factor together BNG inspector pin field function.

Update all name= fields, that should be fine.
---
 web/cobrands/fixmystreet/staff.js | 13 ++-----------
 web/js/map-OpenLayers.js          | 29 ++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index e62ae6ba7..236bdca70 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -246,17 +246,8 @@ fixmystreet.staff_set_up = {
         // triage pages may not show geolocation button
         if (el) {
             fixmystreet.geolocate(el, function(pos) {
-                var latlon = new OpenLayers.LonLat(pos.coords.longitude, pos.coords.latitude);
-                var bng = latlon.clone().transform(
-                    new OpenLayers.Projection("EPSG:4326"),
-                    new OpenLayers.Projection("EPSG:27700") // TODO: Handle other projections
-                );
-                $("#problem_northing").text(bng.lat.toFixed(1));
-                $("#problem_easting").text(bng.lon.toFixed(1));
-                $("#problem_latitude").text(latlon.lat.toFixed(6));
-                $("#problem_longitude").text(latlon.lon.toFixed(6));
-                $inspect_form.find("input[name=latitude]").val(latlon.lat);
-                $inspect_form.find("input[name=longitude]").val(latlon.lon);
+                var lonlat = new OpenLayers.LonLat(pos.coords.longitude, pos.coords.latitude);
+                fixmystreet.maps.update_pin_input_fields(lonlat);
             });
         }
     }
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 3db59f218..1a04756c5 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -146,6 +146,21 @@ $.extend(fixmystreet.utils, {
         };
       },
 
+      update_pin_input_fields: function(lonlat) {
+        var bng = lonlat.clone().transform(
+            new OpenLayers.Projection("EPSG:4326"),
+            new OpenLayers.Projection("EPSG:27700") // TODO: Handle other projections
+        );
+        var lat = lonlat.lat.toFixed(6);
+        var lon = lonlat.lon.toFixed(6);
+        $("#problem_northing").text(bng.lat.toFixed(1));
+        $("#problem_easting").text(bng.lon.toFixed(1));
+        $("#problem_latitude").text(lat);
+        $("#problem_longitude").text(lon);
+        $("input[name=latitude]").val(lat);
+        $("input[name=longitude]").val(lon);
+      },
+
       display_around: function() {
         // Required after changing the size of the map element
         fixmystreet.map.updateSize();
@@ -627,17 +642,9 @@ $.extend(fixmystreet.utils, {
             // Not actually on the inspect report page
             return;
         }
-        fixmystreet.maps.admin_drag(function(lonlat) {
-            var bng = lonlat.clone().transform(
-                new OpenLayers.Projection("EPSG:4326"),
-                new OpenLayers.Projection("EPSG:27700") // TODO: Handle other projections
-            );
-            $("#problem_northing").text(bng.y.toFixed(1));
-            $("#problem_easting").text(bng.x.toFixed(1));
-            $("#problem_latitude").text(lonlat.y.toFixed(6));
-            $("#problem_longitude").text(lonlat.x.toFixed(6));
-            $("input[name=latitude]").val(lonlat.y.toFixed(6));
-            $("input[name=longitude]").val(lonlat.x.toFixed(6));
+        fixmystreet.maps.admin_drag(function(geom) {
+            var lonlat = new OpenLayers.LonLat(geom.x, geom.y);
+            fixmystreet.maps.update_pin_input_fields(lonlat);
         },
         false);
     }
-- 
cgit v1.2.3


From 502423c7a1ce0fc93657b08fd935aa380890d091 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 3 Aug 2020 19:09:26 +0100
Subject: Allow inspectors to change report asset.

This hopefully copes with assets displayed by category or by group,
and updates the button to show/hide on category change.
---
 CHANGELOG.md                                       |  1 +
 templates/web/base/admin/report-category.html      |  5 +--
 templates/web/base/report/inspect/information.html |  7 ++++
 web/cobrands/fixmystreet/assets.js                 | 29 +++++++++++----
 web/cobrands/fixmystreet/fixmystreet.js            |  3 ++
 web/cobrands/fixmystreet/staff.js                  | 41 ++++++++++++++++++++++
 web/js/map-OpenLayers.js                           |  9 ++---
 7 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a27ea704..a2e197f5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
         - Centralise update creation to include fields.
         - Add full text index to speed up admin search.
         - Offline process for CSV generation.
+        - Allow inspectors to change report asset.
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
diff --git a/templates/web/base/admin/report-category.html b/templates/web/base/admin/report-category.html
index 55b9e2ea5..b15f57e71 100644
--- a/templates/web/base/admin/report-category.html
+++ b/templates/web/base/admin/report-category.html
@@ -1,11 +1,8 @@
-[%~ IF NOT select_name %]
-    [%~ select_name = 'category' %]
-[%~ END %]
 [%~ BLOCK category_option ~%]
 <option value="[% cat.category | html %]"[% ' selected' IF problem.category == cat.category %]>[% cat.category_display | html %]</option>
 [%~ END ~%]
 
-<select class="form-control" name="[% select_name %]" id="[% select_name %]">
+<select class="form-control" name="category" id="category">
   [% SET category_safe = mark_safe(problem.category) ~%]
   [% IF NOT problem.category OR NOT categories_hash.$category_safe %]
     <optgroup label="[% loc('Existing category') %]">
diff --git a/templates/web/base/report/inspect/information.html b/templates/web/base/report/inspect/information.html
index 3abde9a98..bca2a4b60 100644
--- a/templates/web/base/report/inspect/information.html
+++ b/templates/web/base/report/inspect/information.html
@@ -53,4 +53,11 @@
             </p>
           [% END %]
         [% END %]
+
+        <!-- These fields are for the asset display code to use -->
+        <input type="hidden" name="inspect_category_group" id="inspect_category_group" value="">
+        <input type="hidden" name="inspect_form_category" id="inspect_form_category" value="">
+        <p>
+          <a href="#" class="btn btn--block btn--change-asset">[% loc('Change asset') %]</a>
+        </p>
       </div>
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index e301cf3dd..ac4cb891c 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -24,12 +24,13 @@ OpenLayers.Layer.VectorAsset = OpenLayers.Class(OpenLayers.Layer.Vector, {
         $(fixmystreet).on('assets:unselected', this.checkSelected.bind(this));
         $(fixmystreet).on('report_new:category_change', this.changeCategory.bind(this));
         $(fixmystreet).on('report_new:category_change', this.update_layer_visibility.bind(this));
+        $(fixmystreet).on('inspect_form:asset_change', this.update_layer_visibility.bind(this));
     },
 
-    relevant: function() {
-      var category = $('select#form_category').val(),
-          group = $('select#category_group').val(),
-          layer = this.fixmystreet,
+    relevant: function(category, group) {
+      category = category || $('#inspect_form_category').val() || $('#form_category').val();
+      group = group || $('#inspect_category_group').val() || $('#category_group').val();
+      var layer = this.fixmystreet,
           relevant;
       if (layer.relevant) {
           relevant = layer.relevant({category: category, group: group});
@@ -132,11 +133,15 @@ OpenLayers.Layer.VectorAsset = OpenLayers.Class(OpenLayers.Layer.Vector, {
         // Set the extra fields to the value of the selected feature
         $.each(this.fixmystreet.attributes, function(field_name, attribute_name) {
             var $field = $("#form_" + field_name);
+            var $inspect_fields = $('[id^=category_][id$=form_' + field_name + ']');
+            var value;
             if (typeof attribute_name === 'function') {
-                $field.val(attribute_name.apply(feature));
+                value = attribute_name.apply(feature);
             } else {
-                $field.val(feature.attributes[attribute_name]);
+                value = feature.attributes[attribute_name];
             }
+            $field.val(value);
+            $inspect_fields.val(value);
         });
     },
 
@@ -875,6 +880,14 @@ fixmystreet.assets = {
         }
 
         options = $.extend(true, {}, default_options, options);
+
+        var cls = construct_layer_class(options);
+        var staff_report_page = ((fixmystreet.page == 'report' || fixmystreet.page == 'reports') && fixmystreet.staff_set_up);
+        if (staff_report_page && cls === OpenLayers.Layer.VectorNearest) {
+            // Only care about asset layers on report page when staff
+            return;
+        }
+
         var asset_layer = this.add_layer(options);
         this.add_controls([asset_layer], options);
         return asset_layer;
@@ -920,8 +933,10 @@ fixmystreet.assets = {
     },
 
     init: function() {
-        if (fixmystreet.page != 'new' && fixmystreet.page != 'around') {
+        var staff_report_page = ((fixmystreet.page == 'report' || fixmystreet.page == 'reports') && fixmystreet.staff_set_up);
+        if (fixmystreet.page != 'new' && fixmystreet.page != 'around' && !staff_report_page) {
             // We only want to show asset markers when making a new report
+            // or if an inspector is editing a report
             return;
         }
 
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index ad29ab470..d032b652d 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -1548,6 +1548,9 @@ fixmystreet.display = {
             $twoColReport = $reportPage.find('.two_column_sidebar'),
             $sideReport = $reportPage.find('#side-report');
 
+        // Set this from report page in case change asset used and therefore relevant() function
+        fixmystreet.bodies = fixmystreet.utils.csv_to_array($reportPage.find('#js-map-data').data('bodies'))[0];
+
         if ($sideReport.length) {
             $('#side').hide(); // Hide the list of reports
             $('#side-form').hide(); // And the form
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index 236bdca70..113886fda 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -189,6 +189,7 @@ fixmystreet.staff_set_up = {
         populateSelect($priorities, priorities_data, 'priorities_type_format');
         updateTemplates({'category': category});
         $priorities.val(curr_pri);
+        update_change_asset_button();
     });
 
     function state_change(state) {
@@ -252,6 +253,46 @@ fixmystreet.staff_set_up = {
         }
     }
 
+    function get_value_and_group(slr) {
+        var elt = $(slr)[0];
+        var group = $(elt.options[elt.selectedIndex]).closest('optgroup').prop('label');
+        return { 'value': $(elt).val(), 'group': group || '' };
+    }
+
+    function update_change_asset_button() {
+        var category = get_value_and_group('#category'); // The inspect form category dropdown only
+        var found = false;
+        if (fixmystreet.assets) {
+            for (var i = 0; i < fixmystreet.assets.layers.length; i++) {
+                var layer = fixmystreet.assets.layers[i];
+                if ((layer.fixmystreet.asset_category || layer.fixmystreet.asset_group) && layer.relevant(category.value, category.group)) {
+                    found = true;
+                    break;
+                }
+            }
+        }
+        if (found) {
+            $('.btn--change-asset').show();
+        } else {
+            $('.btn--change-asset').hide();
+        }
+    }
+    update_change_asset_button();
+
+    $('.btn--change-asset').on('click', function(e) {
+        e.preventDefault();
+        $(this).toggleClass('asset-spot');
+        if ($(this).hasClass('asset-spot')) {
+            var v = get_value_and_group('#category');
+            $('#inspect_form_category').val(v.value);
+            $('#inspect_category_group').val(v.group);
+        } else {
+            $('#inspect_form_category').val('');
+            $('#inspect_category_group').val('');
+        }
+        $(fixmystreet).trigger('inspect_form:asset_change');
+    });
+
     // Make the "Provide an update" form toggleable, hidden by default.
     // (Inspectors will normally just use the #public_update box instead).
     $('.js-provide-update').on('click', function(e) {
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 1a04756c5..553fd6c3a 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -132,14 +132,11 @@ $.extend(fixmystreet.utils, {
             new OpenLayers.Projection("EPSG:4326")
         );
 
-        var lat = transformedLonlat.lat.toFixed(6);
-        var lon = transformedLonlat.lon.toFixed(6);
-
-        document.getElementById('fixmystreet.latitude').value = lat;
-        document.getElementById('fixmystreet.longitude').value = lon;
-
+        fixmystreet.maps.update_pin_input_fields(transformedLonlat);
         $(fixmystreet).trigger('maps:update_pin', [ lonlat ]);
 
+        var lat = transformedLonlat.lat.toFixed(6);
+        var lon = transformedLonlat.lon.toFixed(6);
         return {
             'url': { 'lon': lon, 'lat': lat },
             'state': { 'lon': lonlat.lon, 'lat': lonlat.lat }
-- 
cgit v1.2.3


From fa9604aa0c6461753c0163d1791a61636570c679 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Wed, 12 Aug 2020 19:19:53 +0100
Subject: Do not set attribute fields on hidden layers.

This did not really matter before because you were either hiding an
asset layer (and thus its fields), or selecting a new layer/asset (and
so the last thing would be setting the attributes for the new asset. But
it was unnecessary, and now we're updating an inspector form and the
fields may apply to more than one layer.
---
 web/cobrands/fixmystreet/assets.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index ac4cb891c..367e2d33c 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -120,6 +120,9 @@ OpenLayers.Layer.VectorAsset = OpenLayers.Class(OpenLayers.Layer.Vector, {
         if (!fixmystreet.map) {
             return;
         }
+        if (!this.getVisibility()) {
+          return;
+        }
         var feature = fixmystreet.assets.selectedFeature();
         if (feature) {
             this.setAttributeFields(feature);
-- 
cgit v1.2.3


From 82ad3f1db8debc125e8d54a372b26379a54d63db Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 13 Aug 2020 17:42:21 +0100
Subject: Only create one admin drag control.

It was previously creating one on each report you looked at. A side
effect of which was upping the z-index of the layer by one each time,
making adding asset layers bit trickier.
---
 web/js/map-OpenLayers.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 553fd6c3a..d94d0706f 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -290,9 +290,12 @@ $.extend(fixmystreet.utils, {
       // pin_moved_callback is called with a new EPSG:4326 OpenLayers.LonLat if
       // the user drags the pin and confirms its new location.
       admin_drag: function(pin_moved_callback, confirm_change) {
+          if (fixmystreet.maps.admin_drag_control) {
+              return;
+          }
           confirm_change = confirm_change || false;
           var original_lonlat;
-          var drag = new OpenLayers.Control.DragFeatureFMS( fixmystreet.markers, {
+          var drag = fixmystreet.maps.admin_drag_control = new OpenLayers.Control.DragFeatureFMS( fixmystreet.markers, {
               onStart: function(feature, e) {
                   // Keep track of where the feature started, so we can put it
                   // back if the user cancels the operation.
-- 
cgit v1.2.3


From a78ffca120498653b52ccbe51703b526d6e7b4ab Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 13 Aug 2020 17:43:38 +0100
Subject: When inspector changing asset, prevent background map click.

---
 web/js/map-OpenLayers.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index d94d0706f..ada51cbc0 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -1330,8 +1330,13 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
         // If we are looking at an individual report, and the report was
         // ajaxed into the DOM from the all reports page, then clicking
         // the map background should take us back to the all reports list.
-        if ($('.js-back-to-report-list').length) {
-            $('.js-back-to-report-list').trigger('click');
+        var asset_button_clicked = $('.btn--change-asset').hasClass('asset-spot');
+        if (asset_button_clicked) {
+            return true;
+        }
+        var back_link = $('.js-back-to-report-list');
+        if (back_link.length) {
+            back_link.trigger('click');
             return true;
         }
 
-- 
cgit v1.2.3


From cf29fa12e4e34dad0e35a1577f701f22e73817cf Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 13 Aug 2020 18:39:35 +0100
Subject: [UK] Add missing hover styles to assets.

---
 web/cobrands/bexley/assets.js          | 1 +
 web/cobrands/buckinghamshire/assets.js | 1 +
 web/cobrands/cheshireeast/assets.js    | 1 +
 web/cobrands/hounslow/assets.js        | 1 +
 web/cobrands/isleofwight/assets.js     | 1 +
 web/cobrands/peterborough/assets.js    | 1 +
 6 files changed, 6 insertions(+)

diff --git a/web/cobrands/bexley/assets.js b/web/cobrands/bexley/assets.js
index caf0e296d..db2384195 100644
--- a/web/cobrands/bexley/assets.js
+++ b/web/cobrands/bexley/assets.js
@@ -23,6 +23,7 @@ var defaults = {
 
 var streetlight_stylemap = new OpenLayers.StyleMap({
   'default': fixmystreet.assets.style_default,
+  'hover': fixmystreet.assets.style_default_hover,
   'select': fixmystreet.assets.construct_named_select_style("${Unit_No}")
 });
 
diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js
index 3130c7fa7..f15c78504 100644
--- a/web/cobrands/buckinghamshire/assets.js
+++ b/web/cobrands/buckinghamshire/assets.js
@@ -42,6 +42,7 @@ fixmystreet.assets.add(defaults, {
 
 var streetlight_stylemap = new OpenLayers.StyleMap({
   'default': fixmystreet.assets.style_default,
+  'hover': fixmystreet.assets.style_default_hover,
   'select': fixmystreet.assets.construct_named_select_style("${feature_id}")
 });
 
diff --git a/web/cobrands/cheshireeast/assets.js b/web/cobrands/cheshireeast/assets.js
index 4e5df342d..f54af471f 100644
--- a/web/cobrands/cheshireeast/assets.js
+++ b/web/cobrands/cheshireeast/assets.js
@@ -22,6 +22,7 @@ var defaults = {
 
 var streetlight_stylemap = new OpenLayers.StyleMap({
   'default': fixmystreet.assets.style_default,
+  'hover': fixmystreet.assets.style_default_hover,
   'select': fixmystreet.assets.construct_named_select_style("${feature_id}")
 });
 
diff --git a/web/cobrands/hounslow/assets.js b/web/cobrands/hounslow/assets.js
index 9521d73b8..2c7f5b754 100644
--- a/web/cobrands/hounslow/assets.js
+++ b/web/cobrands/hounslow/assets.js
@@ -129,6 +129,7 @@ select_style.createLiterals = function() {
 
 var streetlight_stylemap = new OpenLayers.StyleMap({
   'default': fixmystreet.assets.style_default,
+  'hover': fixmystreet.assets.style_default_hover,
   'select': select_style
 });
 
diff --git a/web/cobrands/isleofwight/assets.js b/web/cobrands/isleofwight/assets.js
index 7b7fb7f00..cedd2293c 100644
--- a/web/cobrands/isleofwight/assets.js
+++ b/web/cobrands/isleofwight/assets.js
@@ -33,6 +33,7 @@ var pin_prefix = fixmystreet.pin_prefix || document.getElementById('js-map-data'
 
 var labeled_stylemap = new OpenLayers.StyleMap({
   'default': fixmystreet.assets.style_default,
+  'hover': fixmystreet.assets.style_default_hover,
   'select': fixmystreet.assets.construct_named_select_style("${asset_id}")
 });
 
diff --git a/web/cobrands/peterborough/assets.js b/web/cobrands/peterborough/assets.js
index 1da72264d..ad898caec 100644
--- a/web/cobrands/peterborough/assets.js
+++ b/web/cobrands/peterborough/assets.js
@@ -109,6 +109,7 @@ fixmystreet.assets.add(defaults, {
 
 var streetlight_stylemap = new OpenLayers.StyleMap({
   'default': fixmystreet.assets.style_default,
+  'hover': fixmystreet.assets.style_default_hover,
   'select': fixmystreet.assets.construct_named_select_style("${UNITNO}")
 });
 
-- 
cgit v1.2.3


From 71e3de0f305449182d63319bcc1b3a86b857d62b Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 13 Aug 2020 19:23:14 +0100
Subject: Better UX on mobile for inspector changing asset.

Scrolls to map and locks map full screen when change asset pressed;
collapse map to finish; displays attribute fields in map overlay.
---
 web/cobrands/fixmystreet/assets.js      | 2 ++
 web/cobrands/fixmystreet/fixmystreet.js | 8 +++++++-
 web/cobrands/fixmystreet/staff.js       | 6 ++++++
 web/cobrands/sass/_base.scss            | 9 +++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index 367e2d33c..ef345092b 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -134,6 +134,7 @@ OpenLayers.Layer.VectorAsset = OpenLayers.Class(OpenLayers.Layer.Vector, {
             return;
         }
         // Set the extra fields to the value of the selected feature
+        var $mobile_display = $('#change_asset_mobile').text('');
         $.each(this.fixmystreet.attributes, function(field_name, attribute_name) {
             var $field = $("#form_" + field_name);
             var $inspect_fields = $('[id^=category_][id$=form_' + field_name + ']');
@@ -145,6 +146,7 @@ OpenLayers.Layer.VectorAsset = OpenLayers.Class(OpenLayers.Layer.Vector, {
             }
             $field.val(value);
             $inspect_fields.val(value);
+            $mobile_display.append(field_name + ': ' + value + '<br>');
         });
     },
 
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index d032b652d..5485ff7c7 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -892,10 +892,16 @@ $.extend(fixmystreet.set_up, {
             .prependTo('#sub_map_links');
     }
 
-    $('#toggle-fullscreen').off('click').on('click', function() {
+    $('#toggle-fullscreen').off('click').on('click', function(e) {
+      e.preventDefault();
       var btnClass = $('html').hasClass('map-fullscreen') ? 'expand' : 'compress';
       var text = $(this).data(btnClass + '-text');
 
+      // Inspector form asset changing
+      if ($('html').hasClass('map-fullscreen') && $('.btn--change-asset').hasClass('asset-spot')) {
+          $('.btn--change-asset').click();
+      }
+
       $('html').toggleClass('map-fullscreen only-map');
       $(this).html(text).attr('class', btnClass);
 
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index 113886fda..2422d5476 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -286,9 +286,15 @@ fixmystreet.staff_set_up = {
             var v = get_value_and_group('#category');
             $('#inspect_form_category').val(v.value);
             $('#inspect_category_group').val(v.group);
+            if ($('html').hasClass('mobile')) {
+                $('#toggle-fullscreen').trigger('click');
+                $('html, body').animate({ scrollTop: 0 }, 500);
+                $('#map_box').append('<div id="change_asset_mobile"/>');
+            }
         } else {
             $('#inspect_form_category').val('');
             $('#inspect_category_group').val('');
+            $('#change_asset_mobile').remove();
         }
         $(fixmystreet).trigger('inspect_form:asset_change');
     });
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index dbd357646..2992f3f65 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -1972,6 +1972,15 @@ html.js #map .noscript {
   }
 }
 
+#change_asset_mobile {
+    position: absolute;
+    bottom: 3em;
+    #{$left}: 0.25em;
+    padding: 0.25em;
+    color: #fff;
+    background-color: black;
+}
+
 .olControlAttribution {
     bottom: 3.25em !important;
     #{$right}: 0.25em !important;
-- 
cgit v1.2.3


From 94fd60a02ae7c57993c893ca13c7419002b11cf9 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Tue, 11 Aug 2020 10:28:36 +0100
Subject: [Docs] Remove mySociety header from FMS Pro manual

Matches the corresponding change on the societyworks.org site:
https://github.com/mysociety/orgsites/issues/1156
---
 docs/_layouts/pro.html          | 14 --------------
 docs/_sass/fixmystreet-pro.scss | 26 +-------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/docs/_layouts/pro.html b/docs/_layouts/pro.html
index e01d61688..b16010269 100644
--- a/docs/_layouts/pro.html
+++ b/docs/_layouts/pro.html
@@ -21,20 +21,6 @@
   </head>
   <body{% if page.bodyclass %} class="{{ page.bodyclass }}"{% endif %}>
 
-  
-    <div class="ms-header">
-        <div class="container">
-            <div class="row">
-              <div class="col-sm-3 col-sm-push-9 ms-header__logo">
-                <a href="https://www.mysociety.org/">mySociety</a>
-              </div>
-              <a class="col-sm-9 col-sm-pull-3 ms-header__back-to-fms" href="https://www.fixmystreet.com">
-                <p><i class="glyphicon glyphicon-chevron-left"></i> <strong>Return to FixMyStreet.com</strong> to report a street issue in the UK</p>
-              </a>
-            </div>
-        </div>
-    </div>
-
     <header class="site-header">
       <div class="container">
         <a href="https://www.societyworks.org/" class="site-logo" aria-label="SocietyWorks home">SocietyWorks</a>
diff --git a/docs/_sass/fixmystreet-pro.scss b/docs/_sass/fixmystreet-pro.scss
index 9670b526c..a449eed36 100644
--- a/docs/_sass/fixmystreet-pro.scss
+++ b/docs/_sass/fixmystreet-pro.scss
@@ -5,29 +5,7 @@
  * the mySociety standard header - the following resets a lot of this
  */
 
- $pro-yellow: #FED876;
-
- .ms-header {
-     border: 0;
- }
-
-.ms-header__logo {
-    
-    border-radius: 0;
-    background-position: 0 0;
-    background-size: 0 0 ;
-    background-repeat: no-repeat;
-    background-image: none;
-    width: auto;
-    height: auto;
-    display: block;
-    position: static;
-    right: auto;
-    top: auto;
-    background-color:  transparent;
-    background-repeat: no-repeat;
-    margin: 10px 0;
-}
+$pro-yellow: #FED876;
 
 .site-header {
     background-color: white;
@@ -81,14 +59,12 @@ h4 {
 // user guide view, for printing (but these styles will be visible on screen too
 
 .user-guide-print {
-    .ms-header,
     .mysoc-footer,
     .site-nav,
     .secondary-content-column,
     a[href="#main-nav"] {
         display: none !important;
         visibility: hidden;
-        
     }
 
     .main-content-column {
-- 
cgit v1.2.3


From 3dca06dc40f7ac247ba4345da761fc53367b33ea Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 14 Aug 2020 11:44:38 +0100
Subject: Zoom in to asset if selected when changing asset.

If you click the change asset button on a report page that was loaded
inline from a map list page, you want to see assets around the report
and not the centre of the map.
---
 web/cobrands/fixmystreet/assets.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index ef345092b..07ccd73d3 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -107,7 +107,13 @@ OpenLayers.Layer.VectorAsset = OpenLayers.Class(OpenLayers.Layer.Vector, {
         if (!this.inRange && this.resolutions) {
             var firstVisibleResolution = this.resolutions[0];
             var zoomLevel = fixmystreet.map.getZoomForResolution(firstVisibleResolution);
-            fixmystreet.map.zoomTo(zoomLevel);
+            if (window.selected_problem_id) {
+                var feature = fixmystreet.maps.get_marker_by_id(window.selected_problem_id);
+                var center = feature.geometry.getBounds().getCenterLonLat();
+                fixmystreet.map.setCenter(center, zoomLevel);
+            } else {
+                fixmystreet.map.zoomTo(zoomLevel);
+            }
         }
     },
 
-- 
cgit v1.2.3


From 43bcd0398592aec7045ff6765aa001f86cdcc572 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 14 Aug 2020 13:43:20 +0100
Subject: CSV export fix for e.g. spaces in category names.

---
 perllib/FixMyStreet/Reporting.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/perllib/FixMyStreet/Reporting.pm b/perllib/FixMyStreet/Reporting.pm
index 51dd6e97f..b5b5876b9 100644
--- a/perllib/FixMyStreet/Reporting.pm
+++ b/perllib/FixMyStreet/Reporting.pm
@@ -88,7 +88,8 @@ has filename => ( is => 'rw', isa => Str, lazy => 1, default => sub {
         $self->on_updates ? ('updates') : (),
         map {
             my $value = $where{$_};
-            (defined $value and length $value) ? ($_, $value) : ()
+            (my $nosp = $value) =~ s/ /-/g;
+            (defined $value and length $value) ? ($_, $nosp) : ()
         } sort keys %where
 });
 
@@ -328,14 +329,14 @@ sub kick_off_process {
 
     my $cmd = FixMyStreet->path_to('bin/csv-export');
     $cmd .= ' --cobrand ' . $self->cobrand->moniker;
-    $cmd .= " --out $out";
+    $cmd .= " --out \Q$out\E";
     foreach (qw(type category state start_date end_date)) {
-        $cmd .= " --$_ " . $self->$_ if $self->$_;
+        $cmd .= " --$_ " . quotemeta($self->$_) if $self->$_;
     }
     foreach (qw(body user)) {
         $cmd .= " --$_ " . $self->$_->id if $self->$_;
     }
-    $cmd .= " --wards " . join(',', @{$self->wards}) if @{$self->wards};
+    $cmd .= " --wards " . join(',', map { quotemeta } @{$self->wards}) if @{$self->wards};
     $cmd .= ' &' unless FixMyStreet->test_mode;
 
     system($cmd);
-- 
cgit v1.2.3


From a049a21d86ae8f4b92f3cf7c78f96ab777a9a88f Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 13 Aug 2020 20:58:31 +0100
Subject: MapQuest tiles went away a long time ago.

---
 perllib/FixMyStreet/Map/OSM/MapQuest.pm | 34 ---------------------------------
 t/map/tests.t                           |  1 -
 web/js/map-OpenStreetMap.js             | 34 ---------------------------------
 3 files changed, 69 deletions(-)
 delete mode 100644 perllib/FixMyStreet/Map/OSM/MapQuest.pm

diff --git a/perllib/FixMyStreet/Map/OSM/MapQuest.pm b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
deleted file mode 100644
index 8b24e1ba2..000000000
--- a/perllib/FixMyStreet/Map/OSM/MapQuest.pm
+++ /dev/null
@@ -1,34 +0,0 @@
-# FixMyStreet:Map::OSM::CycleMap
-# OSM CycleMap maps on FixMyStreet.
-#
-# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved.
-# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
-
-package FixMyStreet::Map::OSM::MapQuest;
-use base 'FixMyStreet::Map::OSM';
-
-use strict;
-
-sub map_type { 'OpenLayers.Layer.OSM.MapQuestOpen' }
-
-sub map_tiles {
-    my ( $self, %params ) = @_;
-    my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} );
-    my $tile_url = $self->base_tile_url();
-    return [
-        "https://otile1-s.$tile_url/$z/" . ($x - 1) . "/" . ($y - 1) . ".png",
-        "https://otile2-s.$tile_url/$z/$x/" . ($y - 1) . ".png",
-        "https://otile3-s.$tile_url/$z/" . ($x - 1) . "/$y.png",
-        "https://otile4-s.$tile_url/$z/$x/$y.png",
-    ];
-}
-
-sub base_tile_url {
-    return 'mqcdn.com/tiles/1.0.0/map/';
-}
-
-sub copyright {
-    'Data, imagery and map information provided by <a href="https://www.mapquest.com/">MapQuest</a> <img src="https://developer.mapquest.com/sites/default/files/mapquest/osm/mq_logo.png" />, <a href="https://openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="https://opendatacommons.org/licenses/odbl/">ODbL</a>'
-}
-
-1;
diff --git a/t/map/tests.t b/t/map/tests.t
index 7d7efab22..e6de55b8f 100644
--- a/t/map/tests.t
+++ b/t/map/tests.t
@@ -18,7 +18,6 @@ my $requires = {
     'MasterMap' => 'map-mastermap.js',
     'Northamptonshire' => 'map-wms-northamptonshire.js',
     'CycleMap' => 'OpenStreetMap.js',
-    'MapQuest' => 'OpenStreetMap.js',
     'StreetView' => 'map-streetview.js',
     'TonerLite' => 'map-toner-lite.js',
     'Zurich' => 'map-wmts-zurich.js',
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index bd3497343..4dc862be6 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -51,40 +51,6 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, {
     CLASS_NAME: "OpenLayers.Layer.OSM.Mapnik"
 });
 
-/**
- * Class: OpenLayers.Layer.OSM.MapQuestOpen
- *
- * Inherits from:
- *  - <OpenLayers.Layer.OSM>
- */
-OpenLayers.Layer.OSM.MapQuestOpen = OpenLayers.Class(OpenLayers.Layer.OSM, {
-    /**
-     * Constructor: OpenLayers.Layer.OSM.MapQuestOpen
-     *
-     * Parameters:
-     * name - {String}
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    initialize: function(name, options) {
-        var url = [
-            "https://otile1-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
-            "https://otile2-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
-            "https://otile3-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
-            "https://otile4-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png"
-        ];
-        options = OpenLayers.Util.extend({
-            /* Below line added to OSM's file in order to allow minimum zoom level */
-            maxResolution: 156543.03390625/Math.pow(2, options.zoomOffset || 0),
-            numZoomLevels: 19,
-            buffer: 0
-        }, options);
-        var newArguments = [name, url, options];
-        OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.OSM.MapQuestOpen"
-});
-
 /**
  * Class: OpenLayers.Layer.OSM.CycleMap
  *
-- 
cgit v1.2.3


From e268e2b893aaf8a99e457c085e9c77d140b77233 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 13 Aug 2020 21:15:08 +0100
Subject: Allow one more zoom level on most map types.

Not on StreetView/OpenMap Local based, which are not available.
---
 .cypress/cypress/integration/around_filters.js |  2 +-
 .cypress/cypress/integration/regressions.js    |  2 +-
 .cypress/cypress/integration/simple_spec.js    |  2 +-
 CHANGELOG.md                                   |  1 +
 perllib/FixMyStreet/Cobrand/Default.pm         |  2 +-
 perllib/FixMyStreet/Map/FMS.pm                 |  2 ++
 perllib/FixMyStreet/Map/Google.pm              | 25 ++++++++++++++++---------
 perllib/FixMyStreet/Map/MasterMap.pm           |  1 +
 perllib/FixMyStreet/Map/OSM.pm                 | 15 +++++++++------
 perllib/FixMyStreet/Map/OSM/StreetView.pm      |  2 ++
 t/app/controller/around.t                      |  2 +-
 t/map/google.t                                 |  2 +-
 web/js/map-OpenStreetMap.js                    |  4 ++--
 web/js/map-bing-ol.js                          |  2 +-
 web/js/map-google.js                           |  2 +-
 15 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/.cypress/cypress/integration/around_filters.js b/.cypress/cypress/integration/around_filters.js
index 46d1f8477..c79359574 100644
--- a/.cypress/cypress/integration/around_filters.js
+++ b/.cypress/cypress/integration/around_filters.js
@@ -112,7 +112,7 @@ describe('Around page filtering and push state', function() {
         cy.route('/report/*').as('show-report');
         cy.route('/reports/*').as('show-all');
         cy.route('/mapit/area/*').as('get-geometry');
-        cy.visit('/around?lon=-2.295894&lat=51.526877&zoom=6');
+        cy.visit('/around?lon=-2.295894&lat=51.526877&zoom=0');
         // get the second image which is the pin, first is the shadow
         cy.get('image[title="Lights out in tunnel"]:last').invoke('attr', 'xlink:href').should('contain', 'small');
         // force to hopefully work around apparent Cypress SVG issue
diff --git a/.cypress/cypress/integration/regressions.js b/.cypress/cypress/integration/regressions.js
index f1f557219..57176223f 100644
--- a/.cypress/cypress/integration/regressions.js
+++ b/.cypress/cypress/integration/regressions.js
@@ -46,7 +46,7 @@ describe('Regression tests', function() {
     it('hides the report when going from around to report to form', function() {
         cy.server();
         cy.route('/report/*').as('show-report');
-        cy.visit('/around?lon=-2.295894&lat=51.526877&zoom=6');
+        cy.visit('/around?lon=-2.295894&lat=51.526877&zoom=0');
         // force to hopefully work around apparent Cypress SVG issue
         cy.get('image[title="Lights out in tunnel"]:last').click({force: true});
         cy.wait('@show-report');
diff --git a/.cypress/cypress/integration/simple_spec.js b/.cypress/cypress/integration/simple_spec.js
index 8b658b21b..e2b776d21 100644
--- a/.cypress/cypress/integration/simple_spec.js
+++ b/.cypress/cypress/integration/simple_spec.js
@@ -47,7 +47,7 @@ describe('Leaving updates', function() {
         cy.route('/report/*').as('show-report');
         cy.route('/reports/*').as('show-all');
         cy.route('/mapit/area/*').as('get-geometry');
-        cy.visit('/around?lon=-2.295894&lat=51.526877&zoom=6');
+        cy.visit('/around?lon=-2.295894&lat=51.526877&zoom=0');
         // force to hopefully work around apparent Cypress SVG issue
         cy.get('image[title="Lights out in tunnel"]:last').click({force: true});
         cy.wait('@show-report');
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2e197f5c..9460a204e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
         - Add option of checking passwords against Have I Been Pwned.
         - Add aerial maps option to Bing and OSM maps.
         - Select matches for both filter category and group. #3110
+        - Add an extra zoom level to most map types. #3130
     - Changes:
         - Mark user as active when sent an email alert.
     - Bugfixes:
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 82b3b7f45..2dfb0d7b1 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -1072,7 +1072,7 @@ sub can_support_problems { return 0; }
 =item default_map_zoom
 
 default_map_zoom is used when displaying a map overriding the
-default of max-4 or max-3 depending on population density.
+default that depends on population density.
 
 =cut
 
diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm
index 1b556f6b3..53d911a57 100644
--- a/perllib/FixMyStreet/Map/FMS.pm
+++ b/perllib/FixMyStreet/Map/FMS.pm
@@ -9,6 +9,8 @@ use base 'FixMyStreet::Map::Bing';
 
 use strict;
 
+use constant ZOOM_LEVELS => 6;
+
 sub map_template { 'fms' }
 
 sub map_javascript { [
diff --git a/perllib/FixMyStreet/Map/Google.pm b/perllib/FixMyStreet/Map/Google.pm
index c1fb05e43..dfebef5a3 100644
--- a/perllib/FixMyStreet/Map/Google.pm
+++ b/perllib/FixMyStreet/Map/Google.pm
@@ -10,8 +10,9 @@ use strict;
 use FixMyStreet::Gaze;
 use Utils;
 
-use constant ZOOM_LEVELS    => 6;
+use constant ZOOM_LEVELS    => 7;
 use constant MIN_ZOOM_LEVEL => 13;
+use constant DEFAULT_ZOOM   => 3;
 
 sub map_javascript { [
     "http://maps.googleapis.com/maps/api/js?sensor=false",
@@ -28,16 +29,16 @@ sub display_map {
 
     my $numZoomLevels = ZOOM_LEVELS;
     my $zoomOffset = MIN_ZOOM_LEVEL;
-    if ($params{any_zoom}) {
-        $numZoomLevels = 19;
-        $zoomOffset = 0;
-    }
 
     # Adjust zoom level dependent upon population density
-    my $dist = $c->stash->{distance}
-        || FixMyStreet::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude} );
-    my $default_zoom = $c->cobrand->default_map_zoom() ? $c->cobrand->default_map_zoom() : $numZoomLevels - 4;
-    $default_zoom = $numZoomLevels - 3 if $dist < 10;
+    my $default_zoom;
+    if (my $cobrand_default_zoom = $c->cobrand->default_map_zoom) {
+        $default_zoom = $cobrand_default_zoom;
+    } else {
+        my $dist = $c->stash->{distance}
+            || FixMyStreet::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude} );
+        $default_zoom = $dist < 10 ? $self->DEFAULT_ZOOM : $self->DEFAULT_ZOOM - 1;
+    }
 
     # Map centre may be overridden in the query string
     $params{latitude} = Utils::truncate_coordinate($c->get_param('lat') + 0)
@@ -46,6 +47,12 @@ sub display_map {
         if defined $c->get_param('lon');
     $params{zoomToBounds} = $params{any_zoom} && !defined $c->get_param('zoom');
 
+    if ($params{any_zoom}) {
+        $numZoomLevels += $zoomOffset;
+        $default_zoom += $zoomOffset;
+        $zoomOffset = 0;
+    }
+
     my $zoom = defined $c->get_param('zoom') ? $c->get_param('zoom') + 0 : $default_zoom;
     $zoom = $numZoomLevels - 1 if $zoom >= $numZoomLevels;
     $zoom = 0 if $zoom < 0;
diff --git a/perllib/FixMyStreet/Map/MasterMap.pm b/perllib/FixMyStreet/Map/MasterMap.pm
index d66234bbf..5edbb28fb 100644
--- a/perllib/FixMyStreet/Map/MasterMap.pm
+++ b/perllib/FixMyStreet/Map/MasterMap.pm
@@ -8,6 +8,7 @@ use base 'FixMyStreet::Map::FMS';
 use strict;
 
 use constant ZOOM_LEVELS => 7;
+use constant DEFAULT_ZOOM => 4;
 
 sub map_template { 'fms' }
 
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 47c1c8535..082605568 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -11,8 +11,9 @@ use Math::Trig;
 use FixMyStreet::Gaze;
 use Utils;
 
-use constant ZOOM_LEVELS    => 6;
+use constant ZOOM_LEVELS    => 7;
 use constant MIN_ZOOM_LEVEL => 13;
+use constant DEFAULT_ZOOM   => 3;
 
 sub map_type { 'OpenLayers.Layer.OSM.Mapnik' }
 
@@ -76,10 +77,6 @@ sub generate_map_data {
 
     my $numZoomLevels = $self->ZOOM_LEVELS;
     my $zoomOffset = $self->MIN_ZOOM_LEVEL;
-    if ($params{any_zoom}) {
-        $numZoomLevels = 19;
-        $zoomOffset = 0;
-    }
 
     # Adjust zoom level dependent upon population density if cobrand hasn't
     # specified a default zoom.
@@ -89,7 +86,13 @@ sub generate_map_data {
     } else {
         my $dist = $data->{distance}
             || FixMyStreet::Gaze::get_radius_containing_population( $params{latitude}, $params{longitude} );
-        $default_zoom = $dist < 10 ? $numZoomLevels - 3 : $numZoomLevels - 4;
+        $default_zoom = $dist < 10 ? $self->DEFAULT_ZOOM : $self->DEFAULT_ZOOM - 1;
+    }
+
+    if ($params{any_zoom}) {
+        $numZoomLevels += $zoomOffset;
+        $default_zoom += $zoomOffset;
+        $zoomOffset = 0;
     }
 
     my $zoom = $data->{zoom} || $default_zoom;
diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index 3281faa35..820a3b87f 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -9,6 +9,8 @@ use base 'FixMyStreet::Map::OSM';
 
 use strict;
 
+use constant ZOOM_LEVELS => 6;
+
 sub map_type { '' }
 
 sub map_javascript { [
diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index ba5f8c48a..29752ab02 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -413,7 +413,7 @@ subtest 'check map zoom level customisation' => sub {
         MAP_TYPE => 'OSM',
     }, sub {
         $mech->get('/around?latitude=51.754926&longitude=-1.256179');
-        $mech->content_contains('data-numZoomLevels=6');
+        $mech->content_contains('data-numZoomLevels=7');
         $mech->content_contains('data-zoomOffset=13');
     };
 
diff --git a/t/map/google.t b/t/map/google.t
index e2877f53c..e97279072 100644
--- a/t/map/google.t
+++ b/t/map/google.t
@@ -13,7 +13,7 @@ is_deeply $c->stash->{map}, {
     type => 'google',
     zoom => 15,
     zoomOffset => 0,
-    numZoomLevels => 19,
+    numZoomLevels => 20,
     zoom_act => 15,
 };
 
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index 4dc862be6..46aba1c91 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -41,7 +41,7 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, {
         options = OpenLayers.Util.extend({
             /* Below line added to OSM's file in order to allow minimum zoom level */
             maxResolution: 156543.03390625/Math.pow(2, options.zoomOffset || 0),
-            numZoomLevels: 19,
+            numZoomLevels: 20,
             buffer: 0
         }, options);
         var newArguments = [name, url, options];
@@ -74,7 +74,7 @@ OpenLayers.Layer.OSM.CycleMap = OpenLayers.Class(OpenLayers.Layer.OSM, {
         options = OpenLayers.Util.extend({
             /* Below line added to OSM's file in order to allow minimum zoom level */
             maxResolution: 156543.03390625/Math.pow(2, options.zoomOffset || 0),
-            numZoomLevels: 19,
+            numZoomLevels: 20,
             buffer: 0
         }, options);
         var newArguments = [name, url, options];
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index 179238633..c44cf96f8 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -66,7 +66,7 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
         options = OpenLayers.Util.extend({
             /* Below line added to OSM's file in order to allow minimum zoom level */
             maxResolution: 156543.03390625/Math.pow(2, options.zoomOffset || 0),
-            numZoomLevels: 19,
+            numZoomLevels: 20,
             sphericalMercator: true,
             buffer: 0
         }, options);
diff --git a/web/js/map-google.js b/web/js/map-google.js
index fc515b9dd..801fed210 100644
--- a/web/js/map-google.js
+++ b/web/js/map-google.js
@@ -156,7 +156,7 @@ fixmystreet.maps = {};
         };
         if (!fixmystreet.zoomToBounds) {
             map_args.minZoom = 13;
-            map_args.maxZoom = 18;
+            map_args.maxZoom = 19;
         }
         fixmystreet.map = new google.maps.Map(document.getElementById("map"), map_args);
 
-- 
cgit v1.2.3


From f28ae32f1591ca3bb01feb1be28737b9a416c0a9 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 17 Aug 2020 12:54:24 +0100
Subject: [Bromley] Use Unicode nbsp character directly.

This avoids it being escaped by the template.
---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 90e5895d5..859484a4a 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -337,7 +337,7 @@ sub add_admin_subcategories {
         foreach (@{$subcats{$_->{id}}}) {
             push @new_contacts, {
                 id => $_->{key},
-                category => ("&nbsp;" x 4) . $_->{name},
+                category => (" " x 4) . $_->{name}, # nbsp
                 active => $active_contacts{$_->{key}},
             };
         }
-- 
cgit v1.2.3


From 65b65bdaef720d2c34aa0377a6e8befd64cdc7e0 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 17 Aug 2020 12:54:48 +0100
Subject: [Bromley] Refactor template to more match base.

---
 .../web/bromley/admin/category-checkboxes.html     | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/templates/web/bromley/admin/category-checkboxes.html b/templates/web/bromley/admin/category-checkboxes.html
index 756f2d1ff..68e8e0c26 100644
--- a/templates/web/bromley/admin/category-checkboxes.html
+++ b/templates/web/bromley/admin/category-checkboxes.html
@@ -1,12 +1,4 @@
-<fieldset>
-  <legend>
-  [% IF hint %]
-    <div class="admin-hint">
-      <p>[% hint %]</p>
-    </div>
-  [% END %]
-    [% loc('Categories:') %]
-  </legend>
+[% BLOCK checkboxes %]
   <ul class="no-bullets no-margin">
     <li>
       [% loc('Select:') %]
@@ -22,4 +14,16 @@
       </li>
     [% END %]
   </ul>
+[% END %]
+<fieldset>
+  <legend>
+  [% IF hint %]
+    <div class="admin-hint">
+      <p>[% hint %]</p>
+    </div>
+  [% END %]
+    [% loc('Categories:') %]
+  </legend>
+
+  [% INCLUDE checkboxes %]
 </fieldset>
-- 
cgit v1.2.3


From 32dadd9c34796a414baf2f8640e03d5ac6a8c0a1 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 17 Aug 2020 13:03:25 +0100
Subject: [Bromley] Fix bug creating response template.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 2 ++
 t/cobrand/bromley.t                    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 859484a4a..4b4363ee3 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -326,6 +326,8 @@ sub add_admin_subcategories {
     my $c = $self->{c};
 
     my $user = $c->stash->{user};
+    return unless $user; # e.g. admin templates, not user
+
     my @subcategories = @{$user->get_extra_metadata('subcategories') || []};
     my %active_contacts = map { $_ => 1 } @subcategories;
 
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index 71180cd3e..6a7a60811 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -220,6 +220,7 @@ subtest 'check special subcategories in admin' => sub {
         ALLOWED_COBRANDS => 'bromley',
         MAPIT_URL => 'http://mapit.uk/',
     }, sub {
+        $mech->get_ok('/admin/templates/' . $body->id . '/new');
         $mech->get_ok('/admin/users/' . $user->id);
         $mech->submit_form_ok({ with_fields => { 'contacts['.$contact->id.']' => 1, 'contacts[BLUE]' => 1 } });
     };
-- 
cgit v1.2.3


From 261be473683fde3df6aa3e50bbb17a3359840b62 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 17 Aug 2020 14:05:35 +0100
Subject: [Highways England] Update reporting message.

---
 templates/web/highwaysengland/report/new/top_message.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/web/highwaysengland/report/new/top_message.html b/templates/web/highwaysengland/report/new/top_message.html
index 98bbd2cd3..4d6b5e73b 100644
--- a/templates/web/highwaysengland/report/new/top_message.html
+++ b/templates/web/highwaysengland/report/new/top_message.html
@@ -1,5 +1,5 @@
 <div class="box-warning">
-    If the issue you’re reporting is safety critical (ie a fallen sign) then do
-    not continue with this report. Please call us on <strong>0300 123
-    5000</strong> from a safe place.
+    If the issue you’re reporting is safety critical (ie a fallen sign or not
+    working traffic light) then do not continue with this report. Please call
+    us on <strong>0300 123 5000</strong> from a safe place.
 </div>
-- 
cgit v1.2.3


From f87b0e3e9c3ca1f67f4ecbff9065f2eeed1e81e9 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 17 Aug 2020 16:44:52 +0100
Subject: Fix undefined value warning.

---
 perllib/FixMyStreet/Reporting.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Reporting.pm b/perllib/FixMyStreet/Reporting.pm
index b5b5876b9..4573d78fc 100644
--- a/perllib/FixMyStreet/Reporting.pm
+++ b/perllib/FixMyStreet/Reporting.pm
@@ -88,7 +88,7 @@ has filename => ( is => 'rw', isa => Str, lazy => 1, default => sub {
         $self->on_updates ? ('updates') : (),
         map {
             my $value = $where{$_};
-            (my $nosp = $value) =~ s/ /-/g;
+            (my $nosp = $value || '') =~ s/ /-/g;
             (defined $value and length $value) ? ($_, $nosp) : ()
         } sort keys %where
 });
-- 
cgit v1.2.3


From fe418a281d1960c128171073b3f77a0599c4f4f1 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 17 Aug 2020 16:49:50 +0100
Subject: [Buckinghamshire] Fix off-road reports on .com.

Off-road flytipping reports were not being categorised on .com
like they were on the Buckinghamshire cobrand.
---
 perllib/FixMyStreet/Cobrand/FixMyStreet.pm |  9 +++++++++
 t/cobrand/bucks.t                          | 22 ++++++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index f39558f45..ca041bf70 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -347,4 +347,13 @@ sub manifest {
     };
 }
 
+sub report_new_munge_before_insert {
+    my ($self, $report) = @_;
+
+    # Make sure TfL reports are marked safety critical
+    $self->SUPER::report_new_munge_before_insert($report);
+
+    FixMyStreet::Cobrand::Buckinghamshire::report_new_munge_before_insert($self, $report);
+}
+
 1;
diff --git a/t/cobrand/bucks.t b/t/cobrand/bucks.t
index 36e149a13..8d99178f5 100644
--- a/t/cobrand/bucks.t
+++ b/t/cobrand/bucks.t
@@ -130,6 +130,24 @@ subtest 'Flytipping not on a road gets recategorised' => sub {
     is $report->category, "Flytipping (off-road)", 'Report was recategorised correctly';
 };
 
+subtest 'Flytipping not on a road on .com gets recategorised' => sub {
+    ok $mech->host("www.fixmystreet.com"), "change host to www";
+    $mech->get_ok('/report/new?latitude=51.615559&longitude=-0.556903&category=Flytipping');
+    $mech->submit_form_ok({
+        with_fields => {
+            title => "Test Report",
+            detail => 'Test report details.',
+            category => 'Flytipping',
+            'road-placement' => 'off-road',
+        }
+    }, "submit details");
+    $mech->content_contains('on its way to the council right now');
+    my $report = FixMyStreet::DB->resultset("Problem")->search(undef, { order_by => { -desc => 'id' } })->first;
+    ok $report, "Found the report";
+    is $report->category, "Flytipping (off-road)", 'Report was recategorised correctly';
+    ok $mech->host("buckinghamshire.fixmystreet.com"), "change host to bucks";
+};
+
 subtest 'Flytipping not on a road going to HE does not get recategorised' => sub {
     $mech->get_ok('/report/new?latitude=51.615559&longitude=-0.556903&category=Flytipping');
     $mech->submit_form_ok({
@@ -151,7 +169,7 @@ subtest 'Flytipping not on a road going to HE does not get recategorised' => sub
 
 subtest 'Ex-district reports are sent to correct emails' => sub {
     FixMyStreet::Script::Reports::send();
-    $mech->email_count_is(2); # one for council, one confirmation for user
+    $mech->email_count_is(4); # (one for council, one confirmation for user) x 2
     my @email = $mech->get_email;
     is $email[0]->header('To'), 'Buckinghamshire <flytipping@chiltern>';
 };
@@ -245,7 +263,7 @@ subtest 'extra CSV columns are present' => sub {
     $mech->get_ok('/dashboard?export=1');
 
     my @rows = $mech->content_as_csv;
-    is scalar @rows, 5, '1 (header) + 4 (reports) = 5 lines';
+    is scalar @rows, 6, '1 (header) + 4 (reports) = 6 lines';
     is scalar @{$rows[0]}, 21, '21 columns present';
 
     is_deeply $rows[0],
-- 
cgit v1.2.3


From 386d4ec5014814070237097f7abeb94ac768ef5d Mon Sep 17 00:00:00 2001
From: Joe Siltberg <git@joesiltberg.se>
Date: Wed, 18 Mar 2020 12:15:29 +0100
Subject: [FixaMinGata] Updates accessibility declaration

---
 templates/web/fixamingata/about/accessibility.html | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/templates/web/fixamingata/about/accessibility.html b/templates/web/fixamingata/about/accessibility.html
index 05e95c918..ee121cff3 100644
--- a/templates/web/fixamingata/about/accessibility.html
+++ b/templates/web/fixamingata/about/accessibility.html
@@ -33,7 +33,6 @@
 </p>
 <ul>
   <li>skicka e-post till <a href="mailto:info@fixamingata.se">info@fixamingata.se</a></li>
-  <!--<li>ring <a href="tel:+46-771-123456">telefonnummer</a></li>-->
 </ul>
 
 <h3>Rapportera brister i webbplatsens tillgänglighet</h3>
@@ -60,12 +59,6 @@
 
 <h3>Innehåll som inte är tillgängligt</h3>
 <h4>Bristande förenlighet med lagkraven</h4>
-<p>
-  Problem vid användning utan hörsel
-</p>
-<ul>
-  <li>Filmen som beskriver hur man använder webbplatsen har inte undertexter.</li>
-</ul>
 <p>
   Användning med nedsatt färgseende
 </p>
@@ -93,7 +86,7 @@
   Vi har gjort en självskattning (intern testning) av FixaMinGata.
 </p>
 <p>
-  Senaste bedömningen gjordes den 6 oktober 2019.
+  Senaste bedömningen gjordes den 31 mars 2020.
 </p>
 <!-- TODO: add 2020-09-23?
      <p>
@@ -104,7 +97,7 @@
 </p>
 -->
 <p>
-  Redogörelsen uppdaterades senast den 6 oktober 2019.
+  Redogörelsen uppdaterades senast den 31 mars 2020.
 </p>
 
 [% INCLUDE 'footer.html' pagefooter = 'yes' %]
-- 
cgit v1.2.3


From 9204e1bfadb0c6d4c2e387d1b6026f6edf7ee3ba Mon Sep 17 00:00:00 2001
From: Joe Siltberg <git@joesiltberg.se>
Date: Wed, 18 Mar 2020 12:27:14 +0100
Subject: [FixaMinGata] Adds accessibility link to the footer.

---
 templates/web/fixamingata/footer_extra.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/web/fixamingata/footer_extra.html b/templates/web/fixamingata/footer_extra.html
index 260b3af2f..67b1fe18b 100644
--- a/templates/web/fixamingata/footer_extra.html
+++ b/templates/web/fixamingata/footer_extra.html
@@ -22,6 +22,10 @@
           <h4>Är du anställd i en kommun?</h4>
           <p>Vill du veta mer om FixaMinGata eller hur det kan fungera för er kommun? <a href="/about/council">Läs mer om FixaMinGata för kommuner</a>.</p>
 	</li>
+	<li>
+	  <h4>Tillgänglighet</h4>
+	  <p>Läs gärna vår <a href="/about/accessibility">tillgänglighetsredogörelse</a>.</p>
+	</li>
       </ul>
     </div>
   </div>
-- 
cgit v1.2.3


From b4d15d8a0e9dd8d2fcd25564d049912772023729 Mon Sep 17 00:00:00 2001
From: Joe Siltberg <git@joesiltberg.se>
Date: Tue, 31 Mar 2020 10:42:14 +0200
Subject: [FixaMinGata] Makes the navigation (hopefully) less confusing.

The sidebar is now only used for internal links within the same page,
and removed from a couple of places.
---
 templates/web/fixamingata/about/_sidebar.html |  0
 templates/web/fixamingata/about/faq-sv.html   |  9 +++++++--
 templates/web/fixamingata/about/privacy.html  | 14 +-------------
 templates/web/fixamingata/footer_extra.html   |  2 +-
 4 files changed, 9 insertions(+), 16 deletions(-)
 create mode 100644 templates/web/fixamingata/about/_sidebar.html

diff --git a/templates/web/fixamingata/about/_sidebar.html b/templates/web/fixamingata/about/_sidebar.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/templates/web/fixamingata/about/faq-sv.html b/templates/web/fixamingata/about/faq-sv.html
index 62721d381..aa88f979b 100755
--- a/templates/web/fixamingata/about/faq-sv.html
+++ b/templates/web/fixamingata/about/faq-sv.html
@@ -7,8 +7,7 @@
             <li><a href="#practical">Praktiska frågor</a></li>
             <li><a href="#organisation">Organisation</a></li>
             <li><a href="#pul">Dataskyddsombud</a></li>
-            <li><a href="/privacy">Offentlighet och kakor</a></li>
-	    <li><a href="/about/accessibility">Tillgänglighet</a></li>
+            <li><a href="#privacy">Sekretess och kakor</a></li>
         </ul>
     </aside>
 </div>
@@ -80,4 +79,10 @@
     <dd>Dataskyddsombud är Britta Sandblom som du kan kontakta via vårt <a href="/contact">kontaktformulär.</a></dd>
 </dl>
 
+<h2><a name="privacy"></a>Sekretess och kakor</h2>
+<dl>
+    <dt>Vill du läsa mer om det juridiska?</dt>
+    <dd>Läs vår information om <a href="/about/privacy">Sekretess och kakor</a>.</dd>
+</dl>
+
 [% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/fixamingata/about/privacy.html b/templates/web/fixamingata/about/privacy.html
index c734711f9..b62a83fe9 100755
--- a/templates/web/fixamingata/about/privacy.html
+++ b/templates/web/fixamingata/about/privacy.html
@@ -1,18 +1,6 @@
 [% INCLUDE 'header.html', title => loc('Vanliga Frågor'), bodyclass => 'twothirdswidthpage' %]
 
-<div class="sticky-sidebar">
-    <aside>
-        <ul class="plain-list">
-            <li><a href="/faq#faq">Vanliga frågor</a></li>
-            <li><a href="/faq#practical">Praktiska frågor</a></li>
-            <li><a href="/faq#organisation">Organisation</a></li>
-            <li><a href="/faq#pul">Dataskyddsombud</a></li>
-            <li><strong>Offentlighet och kakor</strong></li>
-        </ul>
-    </aside>
-</div>
-
-<h1>Offentlighet, kakor och tredjepartstjänster</h1>
+<h1>Sekretess och kakor</h1>
 <p><strong>Vår användning av din information och vad du behöver veta.</strong></p>
 <p>Offentlighetsprincipen är en viktig del i det demokratiska samhället. Genom tryckfrihetsförordningen och offentlighetslagen har du rätt att ta del av allmänna offentliga handlingar hos statliga och kommunala myndigheter. Det kan ge dig insyn i hur förtroendevalda (politiker) och tjänstemän handlägger ärenden, vilka handlingar som kommit in till kommunens olika förvaltningar och vilka som skickats ut.</p>
 <p>Fr.o.m. 2018-05-25 tillämpas ett nytt regelverk inom EU för behandling av personuppgifter &ndash; i Sverige kallad Dataskyddsfördordningen.</p>
diff --git a/templates/web/fixamingata/footer_extra.html b/templates/web/fixamingata/footer_extra.html
index 67b1fe18b..7ff146f06 100644
--- a/templates/web/fixamingata/footer_extra.html
+++ b/templates/web/fixamingata/footer_extra.html
@@ -12,7 +12,7 @@
       <ul>
 	<li>
           <h4>Sekretess och kakor</h4>
-          <p>Vill du veta mer om det juridiska? Läs vår information <a href="/privacy">om Dataskyddsförordning, sekretess och kakor</a>.</p>
+          <p>Vill du veta mer om det juridiska? Läs vår information om <a href="/about/privacy">Sekretess och kakor</a>.</p>
 	</li>
         <li>
           <h4>Är du en utvecklare?</h4>
-- 
cgit v1.2.3


From e7693199ae129a112463cad0f6eb818ad424648a Mon Sep 17 00:00:00 2001
From: Joe Siltberg <git@joesiltberg.se>
Date: Mon, 4 May 2020 10:57:47 +0200
Subject: [FixaMinGata] CSS tweaks for improved accessibility.

---
 web/cobrands/fixamingata/_colours.scss |  9 ++++++---
 web/cobrands/fixamingata/base.scss     |  4 ++++
 web/cobrands/fixamingata/layout.scss   | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/web/cobrands/fixamingata/_colours.scss b/web/cobrands/fixamingata/_colours.scss
index c718a102b..74f39c9f6 100644
--- a/web/cobrands/fixamingata/_colours.scss
+++ b/web/cobrands/fixamingata/_colours.scss
@@ -2,8 +2,8 @@
 
 $menu-image: 'menu-black';
 
-$primary: #00b1da;
-$primary_b: #0087a6;
+$primary: #087FA0;
+$primary_b: #087FA0;
 $primary_text: #222;
 $primary_link_color: $primary_text;
 $primary_link_hover_color: rgba($primary_text, 0.8);
@@ -13,10 +13,13 @@ $base_fg: $primary_text;
 
 $nav_background_colour: #eee;
 $nav_colour: $primary_text;
-$nav_hover_background_colour: #20bbdf;
+$nav_hover_background_colour: $nav_background_colour;
 
 $header-top-border: false;
 
 $col_click_map: #00BD08;
 
 $high-dpi-screen: '-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi';
+
+$link-color: #0000CC;
+$link-hover-color: #0000CC;
diff --git a/web/cobrands/fixamingata/base.scss b/web/cobrands/fixamingata/base.scss
index a708483bc..a231a69f2 100644
--- a/web/cobrands/fixamingata/base.scss
+++ b/web/cobrands/fixamingata/base.scss
@@ -37,3 +37,7 @@
     margin: 1em 0 0.5em;
   }
 }
+
+#pc-hint {
+    color: #444;
+}
diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
index 25e5b260f..a0d5622fb 100644
--- a/web/cobrands/fixamingata/layout.scss
+++ b/web/cobrands/fixamingata/layout.scss
@@ -146,4 +146,36 @@ a#geolocate_link {
     a {
 	border-radius: 5px;
     }
+    span {
+    	 color: $primary_text;
+    	 font-weight: bold;
+    }
+    span.report-a-problem-btn {
+	display: none;
+    }
+    a.report-a-problem-btn {
+	display: none;
+    }
+}
+
+.mappage {
+    .nav-menu--main {
+	span.report-a-problem-btn {
+	    display: block;
+	}
+	a.report-a-problem-btn {
+	    display: block;
+	    border-width: 1px;
+	    border-color: $primary_text;
+	    border-style: solid;
+	}
+    }
+}
+
+body.twothirdswidthpage {
+    .content {
+       aside {
+           background:#fff;
+       }
+    }
 }
-- 
cgit v1.2.3


From 7b60c530ef449747f8b8bfb2bfb0bc7f1a33f474 Mon Sep 17 00:00:00 2001
From: Joe Siltberg <git@joesiltberg.se>
Date: Tue, 18 Aug 2020 08:44:49 +0200
Subject: [FixaMinGata] Adds embedded Youtube video to the council page.

---
 templates/web/fixamingata/about/council.html |  7 ++++++-
 web/cobrands/fixamingata/base.scss           | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/templates/web/fixamingata/about/council.html b/templates/web/fixamingata/about/council.html
index 165c91a46..2a3729c7f 100755
--- a/templates/web/fixamingata/about/council.html
+++ b/templates/web/fixamingata/about/council.html
@@ -16,7 +16,12 @@
 
 <h1>Information för kommuner</h1>
 <p>FixaMinGata är en e-tjänst som drivs av <a href="http://sambruk.se/">Föreningen Sambruk</a> och är framtagen i samarbete med <a href="http://kivos.se/">KIVOS</a> och <a href="http://ffkp.se/">FFKP</a>. ALLA kan använda e-tjänsten för att rapportera fel till kommuner. Tjänsten är en molntjänst och kan snabbt anpassas för en ny kommun. Fel som rapporteras skickas via e-post till berörd enhet på kommunen. För kommuner som har befintliga verksamhetssystem för rapportering och uppföljning finns flera möjligheter att integrera systemen.</p>
-
+<p>
+  <div class="resp-iframe-container">
+    <iframe class="resp-iframe" title="Hör Forshaga kommun berätta om FixaMinGata" src="https://www.youtube.com/embed/wq9Es6Owong" frameborder="0" allowfullscreen="allowfullscreen"></iframe>
+  </div>
+  <div><i>Hör Forshaga kommun berätta om FixaMinGata</i></div>
+</p>
 <h2><a name="kommuner"></a>Kommuner</h2>
 <p>FixaMinGata stödjer samtliga svenska kommuner. Kommuner som deltar i Förvaltningsrådet för FixaMinGata, ges möjlighet att påverka utveckling och framtida inriktning. Medlemskommuner har även säker och prioriterad tillgång till support, samt att vi är behjälpliga i dialogen med olika leverantör vid integration med verksamhetssystem.</p>
 
diff --git a/web/cobrands/fixamingata/base.scss b/web/cobrands/fixamingata/base.scss
index a231a69f2..eeba74951 100644
--- a/web/cobrands/fixamingata/base.scss
+++ b/web/cobrands/fixamingata/base.scss
@@ -41,3 +41,22 @@
 #pc-hint {
     color: #444;
 }
+
+/* This together with resp-iframe below gives us a responsive
+   iframe for the video on the councils page that keeps the
+   correct width/height ratio when the page is resized.
+*/
+.resp-iframe-container {
+    position: relative;
+    overflow: hidden;
+    padding-top: 56.25%;
+}
+
+.resp-iframe {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    border: 0;
+}
-- 
cgit v1.2.3


From 7c71018d25ce89ffb09410c48b4a4f429600aee1 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 18 Aug 2020 12:37:42 +0100
Subject: [Bromley] Requires original list returned.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 4b4363ee3..dd8282fa2 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -326,7 +326,7 @@ sub add_admin_subcategories {
     my $c = $self->{c};
 
     my $user = $c->stash->{user};
-    return unless $user; # e.g. admin templates, not user
+    return $c->stash->{contacts} unless $user; # e.g. admin templates, not user
 
     my @subcategories = @{$user->get_extra_metadata('subcategories') || []};
     my %active_contacts = map { $_ => 1 } @subcategories;
-- 
cgit v1.2.3


From ba318964a69f20e583220bc81c70289d85cc7b6f Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 21 Aug 2020 10:51:43 +0100
Subject: =?UTF-8?q?[Oxfordshire]=20Don=E2=80=99t=20include=20USRN=20in=20r?=
 =?UTF-8?q?eport=20detail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm | 5 -----
 t/cobrand/oxfordshire.t                    | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 1575d7cc1..91c2efdfe 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -147,11 +147,6 @@ sub open311_pre_send {
         my $text = $row->detail . "\n\nAsset Id: $fid\n";
         $row->detail($text);
     }
-
-    if (my $usrn = $row->get_extra_field_value('usrn')) {
-        my $text = $row->detail . "\n\nUSRN: $usrn\n";
-        $row->detail($text);
-    }
 }
 
 sub open311_post_send {
diff --git a/t/cobrand/oxfordshire.t b/t/cobrand/oxfordshire.t
index 5207ba916..cfa98254f 100644
--- a/t/cobrand/oxfordshire.t
+++ b/t/cobrand/oxfordshire.t
@@ -147,11 +147,6 @@ FixMyStreet::override_config {
     FixMyStreet::Script::Reports::send(); # Make sure no waiting reports
 
     for my $test (
-        {
-            field => 'usrn',
-            value => '12345',
-            text => 'USRN',
-        },
         {
             field => 'feature_id',
             value => '12345',
-- 
cgit v1.2.3


From 5430338004cc7169cec02ec83bf2e82683c8d907 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 21 Aug 2020 12:22:50 +0100
Subject: [UK] hide change asset button if category drop downs hidden

The change asset button code relies on the category drop downs being visible
which requires either the change report category or inspect report
permissions. Hide the button if these are not present and only fire the
update button code if it's present.

Fixes mysociety/fixmystreet-commercial#1961
---
 t/app/controller/report_inspect.t                  | 4 ++++
 templates/web/base/report/inspect/information.html | 2 ++
 web/cobrands/fixmystreet/staff.js                  | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index 48dceaf04..96325760c 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -56,12 +56,14 @@ FixMyStreet::override_config {
         $mech->content_lacks('Private');
         $mech->content_lacks('Priority');
         $mech->content_lacks('Traffic management');
+        $mech->content_lacks('Change asset');
         $mech->content_lacks('/admin/report_edit/'.$report_id.'">admin</a>)');
 
         $user->user_body_permissions->create({ body => $oxon, permission_type => 'report_mark_private' });
         $mech->get_ok("/report/$report_id");
         $mech->content_contains('Private');
         $mech->content_contains('Save changes');
+        $mech->content_lacks('Change asset');
         $mech->content_lacks('Priority');
         $mech->content_lacks('Traffic management');
         $mech->content_lacks('/admin/report_edit/'.$report_id.'">admin</a>)');
@@ -71,6 +73,7 @@ FixMyStreet::override_config {
         $mech->content_contains('Private');
         $mech->content_contains('Save changes');
         $mech->content_contains('Priority');
+        $mech->content_lacks('Change asset');
         $mech->content_lacks('Traffic management');
         $mech->content_lacks('/admin/report_edit/'.$report_id.'">admin</a>)');
 
@@ -80,6 +83,7 @@ FixMyStreet::override_config {
         $mech->content_contains('Private');
         $mech->content_contains('Priority');
         $mech->content_contains('Traffic management');
+        $mech->content_contains('Change asset');
         $mech->content_lacks('/admin/report_edit/'.$report_id.'">admin</a>)');
     };
 
diff --git a/templates/web/base/report/inspect/information.html b/templates/web/base/report/inspect/information.html
index bca2a4b60..edebc4a0c 100644
--- a/templates/web/base/report/inspect/information.html
+++ b/templates/web/base/report/inspect/information.html
@@ -54,10 +54,12 @@
           [% END %]
         [% END %]
 
+        [% IF permissions.report_edit_category OR permissions.report_inspect %]
         <!-- These fields are for the asset display code to use -->
         <input type="hidden" name="inspect_category_group" id="inspect_category_group" value="">
         <input type="hidden" name="inspect_form_category" id="inspect_form_category" value="">
         <p>
           <a href="#" class="btn btn--block btn--change-asset">[% loc('Change asset') %]</a>
         </p>
+        [% END %]
       </div>
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index 2422d5476..4bbc0b11d 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -277,7 +277,9 @@ fixmystreet.staff_set_up = {
             $('.btn--change-asset').hide();
         }
     }
-    update_change_asset_button();
+    if ( $('.btn--change-asset').length ) {
+        update_change_asset_button();
+    }
 
     $('.btn--change-asset').on('click', function(e) {
         e.preventDefault();
-- 
cgit v1.2.3


From 8ecf1e549290077c1ea8677d1f4159afb739d631 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 17 Aug 2020 18:18:55 +0100
Subject: Prevent duplicate selected assets in a layer.

---
 web/cobrands/fixmystreet/assets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index 07ccd73d3..6504dd069 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -503,7 +503,7 @@ function layer_visibilitychanged() {
         }
         return;
     } else if (!this.getVisibility()) {
-        asset_unselected.call(this);
+        this.get_select_control().unselectAll();
         this.asset_not_found(); // as trigger won't call on non-visible layers
     }
 
-- 
cgit v1.2.3


From 0bdf5f60b2d6b28aea30a2c9330ebfbe258ece8e Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 18 Aug 2020 10:30:23 +0100
Subject: Fix display of marker pin swapping WFS layers.

If multiple layers are being shown (e.g. Peterborough trees) then the
number of visible layers could go 1 -> 2 -> 3 -> 2, and this code would
get confused and reshow the marker pin even though an asset had been
selected.
---
 web/cobrands/fixmystreet/assets.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index 6504dd069..3d147f038 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -493,6 +493,8 @@ function _update_message(message, c) {
     }
 }
 
+var lastVisible = 0;
+
 function layer_visibilitychanged() {
     if (this.fixmystreet.road) {
         if (!this.getVisibility()) {
@@ -527,12 +529,13 @@ function layer_visibilitychanged() {
             visible++;
         }
     }
-    if (visible === 2 || visible === 0) {
-        // We're either switching WFS layers (so going 1->2->1 or 1->0->1)
-        // or switching off WFS layer (so going 1->0). Either way, we want
-        // to show the marker again.
+    if (visible === 0 || visible > lastVisible) {
+        // We're either switching WFS layers (so going 1->2->1 or 1->0->1 or
+        // even 1->2->3->2) or switching off WFS layer (so going 1->0).
+        // Whichever way, we want to show the marker again.
         fixmystreet.markers.setVisibility(true);
     }
+    lastVisible = visible;
     if (!this.fixmystreet.non_interactive) {
         this.select_nearest_asset();
     }
-- 
cgit v1.2.3


From 98c59e111bb1e8355b8eba3a10f9a5fbf2076d30 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 18 Aug 2020 10:30:43 +0100
Subject: Do not unselect an asset from a different layer.

If a new asset layer is shown before an old one is removed, the removal
could cause the newly selected asset to be unselected, leaving visibly
an asset selected but nothing recorded as being selected behind the
scenes.
---
 web/cobrands/fixmystreet/assets.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index 3d147f038..6ebb0524b 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -399,6 +399,7 @@ function asset_selected(e) {
 
     // Keep track of selection in case layer is reloaded or hidden etc.
     selected_feature = feature.clone();
+    selected_feature.layer = feature.layer;
 
     // Hide the normal markers layer to keep things simple, but
     // move the green marker to the point of the click to stop
@@ -419,6 +420,11 @@ function asset_selected(e) {
 }
 
 function asset_unselected(e) {
+    if (selected_feature.layer !== this) {
+        // The selected feature has already changed to something in a different
+        // layer, so we don't want to mess that up by clearing it
+        return;
+    }
     fixmystreet.markers.setVisibility(true);
     selected_feature = null;
     this.clearAttributeFields();
-- 
cgit v1.2.3


From 51252c8ad919aa7fe0f8c8fe7ac8afadb6de5b18 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 18 Aug 2020 10:31:47 +0100
Subject: Update relevant meta message lines on named asset.

Otherwise, if you switch category and the new asset layer is added
before the old is removed, the old (still visible) layer asset found
would fire but change the meta message of the new layer.
---
 CHANGELOG.md                       | 1 +
 web/cobrands/fixmystreet/assets.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9460a204e..17e39c6f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
         - Improve moderation diff display in a few small ways. #3105
         - Do not have bootstrap run sudo commands. #2930
         - Fix lookups in templates of categories with &s.
+        - Fix a few obscure asset layer changing issues.
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index 6ebb0524b..00dec0542 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -883,7 +883,7 @@ fixmystreet.assets = {
         if (!message) {
             message = get_asset_pick_message.call(this);
         }
-        $('.category_meta_message').html(message);
+        update_message_display.call(this, message);
     },
     named_select_action_not_found: function() {
         var message = get_asset_pick_message.call(this);
-- 
cgit v1.2.3


From 17261b1fe0a7970825178abc206e5c67be7625bd Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 24 Aug 2020 15:04:42 +0100
Subject: [Oxfordshire] For Open311, put asset ID at start of detail.

---
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 91c2efdfe..63f114c27 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -144,7 +144,7 @@ sub open311_pre_send {
     $self->{ox_original_detail} = $row->detail;
 
     if (my $fid = $row->get_extra_field_value('feature_id')) {
-        my $text = $row->detail . "\n\nAsset Id: $fid\n";
+        my $text = "Asset Id: $fid\n\n" . $row->detail;
         $row->detail($text);
     }
 }
-- 
cgit v1.2.3


From bce1e72951585c8292b719eba9f1798620d39639 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 24 Aug 2020 15:04:56 +0100
Subject: [Oxfordshire] Include asset details on report page.

---
 .../web/oxfordshire/report/_council_sent_info.html | 27 ++++++++++++----------
 web/cobrands/oxfordshire/base.scss                 |  8 -------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/templates/web/oxfordshire/report/_council_sent_info.html b/templates/web/oxfordshire/report/_council_sent_info.html
index 8b742cb2e..1dd86c918 100644
--- a/templates/web/oxfordshire/report/_council_sent_info.html
+++ b/templates/web/oxfordshire/report/_council_sent_info.html
@@ -1,13 +1,16 @@
-[% IF problem.whensent || problem.can_display_external_id %]
-    <div class="council_info_box">
-      [% IF problem.can_display_external_id %]
-          [% reference = problem.get_extra_metadata('customer_reference') %]
-        <h3>
-          [% IF reference %]
-              [% problem.external_body %] Council ref:&nbsp;[% reference %]
-          [% END %]
-        </h3>
-      [% END %]
+[% reference = problem.get_extra_metadata('customer_reference') ~%]
+[% feature_id = problem.get_extra_field_value('feature_id') ~%]
+[% column_no = problem.get_extra_field_value('column_no') ~%]
+[% RETURN UNLESS reference OR feature_id OR column_no %]
 
-    </div>
-[% END %]
+<div class="council_info_box">
+  [% IF reference %]
+    <p><strong>Council ref:</strong> [% reference %]</p>
+  [% END %]
+  [% IF feature_id %]
+    <p><strong>Asset ID:</strong> [% feature_id %]</p>
+  [% END %]
+  [% IF column_no %]
+    <p><strong>Column number:</strong> [% column_no %]</p>
+  [% END %]
+</div>
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index a5f7a43d6..fefbc619e 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -152,16 +152,8 @@ dd, p {
   padding: 1em;
   margin: 0 -1em -1em -1em; // counteract 1em padding on sidebar without using .full-width which sets an explicit width
 
-  h3 {
-    font-weight: bold;
-    font-size: 1em;
-    margin: 0 0 0.5em 0;
-  }
-
   p {
-    color: #666;
     margin: 0 0 0.5em 0;
-    font-size: 0.9em;
   }
 
   & > :last-child {
-- 
cgit v1.2.3


From 78be4e28fdb8ad649dde1e0edfd6b7fde3be1bf1 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 24 Aug 2020 15:09:03 +0100
Subject: [Oxfordshire] Show gullies on drainage category.

---
 web/cobrands/oxfordshire/assets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/cobrands/oxfordshire/assets.js b/web/cobrands/oxfordshire/assets.js
index fc9f87064..e2ebcc70e 100644
--- a/web/cobrands/oxfordshire/assets.js
+++ b/web/cobrands/oxfordshire/assets.js
@@ -185,7 +185,7 @@ fixmystreet.assets.add(owned_defaults, {
             TYPENAME: "junctions"
         }
     },
-    asset_category: ["Gully and Catchpits"],
+    asset_category: ["Gully and Catchpits", 'Drainage'],
     asset_item: 'drain'
 });
 
-- 
cgit v1.2.3


From 5a138c796e1a7dab9af115b8e6c12c226df4644d Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 24 Aug 2020 15:12:50 +0100
Subject: [Oxfordshire] Show selected asset name in left column.

---
 web/cobrands/oxfordshire/assets.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/cobrands/oxfordshire/assets.js b/web/cobrands/oxfordshire/assets.js
index e2ebcc70e..1e00bccc4 100644
--- a/web/cobrands/oxfordshire/assets.js
+++ b/web/cobrands/oxfordshire/assets.js
@@ -97,6 +97,7 @@ fixmystreet.assets.add(defaults, {
 });
 
 fixmystreet.assets.add(defaults, {
+    select_action: true,
     stylemap: occ_stylemap,
     wfs_feature: "Traffic_Lights",
     asset_id_field: 'Site',
@@ -104,7 +105,12 @@ fixmystreet.assets.add(defaults, {
         feature_id: 'Site'
     },
     asset_category: ["Traffic Lights (permanent only)"],
-    asset_item: 'traffic light'
+    asset_item: 'traffic light',
+    feature_code: 'Site',
+    actions: {
+        asset_found: fixmystreet.assets.named_select_action_found,
+        asset_not_found: fixmystreet.assets.named_select_action_not_found
+    }
 });
 
 var streetlight_select = $.extend({
-- 
cgit v1.2.3


From d9cf470f321dc334391a35405a527521a3b605d5 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 24 Aug 2020 16:34:59 +0100
Subject: [Hackney] Allow editing & addition of contacts with special
 destination addresses

This adds a cobrand hook to validate the email address provided when editing a contact
in the admin.
---
 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm |  4 +++-
 perllib/FixMyStreet/Cobrand/Hackney.pm             | 26 +++++++++++++++++----
 t/Mock/MapIt.pm                                    |  2 ++
 t/cobrand/hackney.t                                | 27 ++++++++++++++++++++++
 4 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
index 52306af24..f88ad0051 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
@@ -255,7 +255,9 @@ sub update_contact : Private {
     $email =~ s/\s+//g;
     my $send_method = $c->get_param('send_method') || $contact->body->send_method || "";
     my $email_unchanged = $contact->email && $email && $contact->email eq $email;
-    unless ( $send_method eq 'Open311' || $email_unchanged ) {
+    my $cobrand = $contact->body->get_cobrand_handler;
+    my $cobrand_valid = $cobrand && $cobrand->call_hook(validate_contact_email => $email);
+    unless ( $send_method eq 'Open311' || $email_unchanged || $cobrand_valid ) {
         $errors{email} = _('Please enter a valid email') unless is_valid_email_list($email) || $email eq 'REFUSED';
     }
 
diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index 234573e3e..459cf3e4d 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -3,7 +3,7 @@ use parent 'FixMyStreet::Cobrand::Whitelabel';
 
 use strict;
 use warnings;
-use mySociety::EmailUtil qw(is_valid_email);
+use mySociety::EmailUtil qw(is_valid_email is_valid_email_list);
 
 sub council_area_id { return 2508; }
 sub council_area { return 'Hackney'; }
@@ -155,9 +155,7 @@ sub get_body_sender {
 
     my $contact = $body->contacts->search( { category => $problem->category } )->first;
 
-    my $parts = join '\s*', qw(^ park : (.*?) ; estate : (.*?) ; other : (.*?) $);
-    my $regex = qr/$parts/i;
-    if (my ($park, $estate, $other) = $contact->email =~ $regex) {
+    if (my ($park, $estate, $other) = $self->_split_emails($contact->email)) {
         my $to = $other;
         if ($self->problem_is_within_area_type($problem, 'park')) {
             $to = $park;
@@ -184,4 +182,24 @@ sub munge_sendreport_params {
     }
 }
 
+sub _split_emails {
+    my ($self, $email) = @_;
+
+    my $parts = join '\s*', qw(^ park : (.*?) ; estate : (.*?) ; other : (.*?) $);
+    my $regex = qr/$parts/i;
+
+    my ($park, $estate, $other) = $email =~ $regex;
+    return ($park, $estate, $other);
+}
+
+sub validate_contact_email {
+    my ( $self, $email ) = @_;
+
+    return 1 if is_valid_email_list($email);
+
+    my @emails = grep { $_ } $self->_split_emails($email);
+    return unless @emails;
+    return 1 if is_valid_email_list(join(",", @emails));
+}
+
 1;
diff --git a/t/Mock/MapIt.pm b/t/Mock/MapIt.pm
index 760e0ba52..74e360974 100644
--- a/t/Mock/MapIt.pm
+++ b/t/Mock/MapIt.pm
@@ -122,6 +122,8 @@ sub dispatch_request {
             $self->output({2326 => {parent_area => undef, id => 2326, name => "Cheltenham Borough Council", type => "DIS"}});
         } elsif ($areas eq 'UTA') {
             $self->output({2650 => {parent_area => undef, id => 2650, name => "Aberdeen Council", type => "UTA"}});
+        } elsif ($areas eq 'DIS,LBO,MTD,UTA,CTY,COI,LGD') {
+            $self->output({2508 => {parent_area => undef, id => 2508, name => "Hackney Council", type => "LBO"}});
         } elsif ($areas eq 'GRE') {
             $self->output({2493 => {parent_area => undef, id => 2493, name => "Greenwich Borough Council", type => "LBO"}});
         } elsif ($areas eq 'LBO') {
diff --git a/t/cobrand/hackney.t b/t/cobrand/hackney.t
index 374bf2ea9..6ab47a7ce 100644
--- a/t/cobrand/hackney.t
+++ b/t/cobrand/hackney.t
@@ -48,6 +48,10 @@ $hackney_user->user_body_permissions->create({
     body => $hackney,
     permission_type => 'moderate',
 });
+$hackney_user->user_body_permissions->create({
+    body => $hackney,
+    permission_type => 'category_edit',
+});
 
 my $contact2 = $mech->create_contact_ok(
     body_id => $hackney->id,
@@ -291,5 +295,28 @@ subtest "check category extra uses correct name" => sub {
     like $extra_details->{category_extra}, qr/Hackney Council/, 'correct name in category extras';
 };
 
+subtest "can edit special destination email addresses" => sub {
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+        ALLOWED_COBRANDS => ['hackney'],
+        COBRAND_FEATURES => { anonymous_account => { hackney => 'anonymous' } },
+    }, sub {
+        $contact2->update({ send_method => 'Email' });
+        $mech->log_in_ok( $hackney_user->email );
+        $mech->get_ok("/admin/body/" . $hackney->id . "/" . $contact2->category);
+        $mech->submit_form_ok( { with_fields => { email => 'park:parks@example.com;estate:estates@example;other:new@example.org' } },
+            "submit valid new email address");
+        $mech->content_lacks("Please enter a valid email");
+        $contact2->discard_changes;
+        is $contact2->email, 'park:parks@example.com;estate:estates@example;other:new@example.org', "New email addresses saved";
+
+        $mech->get_ok("/admin/body/" . $hackney->id . "/" . $contact2->category);
+        $mech->submit_form_ok( { with_fields => { email => 'invalid' } },
+            "submit invalid new email address");
+        $mech->content_contains("Please enter a valid email");
+        $contact2->discard_changes;
+        is $contact2->email, 'park:parks@example.com;estate:estates@example;other:new@example.org', "Invalid email addresses not saved";
+    };
+};
 
 done_testing();
-- 
cgit v1.2.3


From 470c24e00b12ac82fa7d34534cb9c1bd6cda53ff Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Tue, 25 Aug 2020 11:12:28 +0100
Subject: [Hackney] Increase default zoom level

---
 perllib/FixMyStreet/Cobrand/Hackney.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index 459cf3e4d..5168805c5 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -92,7 +92,7 @@ sub open311_extra_data {
 
 sub map_type { 'OSM' }
 
-sub default_map_zoom { 5 }
+sub default_map_zoom { 6 }
 
 sub admin_user_domain { 'hackney.gov.uk' }
 
-- 
cgit v1.2.3


From f784713cbebb8e9026544ab969a5a3404f736429 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Tue, 25 Aug 2020 17:04:01 +0100
Subject: =?UTF-8?q?Don=E2=80=99t=20display=20duplicate=20categories=20in?=
 =?UTF-8?q?=20filter=20on=20/around=20and=20/my?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 perllib/FixMyStreet/App/Controller/Around.pm |  3 +++
 perllib/FixMyStreet/App/Controller/My.pm     |  3 +++
 t/app/controller/around.t                    | 31 ++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index 4c5c36106..7b98f01f8 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -254,6 +254,9 @@ sub check_and_stash_category : Private {
             distinct => 1
         }
     )->all_sorted;
+    # Ensure only uniquely named categories are shown
+    my %seen;
+    @categories = grep { !$seen{$_->category_display}++ } @categories;
     $c->stash->{filter_categories} = \@categories;
     my %categories_mapped = map { $_->category => 1 } @categories;
     $c->forward('/report/stash_category_groups', [ \@categories ]) if $c->cobrand->enable_category_groups;
diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm
index 9d57c5e1d..52a3a8cef 100644
--- a/perllib/FixMyStreet/App/Controller/My.pm
+++ b/perllib/FixMyStreet/App/Controller/My.pm
@@ -197,6 +197,9 @@ sub setup_page_data : Private {
         distinct => 1,
         order_by => [ "$table.category" ],
     } )->all;
+    # Ensure only uniquely named categories are shown
+    my %seen;
+    @categories = grep { !$seen{$_->category_display}++ } @categories;
     $c->stash->{filter_categories} = \@categories;
 
     if ($c->cobrand->enable_category_groups) {
diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index 29752ab02..3f5d31c02 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -309,6 +309,37 @@ subtest 'check category, status and extra filtering works on /around' => sub {
     is scalar @$pins, 1, 'correct number of external_body reports';
 };
 
+subtest 'check categories with same name are only shown once in filters' => sub {
+    my $params = {
+        postcode  => 'OX20 1SZ',
+        latitude  => 51.754926,
+        longitude => -1.256179,
+    };
+    my $bbox = ($params->{longitude} - 0.01) . ',' .  ($params->{latitude} - 0.01)
+                . ',' . ($params->{longitude} + 0.01) . ',' .  ($params->{latitude} + 0.01);
+
+    my $district = $mech->create_body_ok(2421, "Oxford City");
+    # Identically-named categories should be combined even if their extra metadata is different
+    my $contact2 = $mech->create_contact_ok( category => "Pothole", body_id => $district->id, email => 'pothole@district-example.org' );
+    $contact2->set_extra_metadata(some_extra_field => "dummy");
+    $contact2->update;
+    # And categories with the same display name should be combined too
+    my $contact3 = $mech->create_contact_ok( category => "Pothole (alternative)", body_id => $district->id, email => 'pothole-alternative@district-example.org' );
+    $contact3->set_extra_metadata(display_name => "Pothole");
+    $contact3->update;
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => 'fixmystreet',
+        MAPIT_URL => 'http://mapit.uk/',
+        COBRAND_FEATURES => { category_groups => { fixmystreet => 1 } },
+    }, sub {
+        $mech->get_ok( '/around?bbox=' . $bbox );
+        $mech->content_contains('<option value="Pothole">');
+        $mech->content_unlike(qr{Pothole</option>.*<option value="Pothole">\s*Pothole</option>}s, "Pothole category only appears once");
+        $mech->content_lacks('<option value="Pothole (alternative)">');
+    };
+};
+
 subtest 'check old problems not shown by default on around page' => sub {
     my $params = {
         postcode  => 'OX20 1SZ',
-- 
cgit v1.2.3


From af317bf3ade4694ede7a4d8d163929b8576c7bdd Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 28 Aug 2020 17:56:04 +0100
Subject: [Hackney] Do not match non-special destination addresses.

---
 perllib/FixMyStreet/Cobrand/Hackney.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index 5168805c5..4c035f926 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -188,8 +188,10 @@ sub _split_emails {
     my $parts = join '\s*', qw(^ park : (.*?) ; estate : (.*?) ; other : (.*?) $);
     my $regex = qr/$parts/i;
 
-    my ($park, $estate, $other) = $email =~ $regex;
-    return ($park, $estate, $other);
+    if (my ($park, $estate, $other) = $email =~ $regex) {
+        return ($park, $estate, $other);
+    }
+    return ();
 }
 
 sub validate_contact_email {
-- 
cgit v1.2.3


From 4f96bd558e0b915adef325f27ac5ccd65e9b310f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 4 Jun 2020 16:53:59 +0100
Subject: [IoW] Small refactor of munging functions.

---
 perllib/FixMyStreet/App/Controller/Around.pm |  8 ++---
 perllib/FixMyStreet/Cobrand/FixMyStreet.pm   | 50 ++++++++++++----------------
 perllib/FixMyStreet/Cobrand/IsleOfWight.pm   |  3 +-
 3 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index 7b98f01f8..803bfad58 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -240,12 +240,8 @@ sub check_and_stash_category : Private {
     $c->stash->{bodies_ids} = [ map { $_->id } @bodies];
     $c->{stash}->{list_of_names_as_string} = $csv->string;
 
-    my $where  = { body_id => [ keys %bodies ], };
-
-    my $cobrand_where = $c->cobrand->call_hook('munge_around_category_where', $where );
-    if ( $cobrand_where ) {
-       $where = $cobrand_where;
-    }
+    my $where = { body_id => [ keys %bodies ], };
+    $c->cobrand->call_hook('munge_around_category_where', $where);
 
     my @categories = $c->model('DB::Contact')->not_deleted->search(
         $where,
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index ca041bf70..09f5f5296 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -54,32 +54,33 @@ sub relative_url_for_report {
 sub munge_around_category_where {
     my ($self, $where) = @_;
 
+    my $iow = grep { $_->name eq 'Isle of Wight Council' } @{ $self->{c}->stash->{around_bodies} };
+    if ($iow) {
+        # display all the categories on Isle of Wight at the moment as there's no way to
+        # do the expand bit later as we fetch it using ajax which uses a bounding box so
+        # can't determine the body
+        $where->{send_method} = [ { '!=' => 'Triage' }, undef ];
+    }
+}
+
+sub _iow_category_munge {
+    my ($self, $body, $categories) = @_;
     my $user = $self->{c}->user;
-    my @iow = grep { $_->name eq 'Isle of Wight Council' } @{ $self->{c}->stash->{around_bodies} };
-    return unless @iow;
-
-    # display all the categories on Isle of Wight at the moment as there's no way to
-    # do the expand bit later as we fetch it using ajax which uses a bounding box so
-    # can't determine the body
-    $where->{send_method} = [ { '!=' => 'Triage' }, undef ];
-    return $where;
+
+    if ( $user && ( $user->is_superuser || $user->belongs_to_body( $body->id ) ) ) {
+        @$categories = grep { !$_->send_method || $_->send_method ne 'Triage' } @$categories;
+        return;
+    }
+
+    @$categories = grep { $_->send_method && $_->send_method eq 'Triage' } @$categories;
 }
 
 sub munge_reports_categories_list {
     my ($self, $categories) = @_;
 
     my %bodies = map { $_->body->name => $_->body } @$categories;
-    if ( $bodies{'Isle of Wight Council'} ) {
-        my $user = $self->{c}->user;
-        my $b = $bodies{'Isle of Wight Council'};
-
-        if ( $user && ( $user->is_superuser || $user->belongs_to_body( $b->id ) ) ) {
-            @$categories = grep { !$_->send_method || $_->send_method ne 'Triage' } @$categories;
-            return @$categories;
-        }
-
-        @$categories = grep { $_->send_method && $_->send_method eq 'Triage' } @$categories;
-        return @$categories;
+    if ( my $body = $bodies{'Isle of Wight Council'} ) {
+        return $self->_iow_category_munge($body, $categories);
     }
 }
 
@@ -118,16 +119,9 @@ sub munge_report_new_contacts {
 
     my %bodies = map { $_->body->name => $_->body } @$contacts;
 
-    if ( $bodies{'Isle of Wight Council'} ) {
-        my $user = $self->{c}->user;
-        if ( $user && ( $user->is_superuser || $user->belongs_to_body( $bodies{'Isle of Wight Council'}->id ) ) ) {
-            @$contacts = grep { !$_->send_method || $_->send_method ne 'Triage' } @$contacts;
-            return;
-        }
-
-        @$contacts = grep { $_->send_method && $_->send_method eq 'Triage' } @$contacts;
+    if ( my $body = $bodies{'Isle of Wight Council'} ) {
+        return $self->_iow_category_munge($body, $contacts);
     }
-
     if ( $bodies{'TfL'} ) {
         # Presented categories vary if we're on/off a red route
         my $tfl = FixMyStreet::Cobrand->get_class_for_moniker( 'tfl' )->new({ c => $self->{c} });
diff --git a/perllib/FixMyStreet/Cobrand/IsleOfWight.pm b/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
index 84b916fc2..f6d631a78 100644
--- a/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
+++ b/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
@@ -128,11 +128,10 @@ sub munge_around_category_where {
     my $b = $self->{c}->model('DB::Body')->for_areas( $self->council_area_id )->first;
     if ( $user && ( $user->is_superuser || $user->belongs_to_body( $b->id ) ) ) {
         $where->{send_method} = [ { '!=' => 'Triage' }, undef ];
-        return $where;
+        return;
     }
 
     $where->{'send_method'} = 'Triage';
-    return $where;
 }
 
 sub munge_load_and_group_problems {
-- 
cgit v1.2.3


From 36401150f6ea0775f3c70a30ef871ffd6defa94b Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 29 May 2020 14:37:07 +0100
Subject: [Hounslow] Factor non-map report creation calls.

---
 .../FixMyStreet/App/Controller/Contact/Enquiry.pm  | 12 ++---
 perllib/FixMyStreet/App/Controller/Report/New.pm   | 18 ++++++++
 perllib/FixMyStreet/Cobrand/Hounslow.pm            | 53 ++++++++--------------
 3 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm b/perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm
index 5b1c4980f..da5b9906e 100644
--- a/perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm
+++ b/perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm
@@ -49,15 +49,9 @@ sub submit : Path('submit') : Args(0) {
     $c->set_param('pc', '');
     $c->set_param('skipped', 1);
 
-    $c->forward('/report/new/initialize_report');
-    $c->forward('/report/new/check_for_category');
-    $c->forward('/auth/check_csrf_token');
-    $c->forward('/report/new/process_report');
-    $c->forward('/report/new/process_user');
-    $c->forward('handle_uploads');
-    $c->forward('/photo/process_photo');
-    $c->go('index', [ 1 ]) unless $c->forward('/report/new/check_for_errors');
-    $c->forward('/report/new/save_user_and_report');
+    $c->forward('/report/new/non_map_creation', [ [ '/contact/enquiry/handle_uploads' ] ])
+        or $c->go('index', [ 1 ]);
+
     $c->forward('confirm_report');
     $c->stash->{success} = 1;
 
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index f5933d754..a00251171 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -1785,6 +1785,24 @@ sub generate_category_extra_json : Private {
     return \@fields;
 }
 
+sub non_map_creation : Private {
+    my ($self, $c, $extras) = @_;
+
+    $c->forward('initialize_report');
+    $c->forward('check_for_category');
+    $c->forward('/auth/check_csrf_token');
+    $c->forward('process_report');
+    $c->forward('process_user');
+    if ($extras) {
+        $c->forward($_) for @$extras;
+    }
+    $c->forward('/photo/process_photo');
+    return 0 unless $c->forward('check_for_errors');
+    $c->forward('save_user_and_report');
+    return 1;
+
+}
+
 __PACKAGE__->meta->make_immutable;
 
 1;
diff --git a/perllib/FixMyStreet/Cobrand/Hounslow.pm b/perllib/FixMyStreet/Cobrand/Hounslow.pm
index 5ce22762f..90d3b17dc 100644
--- a/perllib/FixMyStreet/Cobrand/Hounslow.pm
+++ b/perllib/FixMyStreet/Cobrand/Hounslow.pm
@@ -126,40 +126,25 @@ sub open311_skip_report_fetch {
 sub filter_report_description { "" }
 
 sub setup_general_enquiries_stash {
-  my $self = shift;
-
-  my @bodies = $self->{c}->model('DB::Body')->active->for_areas(( $self->council_area_id ))->all;
-  my %bodies = map { $_->id => $_ } @bodies;
-  my @contacts                #
-    = $self->{c}              #
-    ->model('DB::Contact')    #
-    ->active
-    ->search(
-        {
-          'me.body_id' => [ keys %bodies ]
-        },
-        {
-          prefetch => 'body',
-          order_by => 'me.category',
-        }
-      )->all;
-  @contacts = grep {
-    my $groups = $_->groups;
-    grep { $_ eq 'Other' || $_ eq 'General Enquiries' } @$groups;
-  } @contacts;
-  $self->{c}->stash->{bodies} = \%bodies;
-  $self->{c}->stash->{bodies_to_list} = \%bodies;
-  $self->{c}->stash->{contacts} = \@contacts;
-  $self->{c}->stash->{missing_details_bodies} = [];
-  $self->{c}->stash->{missing_details_body_names} = [];
-
-  $self->{c}->set_param('title', "General Enquiry");
-  # Can't use (0, 0) for lat lon so default to the rough location
-  # of Hounslow Highways HQ.
-  $self->{c}->stash->{latitude} = 51.469;
-  $self->{c}->stash->{longitude} = -0.35;
-
-  return 1;
+    my $self = shift;
+    my $c = $self->{c};
+
+    $c->set_param('title', "General Enquiry");
+    # Can't use (0, 0) for lat lon so default to the rough location
+    # of Hounslow Highways HQ.
+    $c->stash->{latitude} = 51.469;
+    $c->stash->{longitude} = -0.35;
+
+    $c->stash->{all_areas} = { $self->council_area_id => { id => $self->council_area_id } };
+    $c->forward('/report/new/setup_categories_and_bodies');
+
+    my $contacts = $c->stash->{contacts};
+    @$contacts = grep {
+        my $groups = $_->groups;
+        grep { $_ eq 'Other' || $_ eq 'General Enquiries' } @$groups;
+    } @$contacts;
+
+    return 1;
 }
 
 sub abuse_reports_only { 1 }
-- 
cgit v1.2.3


From 36f64da7723794e5b3faf674821fcfe4d422ca8b Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 2 Jun 2020 13:22:50 +0100
Subject: Allow extra questions to use a textarea.

---
 templates/web/base/admin/extra-metadata-item.html         | 1 +
 templates/web/base/report/new/category_extras_fields.html | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/templates/web/base/admin/extra-metadata-item.html b/templates/web/base/admin/extra-metadata-item.html
index 66cb6f79c..aa563e851 100644
--- a/templates/web/base/admin/extra-metadata-item.html
+++ b/templates/web/base/admin/extra-metadata-item.html
@@ -67,6 +67,7 @@ DEFAULT behaviour = 'question';
                 <label for="metadata-[% i %]-datatype">[% loc('Display as') %]</label>
                 <select class="form-control" name="metadata[[% i %]].datatype" id="metadata-[% i %]-datatype">
                     <option value="string" data-hide="#metadata-[% i %]-options-group" [% 'selected' IF meta.datatype == 'string' %]>[% loc('Text field') %]</option>
+                    <option value="text" data-hide="#metadata-[% i %]-options-group" [% 'selected' IF meta.datatype == 'text' %]>[% loc('Textarea') %]</option>
                     <option value="singlevaluelist" data-show="#metadata-[% i %]-options-group" [% 'selected' IF meta.datatype == 'singlevaluelist' %]>[% loc('Drop-down list') %]</option>
                 </select>
             </div>
diff --git a/templates/web/base/report/new/category_extras_fields.html b/templates/web/base/report/new/category_extras_fields.html
index 2c728481c..85373a0cf 100644
--- a/templates/web/base/report/new/category_extras_fields.html
+++ b/templates/web/base/report/new/category_extras_fields.html
@@ -21,6 +21,8 @@
               <option value="[% option.key %]"[% IF option.key == report_meta.$x_meta_name.value %] selected[% END %]>[% option.name %]</option>
             [% END %]
           </select>
+        [% ELSIF meta.datatype == 'text' %]
+          <textarea class="form-control" name="[% cat_prefix %][% meta_name %]" id="[% cat_prefix %]form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>[% report_meta.$x_meta_name.value %]</textarea>
         [% ELSE %]
           <input class="form-control" type="[% meta.fieldtype OR 'text' %]" value="[% report_meta.$x_meta_name.value | html %]" name="[% cat_prefix %][% meta_name %]" id="[% cat_prefix %]form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
         [% END %]
-- 
cgit v1.2.3


From 764a6b7f8056d55aeba4656cba279b27a60d6b1a Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 15 Jun 2020 19:16:39 +0100
Subject: [Bexley] Factor out BH code, fix offline test.

---
 perllib/FixMyStreet/Cobrand/Bexley.pm | 37 +-----------------------------
 perllib/FixMyStreet/Cobrand/UK.pm     | 43 +++++++++++++++++++++++++++++++++++
 t/cobrand/bexley.t                    | 10 ++++----
 3 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bexley.pm b/perllib/FixMyStreet/Cobrand/Bexley.pm
index e29856f31..3f52c42b0 100644
--- a/perllib/FixMyStreet/Cobrand/Bexley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bexley.pm
@@ -3,10 +3,6 @@ use parent 'FixMyStreet::Cobrand::Whitelabel';
 
 use strict;
 use warnings;
-use Encode;
-use JSON::MaybeXS;
-use LWP::Simple qw($ua);
-use Path::Tiny;
 use Time::Piece;
 
 sub council_area_id { 2494 }
@@ -221,39 +217,8 @@ sub _is_out_of_hours {
     return 1 if $time->hour > 16 || ($time->hour == 16 && $time->min >= 45);
     return 1 if $time->hour < 8;
     return 1 if $time->wday == 1 || $time->wday == 7;
-    return 1 if _is_bank_holiday();
+    return 1 if FixMyStreet::Cobrand::UK::is_public_holiday();
     return 0;
 }
 
-sub _is_bank_holiday {
-    my $json = _get_bank_holiday_json();
-    my $today = localtime->date;
-    for my $event (@{$json->{'england-and-wales'}{events}}) {
-        if ($event->{date} eq $today) {
-            return 1;
-        }
-    }
-}
-
-sub _get_bank_holiday_json {
-    my $file = 'bank-holidays.json';
-    my $cache_file = path(FixMyStreet->path_to("../data/$file"));
-    my $js;
-    if (-s $cache_file && -M $cache_file <= 7 && !FixMyStreet->config('STAGING_SITE')) {
-        # uncoverable statement
-        $js = $cache_file->slurp_utf8;
-    } else {
-        $ua->timeout(5);
-        $js = LWP::Simple::get("https://www.gov.uk/$file");
-        # uncoverable branch false
-        $js = decode_utf8($js) if !utf8::is_utf8($js);
-        if ($js && !FixMyStreet->config('STAGING_SITE')) {
-            # uncoverable statement
-            $cache_file->spew_utf8($js);
-        }
-    }
-    $js = JSON->new->decode($js) if $js;
-    return $js;
-}
-
 1;
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index 8d464ca7b..3ede055b9 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -2,8 +2,11 @@ package FixMyStreet::Cobrand::UK;
 use base 'FixMyStreet::Cobrand::Default';
 use strict;
 
+use Encode;
 use JSON::MaybeXS;
 use LWP::UserAgent;
+use Path::Tiny;
+use Time::Piece;
 use mySociety::MaPit;
 use mySociety::VotingArea;
 use Utils;
@@ -449,4 +452,44 @@ sub check_recaptcha {
         unless $res->{success};
 }
 
+sub is_public_holiday {
+    my %args = @_;
+    $args{date} ||= localtime;
+    $args{date} = $args{date}->date;
+    $args{nation} ||= 'england-and-wales';
+    my $json = _get_bank_holiday_json();
+    for my $event (@{$json->{$args{nation}}{events}}) {
+        if ($event->{date} eq $args{date}) {
+            return 1;
+        }
+    }
+}
+
+sub _get_bank_holiday_json {
+    my $file = 'bank-holidays.json';
+    my $cache_file = path(FixMyStreet->path_to("../data/$file"));
+    my $js;
+    if (-s $cache_file && -M $cache_file <= 7 && !FixMyStreet->config('STAGING_SITE')) {
+        # uncoverable statement
+        $js = $cache_file->slurp_utf8;
+    } else {
+        $js = _fetch_url("https://www.gov.uk/$file");
+        # uncoverable branch false
+        $js = decode_utf8($js) if !utf8::is_utf8($js);
+        if ($js && !FixMyStreet->config('STAGING_SITE')) {
+            # uncoverable statement
+            $cache_file->spew_utf8($js);
+        }
+    }
+    $js = JSON->new->decode($js) if $js;
+    return $js;
+}
+
+sub _fetch_url {
+    my $url = shift;
+    my $ua = LWP::UserAgent->new;
+    $ua->timeout(5);
+    $ua->get($url)->content;
+}
+
 1;
diff --git a/t/cobrand/bexley.t b/t/cobrand/bexley.t
index 91e30ff50..8ce6c45f2 100644
--- a/t/cobrand/bexley.t
+++ b/t/cobrand/bexley.t
@@ -256,9 +256,10 @@ subtest 'geocoder' => sub {
     ] };
 };
 
-my $bex = Test::MockModule->new('FixMyStreet::Cobrand::Bexley');
-$bex->mock('get', sub {
-    return <<EOF
+subtest 'out of hours' => sub {
+    my $lwp = Test::MockModule->new('LWP::UserAgent');
+    $lwp->mock('get', sub {
+        HTTP::Response->new(200, 'OK', [], <<EOF);
 {
     "england-and-wales": {
         "events": [
@@ -267,9 +268,8 @@ $bex->mock('get', sub {
     }
 }
 EOF
-});
+    });
 
-subtest 'out of hours' => sub {
     my $cobrand = FixMyStreet::Cobrand::Bexley->new;
     set_fixed_time('2019-10-16T12:00:00Z');
     is $cobrand->_is_out_of_hours(), 0, 'not out of hours in the day';
-- 
cgit v1.2.3


From 32c80504c0f4aad36f7d9eaef5ff3f2f6d851b77 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 16 Jun 2020 16:04:21 +0100
Subject: [Zurich] Factor out working days calculator.

---
 perllib/FixMyStreet/Cobrand/Zurich.pm | 43 ++++---------------
 perllib/FixMyStreet/WorkingDays.pm    | 78 +++++++++++++++++++++++++++++++++++
 t/workingdays.t                       | 21 ++++++++++
 3 files changed, 106 insertions(+), 36 deletions(-)
 create mode 100644 perllib/FixMyStreet/WorkingDays.pm
 create mode 100644 t/workingdays.t

diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 5635939ac..4b893af40 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -10,6 +10,7 @@ use DateTime::Format::Pg;
 use Try::Tiny;
 
 use FixMyStreet::Geocode::Zurich;
+use FixMyStreet::WorkingDays;
 
 use strict;
 use warnings;
@@ -221,7 +222,7 @@ sub get_body_sender {
 
 # Report overdue functions
 
-my %public_holidays = map { $_ => 1 } (
+my @public_holidays = (
     # New Year's Day, Saint Berchtold, Good Friday, Easter Monday,
     # Sechseläuten, Labour Day, Ascension Day, Whit Monday,
     # Swiss National Holiday, Knabenschiessen, Christmas, St Stephen's Day
@@ -247,53 +248,23 @@ my %public_holidays = map { $_ => 1 } (
     '2021-09-13',
 );
 
-sub is_public_holiday {
-    my $dt = shift;
-    return $public_holidays{$dt->ymd};
-}
-
-sub is_weekend {
-    my $dt = shift;
-    return $dt->dow > 5;
-}
-
-sub add_days {
-    my ( $dt, $days ) = @_;
-    $dt = $dt->clone;
-    while ( $days > 0 ) {
-        $dt->add ( days => 1 );
-        next if is_public_holiday($dt) or is_weekend($dt);
-        $days--;
-    }
-    return $dt;
-}
-
-sub sub_days {
-    my ( $dt, $days ) = @_;
-    $dt = $dt->clone;
-    while ( $days > 0 ) {
-        $dt->subtract ( days => 1 );
-        next if is_public_holiday($dt) or is_weekend($dt);
-        $days--;
-    }
-    return $dt;
-}
-
 sub overdue {
     my ( $self, $problem ) = @_;
 
     my $w = $problem->created;
     return 0 unless $w;
 
+    my $wd = FixMyStreet::WorkingDays->new( public_holidays => \@public_holidays );
+
     # call with previous state
     if ( $problem->state eq 'submitted' ) {
         # One working day
-        $w = add_days( $w, 1 );
+        $w = $wd->add_days( $w, 1 );
         return $w < DateTime->now() ? 1 : 0;
     } elsif ( $problem->state eq 'confirmed' || $problem->state eq 'in progress' || $problem->state eq 'feedback pending' ) {
         # States which affect the subdiv_overdue statistic.  TODO: this may no longer be required
         # Six working days from creation
-        $w = add_days( $w, 6 );
+        $w = $wd->add_days( $w, 6 );
         return $w < DateTime->now() ? 1 : 0;
 
     # call with new state
@@ -301,7 +272,7 @@ sub overdue {
         # States which affect the closed_overdue statistic
         # Five working days from moderation (so 6 from creation)
 
-        $w = add_days( $w, 6 );
+        $w = $wd->add_days( $w, 6 );
         return $w < DateTime->now() ? 1 : 0;
     }
 }
diff --git a/perllib/FixMyStreet/WorkingDays.pm b/perllib/FixMyStreet/WorkingDays.pm
new file mode 100644
index 000000000..615b226c6
--- /dev/null
+++ b/perllib/FixMyStreet/WorkingDays.pm
@@ -0,0 +1,78 @@
+package FixMyStreet::WorkingDays;
+
+use Moo;
+
+=head1 FixMyStreet::WorkingDays
+
+Given a list of public holiday dates, creates an object that can be used to
+add/subtract days from a date, only counting working days (excluding public
+holidays and weekends).
+
+=over
+
+=cut
+
+has public_holidays => (
+    is => 'ro',
+    coerce => sub {
+        return { map { $_ => 1 } @{$_[0]} };
+    },
+);
+
+=item add_days
+
+Given a DateTime object and a number of days, returns a new DateTime object
+that many working days (excluding public holidays and weekends) later.
+
+=cut
+
+sub add_days {
+    my ( $self, $dt, $days, $subtract ) = @_;
+    $dt = $dt->clone;
+    while ( $days > 0 ) {
+        $dt->add ( days => $subtract ? -1 : 1 );
+        next if $self->is_public_holiday($dt);
+        next if $self->is_weekend($dt);
+        $days--;
+    }
+    return $dt;
+}
+
+=item sub_days
+
+Given a DateTime object and a number of days, returns a new DateTime object
+that many working days (excluding public holidays and weekends) earlier.
+
+=cut
+
+sub sub_days {
+    my $self = shift;
+    return $self->add_days(@_, 1);
+}
+
+=item is_public_holiday
+
+Given a DateTime object, return true if it is a public holiday.
+
+=cut
+
+sub is_public_holiday {
+    my ($self, $dt) = @_;
+    return $self->public_holidays->{$dt->ymd};
+}
+
+=item is_weekend
+
+Given a DateTime object, return true if it is a weekend.
+
+=cut
+
+sub is_weekend {
+    my ($self, $dt) = @_;
+    return $dt->dow > 5;
+}
+
+1;
+
+=back
+
diff --git a/t/workingdays.t b/t/workingdays.t
new file mode 100644
index 000000000..326cf05c9
--- /dev/null
+++ b/t/workingdays.t
@@ -0,0 +1,21 @@
+use Test::More;
+use DateTime;
+
+use_ok 'FixMyStreet::WorkingDays';
+
+
+my $wd = FixMyStreet::WorkingDays->new(
+    public_holidays => [
+        '2020-09-21',
+        '2020-09-15',
+    ],
+);
+
+my $dt = DateTime->new(year => 2020, month => 9, day => 19);
+
+is $wd->add_days($dt, 1)->ymd, '2020-09-22';
+is $wd->sub_days($dt, 5)->ymd, '2020-09-11';
+is $wd->is_public_holiday($dt), undef;
+is $wd->is_weekend($dt), 1;
+
+done_testing;
-- 
cgit v1.2.3


From 43f92bcb01f04fe48eb87ff3a42afbf58540c690 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Wed, 2 Sep 2020 16:20:24 +0100
Subject: [Zurich] Update wording of confirmation email.

---
 templates/email/zurich/problem-confirm.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/email/zurich/problem-confirm.txt b/templates/email/zurich/problem-confirm.txt
index f7216ea9c..2a4b29986 100644
--- a/templates/email/zurich/problem-confirm.txt
+++ b/templates/email/zurich/problem-confirm.txt
@@ -1,8 +1,8 @@
-Subject: Züri wie neu: Meldung #[% report.id %]
+Subject: Züri wie neu: Bitte bestätigen Sie Ihre Meldung #[% report.id %]
 
 Grüezi [% report.name %]
 
-Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Klicken Sie bitte auf diesen Link, um[% UNLESS email_confirmed %] Ihre E-Mail-Adresse zu bestätigen und[% END %] über den Status der Meldung informiert zu bleiben. Falls der Link nicht funktioniert, kopieren Sie ihn in Ihren Browser:
+Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Klicken Sie bitte auf diesen Link, um[% UNLESS email_confirmed %] Ihre Meldung zu bestätigen und[% END %] über den Status ihrer Meldung per E-Mail informiert zu bleiben. Falls der Link nicht funktioniert, kopieren Sie ihn in Ihren Browser:
 
 [% token_url %]
 
-- 
cgit v1.2.3


From f98bb79a77866fb08ec95f5e64f07faa0ba42ceb Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 18 Jun 2020 16:29:56 +0100
Subject: [Peterborough] add extra open311 properties for bartec

Bartec uses these to look up the UPRN of the property.
---
 perllib/FixMyStreet/Cobrand/Peterborough.pm |  9 +++++
 t/cobrand/peterborough.t                    | 61 ++++++++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Peterborough.pm b/perllib/FixMyStreet/Cobrand/Peterborough.pm
index dd6592a7c..199fcdd36 100644
--- a/perllib/FixMyStreet/Cobrand/Peterborough.pm
+++ b/perllib/FixMyStreet/Cobrand/Peterborough.pm
@@ -51,6 +51,15 @@ around open311_extra_data_include => sub {
             $_->{value} .= "\n\nSkanska CSC ref: $ref->{value}" if $ref;
         }
     }
+    if ( $row->geocode && $row->contact->email =~ /Bartec/ ) {
+        my $address = $row->geocode->{resourceSets}->[0]->{resources}->[0]->{address};
+        my ($number, $street) = $address->{addressLine} =~ /\s*(\d*)\s*(.*)/;
+        push @$open311_only, (
+            { name => 'postcode', value => $address->{postalCode} },
+            { name => 'house_no', value => $number },
+            { name => 'street', value => $street }
+        );
+    }
     return $open311_only;
 };
 # remove categories which are informational only
diff --git a/t/cobrand/peterborough.t b/t/cobrand/peterborough.t
index 5d07acb9f..5b461d4f2 100644
--- a/t/cobrand/peterborough.t
+++ b/t/cobrand/peterborough.t
@@ -64,7 +64,7 @@ subtest "extra update params are sent to open311" => sub {
             test_get_returns => { 'servicerequestupdates.xml' => $test_res },
         );
 
-        my ($p) = $mech->create_problems_for_body(1, $peterborough->id, 'Title', { external_id => 1, category => 'Trees' });
+        my ($p) = $mech->create_problems_for_body(1, $peterborough->id, 'Title', { external_id => 1, category => 'Trees', whensent => DateTime->now });
 
         my $c = FixMyStreet::DB->resultset('Comment')->create({
             problem => $p, user => $p->user, anonymous => 't', text => 'Update text',
@@ -81,4 +81,63 @@ subtest "extra update params are sent to open311" => sub {
     };
 };
 
+subtest "bartec report with no gecode handled correctly" => sub {
+    FixMyStreet::override_config {
+        STAGING_FLAGS => { send_reports => 1 },
+        MAPIT_URL => 'http://mapit.uk/',
+        ALLOWED_COBRANDS => 'peterborough',
+    }, sub {
+        my $contact = $mech->create_contact_ok(body_id => $peterborough->id, category => 'Bins', email => 'Bartec-Bins');
+        my ($p) = $mech->create_problems_for_body(1, $peterborough->id, 'Title', { category => 'Bins', latitude => 52.5608, longitude => 0.2405, cobrand => 'peterborough' });
+
+        my $test_data = FixMyStreet::Script::Reports::send();
+
+        $p->discard_changes;
+        ok $p->whensent, 'Report marked as sent';
+
+        my $req = $test_data->{test_req_used};
+        my $cgi = CGI::Simple->new($req->content);
+        is $cgi->param('attribute[postcode]'), undef, 'postcode param not set';
+        is $cgi->param('attribute[house_no]'), undef, 'house_no param not set';
+        is $cgi->param('attribute[street]'), undef, 'street param not set';
+    };
+};
+
+subtest "extra bartec params are sent to open311" => sub {
+    FixMyStreet::override_config {
+        STAGING_FLAGS => { send_reports => 1 },
+        MAPIT_URL => 'http://mapit.uk/',
+        ALLOWED_COBRANDS => 'peterborough',
+    }, sub {
+        my ($p) = $mech->create_problems_for_body(1, $peterborough->id, 'Title', {
+            category => 'Bins',
+            latitude => 52.5608,
+            longitude => 0.2405,
+            cobrand => 'peterborough',
+            geocode => {
+                resourceSets => [ {
+                    resources => [ {
+                        address => {
+                            addressLine => '12 A Street',
+                            postalCode => 'XX1 1XZ'
+                        }
+                    } ]
+                } ]
+            }
+        } );
+
+        my $test_data = FixMyStreet::Script::Reports::send();
+
+        $p->discard_changes;
+        ok $p->whensent, 'Report marked as sent';
+
+        my $req = $test_data->{test_req_used};
+        my $cgi = CGI::Simple->new($req->content);
+        is $cgi->param('attribute[postcode]'), 'XX1 1XZ', 'postcode param sent';
+        is $cgi->param('attribute[house_no]'), '12', 'house_no param sent';
+        is $cgi->param('attribute[street]'), 'A Street', 'street param sent';
+    };
+};
+
+
 done_testing;
-- 
cgit v1.2.3


From 605bf09d3d37b2421e7a424f03a7219372d01acb Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Wed, 1 Jul 2020 12:02:09 +0100
Subject: [Peterborough] litter and dog bin assets

---
 web/cobrands/peterborough/assets.js | 38 +++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/web/cobrands/peterborough/assets.js b/web/cobrands/peterborough/assets.js
index ad898caec..9470ea26f 100644
--- a/web/cobrands/peterborough/assets.js
+++ b/web/cobrands/peterborough/assets.js
@@ -163,4 +163,42 @@ fixmystreet.assets.add(light_defaults, {
     asset_item_message: ''
 });
 
+var bin_defaults = $.extend(true, {}, defaults, {
+    class: OpenLayers.Layer.PeterboroughVectorAsset,
+    select_action: true,
+    actions: {
+        asset_found: fixmystreet.message_controller.asset_found,
+        asset_not_found: fixmystreet.message_controller.asset_not_found
+    },
+    attributes: {
+        asset_details: function() {
+            var a = this.attributes;
+            return a.Reference + ", " + a.Location;
+        },
+        central_asset_id: 'OBJECTID'
+    },
+    asset_id_field: 'OBJECTID',
+    asset_type: 'spot'
+});
+
+fixmystreet.assets.add(bin_defaults, {
+    http_options: {
+      params: {
+        TYPENAME: 'LitterBins'
+      }
+    },
+    asset_category: 'Litter bin',
+    asset_item: 'litter bin'
+});
+
+fixmystreet.assets.add(bin_defaults, {
+    http_options: {
+      params: {
+        TYPENAME: 'DogBins'
+      }
+    },
+    asset_category: 'Dog bin',
+    asset_item: 'dog waste bin'
+});
+
 })();
-- 
cgit v1.2.3


From 7048c1fd5a83714641029ab1d0b22574a64388bd Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Wed, 15 Jul 2020 12:14:07 +0100
Subject: [Peterborough] add display name field to admin for categories

---
 perllib/FixMyStreet/Cobrand/Peterborough.pm         |  2 ++
 .../peterborough/admin/bodies/_category_field.html  | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 templates/web/peterborough/admin/bodies/_category_field.html

diff --git a/perllib/FixMyStreet/Cobrand/Peterborough.pm b/perllib/FixMyStreet/Cobrand/Peterborough.pm
index 199fcdd36..cb7da18af 100644
--- a/perllib/FixMyStreet/Cobrand/Peterborough.pm
+++ b/perllib/FixMyStreet/Cobrand/Peterborough.pm
@@ -32,6 +32,8 @@ sub disambiguate_location {
 
 sub get_geocoder { 'OSM' }
 
+sub contact_extra_fields { [ 'display_name' ] }
+
 sub geocoder_munge_results {
     my ($self, $result) = @_;
     $result->{display_name} = '' unless $result->{display_name} =~ /City of Peterborough/;
diff --git a/templates/web/peterborough/admin/bodies/_category_field.html b/templates/web/peterborough/admin/bodies/_category_field.html
new file mode 100644
index 000000000..6497e3511
--- /dev/null
+++ b/templates/web/peterborough/admin/bodies/_category_field.html
@@ -0,0 +1,21 @@
+[% IF contact.in_storage %]
+    <h1>[% contact.category | html %]</h1>
+    <input type="hidden" name="category" value="[% contact.category | html %]" >
+
+    <div class="admin-hint">
+        <p>A display name will be used in preference to the main category name on web pages and dropdown menus, but not in URLs.</p>
+  </div>
+
+    <p>
+      <label>
+      Display name:
+      <input type="text" class="form-control" name="extra[display_name]" id="display_name"
+        value="[% contact.get_extra_metadata('display_name') | html %]" size="30">
+      </label>
+    </p>
+
+[% ELSE %]
+    <p>
+      <strong>[% loc('Category') %] </strong><input type="text" class="form-control" name="category" size="30" value="[% contact.category | html %]" required>
+    </p>
+[% END %]
-- 
cgit v1.2.3


From 4b6baae9c4ac6353357a2f46355aa7eb9c8c10ec Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 21 Aug 2020 13:41:20 +0100
Subject: [UK] enable extra state mapping in config

Add a cobrand feature that enables a state and external status
combination to be mapped to a new display string.
---
 perllib/FixMyStreet/Cobrand/Northamptonshire.pm | 13 ----
 perllib/FixMyStreet/Cobrand/UKCouncils.pm       | 13 ++++
 t/cobrand/northamptonshire.t                    | 79 +++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 13 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm
index 26c8706cc..791e2f83f 100644
--- a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm
@@ -75,19 +75,6 @@ sub problems_on_map_restriction {
     return $self->problems_restriction($rs);
 }
 
-sub problem_state_processed {
-    my ($self, $comment) = @_;
-
-    my $state = $comment->problem_state || '';
-    my $code = $comment->get_extra_metadata('external_status_code') || '';
-
-    if ( $state eq 'investigating' and $code eq 'further' ) {
-        $state = 'Under further investigation';
-    }
-
-    return $state;
-}
-
 sub privacy_policy_url {
     'https://www3.northamptonshire.gov.uk/councilservices/council-and-democracy/transparency/information-policies/privacy-notice/place/Pages/street-doctor.aspx'
 }
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 4634f4b14..f472876ef 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -270,6 +270,19 @@ sub relative_url_for_report {
     return FixMyStreet->config('BASE_URL');
 }
 
+sub problem_state_processed {
+    my ($self, $comment) = @_;
+
+    my $state = $comment->problem_state || '';
+    my $code = $comment->get_extra_metadata('external_status_code') || '';
+
+    my $cfg = $self->feature('extra_state_mapping');
+
+    $state = ( $cfg->{$state}->{$code} || $state ) if $cfg->{$state};
+
+    return $state;
+}
+
 sub admin_allow_user {
     my ( $self, $user ) = @_;
     return 1 if $user->is_superuser;
diff --git a/t/cobrand/northamptonshire.t b/t/cobrand/northamptonshire.t
index 11b22bdb0..5758f700f 100644
--- a/t/cobrand/northamptonshire.t
+++ b/t/cobrand/northamptonshire.t
@@ -114,6 +114,15 @@ subtest 'check further investigation state' => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
         MAPIT_URL => 'http://mapit.uk/',
+        COBRAND_FEATURES => {
+            extra_state_mapping => {
+                northamptonshire => {
+                    investigating => {
+                        further => 'Under further investigation'
+                    }
+                }
+            }
+        }
     }, sub {
         $mech->get_ok('/report/' . $comment->problem_id);
     };
@@ -126,6 +135,76 @@ subtest 'check further investigation state' => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
         MAPIT_URL => 'http://mapit.uk/',
+        COBRAND_FEATURES => {
+            extra_state_mapping => {
+                northamptonshire => {
+                    investigating => {
+                        further => 'Under further investigation'
+                    }
+                }
+            }
+        }
+    }, sub {
+        $mech->get_ok('/report/' . $comment->problem_id);
+    };
+
+    $mech->content_contains('Under further investigation');
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+        COBRAND_FEATURES => {
+            extra_state_mapping => {
+                northamptonshire => {
+                    fixed => {
+                        further => 'Under further investigation'
+                    }
+                },
+                fixmystreet => {
+                    'Northamptonshire County Council' => {
+                        fixed => {
+                            further => 'Under further investigation'
+                        }
+                    }
+                }
+            }
+        }
+    }, sub {
+        $mech->get_ok('/report/' . $comment->problem_id);
+    };
+
+    $mech->content_contains('Investigating');
+    $mech->content_lacks('Under further investigation');
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $mech->get_ok('/report/' . $comment->problem_id);
+    };
+
+    $mech->content_contains('Investigating');
+    $mech->content_lacks('Under further investigation');
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+        COBRAND_FEATURES => {
+            extra_state_mapping => {
+                northamptonshire => {
+                    investigating => {
+                        further => 'Under further investigation'
+                    }
+                },
+                fixmystreet => {
+                    'Northamptonshire County Council' => {
+                        investigating => {
+                            further => 'Under further investigation'
+                        }
+                    }
+                }
+            }
+        }
     }, sub {
         $mech->get_ok('/report/' . $comment->problem_id);
     };
-- 
cgit v1.2.3


From 5da5a6ee1f85df8946c795af82b6353a31eb1d97 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 21 Aug 2020 13:48:57 +0100
Subject: [UK] enable extra state mapping on .com

---
 perllib/FixMyStreet/Cobrand/FixMyStreet.pm | 13 +++++++++++
 t/cobrand/northamptonshire.t               | 36 ++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index 09f5f5296..7344a0f5e 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -304,6 +304,19 @@ sub updates_disallowed {
     return $self->next::method(@_);
 }
 
+sub problem_state_processed {
+    my ($self, $comment) = @_;
+
+    my $state = $comment->problem_state || '';
+    my $code = $comment->get_extra_metadata('external_status_code') || '';
+
+    my ($cfg) = $self->per_body_config('extra_state_mapping', $comment->problem);
+
+    $state = ( $cfg->{$state}->{$code} || $state ) if $cfg->{$state};
+
+    return $state;
+}
+
 sub suppress_reporter_alerts {
     my $self = shift;
     my $c = $self->{c};
diff --git a/t/cobrand/northamptonshire.t b/t/cobrand/northamptonshire.t
index 5758f700f..766922c4a 100644
--- a/t/cobrand/northamptonshire.t
+++ b/t/cobrand/northamptonshire.t
@@ -210,6 +210,42 @@ subtest 'check further investigation state' => sub {
     };
 
     $mech->content_contains('Under further investigation');
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+        COBRAND_FEATURES => {
+            extra_state_mapping => {
+                northamptonshire => {
+                    fixed => {
+                        further => 'Under further investigation'
+                    }
+                },
+                fixmystreet => {
+                    'Northamptonshire County Council' => {
+                        fixed => {
+                            further => 'Under further investigation'
+                        }
+                    }
+                }
+            }
+        }
+    }, sub {
+        $mech->get_ok('/report/' . $comment->problem_id);
+    };
+
+    $mech->content_contains('Investigating');
+    $mech->content_lacks('Under further investigation');
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $mech->get_ok('/report/' . $comment->problem_id);
+    };
+
+    $mech->content_contains('Investigating');
+    $mech->content_lacks('Under further investigation');
 };
 
 subtest 'check pin colour / reference shown' => sub {
-- 
cgit v1.2.3


From 342e235b916696da4ef7982885cefe0f8b069adf Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Mon, 31 Aug 2020 12:37:15 +0100
Subject: make override config use a readonly hash

The actual config uses a readonly hash so make the overridden config
readonly too otherwise you end up with subtle bugs which tests don't
catch.
---
 perllib/FixMyStreet.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet.pm b/perllib/FixMyStreet.pm
index 94ba7685f..5b8dda079 100644
--- a/perllib/FixMyStreet.pm
+++ b/perllib/FixMyStreet.pm
@@ -97,6 +97,9 @@ sub override_config($&) {
 
     mySociety::MaPit::configure($config->{MAPIT_URL}) if $config->{MAPIT_URL};
 
+    use Readonly;
+    Readonly my %ro_config => %$config;
+
     # NB: though we have this, templates tend to use [% c.config %].
     # This overriding happens after $c->config is set, so note that
     # FixMyStreet::App->setup_request rewrites $c->config if we are in
@@ -106,8 +109,8 @@ sub override_config($&) {
         "FixMyStreet::config",
         sub {
             my ($class, $key) = @_;
-            return { %CONFIG, %$config } unless $key;
-            return $config->{$key} if exists $config->{$key};
+            return { %CONFIG, %ro_config } unless $key;
+            return $ro_config{$key} if exists $ro_config{$key};
             return $CONFIG{$key} if exists $CONFIG{$key};
         }
     );
-- 
cgit v1.2.3


From 1a3e36a5efcff2d0247729883e5edd0425216292 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 11 Sep 2020 17:27:19 +0100
Subject: do not use an invalid update state in a test

It's not possible to every have a comment where mark_fixed is true and
the problem_state is 'fixed - council' so update the test accordingly.
---
 t/app/controller/report_updates.t | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 0b60ac02b..92cbed861 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -844,8 +844,9 @@ subtest "check comment with no status change has not status in meta" => sub {
         $user->from_body( undef );
         $user->update;
 
+        $report->update( { state => 'fixed - user' } );
         my $comment = $report->comments->first;
-        $comment->update( { mark_fixed => 1, problem_state => 'fixed - council' } );
+        $comment->update( { mark_fixed => 1, problem_state => 'fixed - user' } );
 
         $mech->get_ok("/report/$report_id");
 
@@ -871,8 +872,8 @@ subtest "check comment with no status change has not status in meta" => sub {
 
         my $update = pop @updates;
 
-        is $report->state, 'fixed - council', 'correct report state';
-        is $update->problem_state, 'fixed - council', 'correct update state';
+        is $report->state, 'fixed - user', 'correct report state';
+        is $update->problem_state, 'fixed - user', 'correct update state';
         my $update_meta = $mech->extract_update_metas;
         unlike $update_meta->[1], qr/State changed to/, 'update meta does not include state change';
 
-- 
cgit v1.2.3


From 5873e9f70543092a0284e798f70f6c5c7a3de4e1 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 11 Sep 2020 17:28:43 +0100
Subject: use problem_state_processed for comment state in templates

In order for the states based on the external status to be correct the
updates template needs to compare problem_state_processed instead of
problem_state.
---
 t/cobrand/northamptonshire.t                 | 55 +++++++++++++++++++++++-----
 templates/web/base/report/_update_state.html |  4 +-
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/t/cobrand/northamptonshire.t b/t/cobrand/northamptonshire.t
index 766922c4a..36a2c4638 100644
--- a/t/cobrand/northamptonshire.t
+++ b/t/cobrand/northamptonshire.t
@@ -52,7 +52,7 @@ $ncc->update( { comment_user_id => $counciluser->id } );
 
 subtest 'Check district categories hidden on cobrand' => sub {
     FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
+        ALLOWED_COBRANDS=> 'northamptonshire',
         MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->get_ok( '/around' );
@@ -70,7 +70,7 @@ subtest 'Check district categories hidden on cobrand' => sub {
 
 subtest 'Check updates not sent for defects' => sub {
     FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
+        ALLOWED_COBRANDS=> 'northamptonshire',
         MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         my $updates = Open311::PostServiceRequestUpdates->new();
@@ -86,7 +86,7 @@ $report->update({ user => $user });
 $comment->update({ extra => undef });
 subtest 'check updates sent for non defects' => sub {
     FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
+        ALLOWED_COBRANDS=> 'northamptonshire',
         MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         my $updates = Open311::PostServiceRequestUpdates->new();
@@ -112,7 +112,7 @@ subtest 'check further investigation state' => sub {
     $comment->update();
 
     FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
+        ALLOWED_COBRANDS=> 'northamptonshire',
         MAPIT_URL => 'http://mapit.uk/',
         COBRAND_FEATURES => {
             extra_state_mapping => {
@@ -133,7 +133,7 @@ subtest 'check further investigation state' => sub {
     $comment->update;
 
     FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
+        ALLOWED_COBRANDS=> 'northamptonshire',
         MAPIT_URL => 'http://mapit.uk/',
         COBRAND_FEATURES => {
             extra_state_mapping => {
@@ -151,7 +151,7 @@ subtest 'check further investigation state' => sub {
     $mech->content_contains('Under further investigation');
 
     FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
+        ALLOWED_COBRANDS=> 'northamptonshire',
         MAPIT_URL => 'http://mapit.uk/',
         COBRAND_FEATURES => {
             extra_state_mapping => {
@@ -177,7 +177,7 @@ subtest 'check further investigation state' => sub {
     $mech->content_lacks('Under further investigation');
 
     FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { northamptonshire => '.' } ],
+        ALLOWED_COBRANDS=> 'northamptonshire',
         MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->get_ok('/report/' . $comment->problem_id);
@@ -187,7 +187,7 @@ subtest 'check further investigation state' => sub {
     $mech->content_lacks('Under further investigation');
 
     FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+        ALLOWED_COBRANDS=> 'fixmystreet',
         MAPIT_URL => 'http://mapit.uk/',
         COBRAND_FEATURES => {
             extra_state_mapping => {
@@ -212,7 +212,7 @@ subtest 'check further investigation state' => sub {
     $mech->content_contains('Under further investigation');
 
     FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+        ALLOWED_COBRANDS=> 'fixmystreet',
         MAPIT_URL => 'http://mapit.uk/',
         COBRAND_FEATURES => {
             extra_state_mapping => {
@@ -238,7 +238,7 @@ subtest 'check further investigation state' => sub {
     $mech->content_lacks('Under further investigation');
 
     FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+        ALLOWED_COBRANDS=> 'fixmystreet',
         MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->get_ok('/report/' . $comment->problem_id);
@@ -246,6 +246,41 @@ subtest 'check further investigation state' => sub {
 
     $mech->content_contains('Investigating');
     $mech->content_lacks('Under further investigation');
+
+    $comment->set_extra_metadata('external_status_code' => '');
+    $comment->update;
+    my $comment2 = FixMyStreet::DB->resultset('Comment')->create( {
+        mark_fixed => 0,
+        user => $user,
+        problem => $report,
+        anonymous => 0,
+        text => 'this is a comment',
+        confirmed => DateTime->now,
+        state => 'confirmed',
+        problem_state => 'investigating',
+        cobrand => 'default',
+    } );
+    $comment2->set_extra_metadata('external_status_code' => 'further');
+    $comment2->update;
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS=> 'northamptonshire',
+        MAPIT_URL => 'http://mapit.uk/',
+        COBRAND_FEATURES => {
+            extra_state_mapping => {
+                northamptonshire => {
+                    investigating => {
+                        further => 'Under further investigation'
+                    }
+                }
+            }
+        }
+    }, sub {
+        $mech->get_ok('/report/' . $comment->problem_id);
+    };
+
+    $mech->content_contains('Investigating');
+    $mech->content_contains('Under further investigation');
 };
 
 subtest 'check pin colour / reference shown' => sub {
diff --git a/templates/web/base/report/_update_state.html b/templates/web/base/report/_update_state.html
index 0bc4bfb52..ecac68850 100644
--- a/templates/web/base/report/_update_state.html
+++ b/templates/web/base/report/_update_state.html
@@ -1,6 +1,6 @@
 [% # Small chance of duplicates in the case of fixed - user followed by fixed - council %]
-[% SET update_state = update.problem_state %]
-[% IF ( update_state AND update_state != global.last_state AND NOT (global.last_state == "" AND update.problem_state == 'confirmed') )
+[% SET update_state = update.problem_state_processed %]
+[% IF ( update_state AND update_state != global.last_state AND NOT (global.last_state == "" AND update.problem_state_processed == 'confirmed') )
       OR update.mark_fixed
       OR update.mark_open
 %]
-- 
cgit v1.2.3


From 025708ed58435590ec730f2ad97a6cb13dd881bb Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Sat, 29 Aug 2020 14:07:57 +0100
Subject: [UK] Update default privacy/help text for cobrands

---
 templates/web/bromley/about/faq-en-gb.html         |   4 +-
 templates/web/cheshireeast/about/privacy.html      | 362 --------------------
 .../fixmystreet-uk-councils/about/faq-en-gb.html   | 251 ++++++++++++++
 .../web/fixmystreet-uk-councils/about/privacy.html | 378 ++++++++++-----------
 templates/web/fixmystreet.com/about/privacy.html   |   2 +-
 templates/web/rutland/about/faq-en-gb.html         |   2 +-
 6 files changed, 441 insertions(+), 558 deletions(-)
 delete mode 100644 templates/web/cheshireeast/about/privacy.html
 create mode 100755 templates/web/fixmystreet-uk-councils/about/faq-en-gb.html

diff --git a/templates/web/bromley/about/faq-en-gb.html b/templates/web/bromley/about/faq-en-gb.html
index 8b5945471..a4d60c75d 100755
--- a/templates/web/bromley/about/faq-en-gb.html
+++ b/templates/web/bromley/about/faq-en-gb.html
@@ -26,7 +26,9 @@
     <li>complaining or commenting about the council
     </ul>
 
-    <p>Note, the council does not maintain responsibility for problems on private land or TFL roads (A21 and part of the A232, West Wickham to Locksbottom). TFL road enquiries should be directed to <a href="http://reportit.tfl.gov.uk/">http://reportit.tfl.gov.uk/</a>.
+    <p>Note, the council does not maintain responsibility for problems on
+    private land or TfL roads (A21 and part of the A232, West Wickham to
+    Locksbottom). Reports on TfL roads will be automatically routed to TfL.</p>
 
     </dd>
 
diff --git a/templates/web/cheshireeast/about/privacy.html b/templates/web/cheshireeast/about/privacy.html
deleted file mode 100644
index 396b34b7e..000000000
--- a/templates/web/cheshireeast/about/privacy.html
+++ /dev/null
@@ -1,362 +0,0 @@
-[% INCLUDE 'header.html',
-    title = loc('Privacy and cookies'),
-    bodyclass = 'twothirdswidthpage' %]
-
-[% INCLUDE 'about/_sidebar.html' %]
-
-<h1>Privacy, cookies, and third party services</h1>
-
-<h2>Privacy Policy</h2>
-
-<p>
-    FixMyStreet is run by the charity <a href="https://www.mysociety.org/">mySociety</a>.
-</p>
-
-<p>
-    Working in the fields of transparency and accountability, mySociety thinks hard and
-    cares very much about the privacy and security of our users: the length of this
-    privacy policy is one result of that. We know no-one goes through Privacy Policies for
-    fun though, so we’ve tried to keep it a clear and reasonably quick read.
-</p>
-
-<p>
-    We hope it covers everything you need to know, but if you still have any questions
-    feel free to <a href="/contact">contact us</a>.
-</p>
-
-<h2>What information we collect and how we use it</h2>
-
-<p>
-    When you submit a report, <b>we pass on your details, and details of the issue, to the
-    council contact</b> or contacts responsible for the area where you located the issue, or
-    other relevant body.
-</p>
-
-<h3>
-When you make a report
-</h3>
-
-<p>
-    When you use FixMyStreet to send a report, you provide us with personal information
-    including:
-</p>
-
-<ul>
-    <li>Your name</li>
-    <li>Contact details</li>
-</ul>
-
-<p>
-    We <b>send this information to the body responsible for fixing your issue</b>, as per your
-    choice of category and location.
-</p>
-
-<p>
-    At the same time, <b>your report appears on the FixMyStreet website</b>. Your email address
-    and phone number are not published, and we only published your name if you opted to publish it.
-</p>
-
-<p>
-    Some councils, including Cheshire East Council, use FixMyStreet on their
-    own websites. If you make a report within the boundaries of one of these
-    councils (either through FixMyStreet.com or via the council website), it
-    will be published on both web sites.
-</p>
-
-<p>
-    FixMyStreet provides RSS/JSON feeds which allow anyone to publish reports on their own
-    website or page. Typically these feeds consist of reports made within a specific local
-    area, and are published on community or local interest sites.
-</p>
-
-<p>
-    Anything you include in the body of your report will be published in one or
-    all of the places listed above, so keep personal information such
-    as your contact details to the correct fields.
-</p>
-
-<p>
-    We <b>store your personal details</b>, along with your password where used (passwords are
-    stored in a format that is unreadable to anyone — including us —  known as a hash) and
-    any reports or updates you make, in our own database.
-</p>
-
-<p>
-    These are accessible only to FixMyStreet administrators who adhere to strict internal
-    data-handling policies, and, where a council is a <a href="https://www.fixmystreet.com/pro/">FixMyStreet Pro</a> client, to council
-    staff, whose own data-handling and security policies will apply.
-</p>
-
-<h3>
-    When you subscribe to an alert by email
-</h3>
-
-<p>
-    We collect your email address, which we store with the details of whichever alert/s
-    you have subscribed to.
-</p>
-
-<h3>
-    When you contact the support team
-</h3>
-
-<p>
-    Your message will be accessible to our small team of support staff, who adhere to
-    strict internal data-handling policies.
-</p>
-
-<p>
-    <b>Your personal information is never shared, or used for purposes other than those
-    listed above, unless we are obliged to by law.</b>
-</p>
-
-<h2>
-    Research
-</h2>
-
-<p>
-    We sometimes use data from FixMyStreet, or share it with trusted third parties, for
-    research. This data is completely anonymised and contains no identifying details such
-    as names, email addresses or the content of reports. Our Research Data Release policy
-    may be seen on request.
-</p>
-
-<h2>
-    What happens when you use FixMyStreet
-</h2>
-
-<h2>
-    Making a report
-</h2>
-
-<ul>
-    <li>
-        When your council responds to your report, if you have provided us with an email
-        address, in most cases <b>their reply will go directly to your email inbox</b>. This
-        response, and any subsequent correspondence, happens outside the FixMyStreet
-        system, except in the case of some councils which have integrated with FixMyStreet
-        so that their responses and auto-updates are published on the report page. If you
-        have submitted via phone verification, you may not receive any response from the
-        council, depending on how their systems are set up.
-    </li>
-    <li>
-        If your report is particularly interesting, our Communications Manager may get in
-        touch, as we like to feature notable requests on the
-        <a href="https://www.mysociety.org/blog/">mySociety blog</a> (or just
-        <a href="mailto:press@mysociety.org">let us know</a> directly!).
-    </li>
-    <li>
-        We only ever send you emails in relation to your reports or use of the site.
-    </li>
-</ul>
-
-<h3>
-    Subscribing to alerts
-</h3>
-
-<p>
-    We’ll send you an automated email every time someone makes a report within the area
-    you specify, or when updates are made to a report you’ve opted to follow. The
-    frequency of these emails will depend on how large your chosen area is and how many
-    reports are made within it, but you won’t get more than one an hour.
-</p>
-
-<h2>
-    Unsubscribing
-</h2>
-
-<h3>
-    How to stop receiving emails from us
-</h3>
-
-<p>
-    Every alert email we send contains an unsubscribe link at the bottom for you to stop
-    receiving that alert.
-</p>
-
-<h2>
-    Legal basis for processing
-</h2>
-
-<p>
-    In using FixMyStreet for any of the functions listed above (sending a
-    report, leaving an update, email alerts or site registration), we are
-    processing your data under the legal basis 6(1)(f) – legitimate interests.
-    We assert that we have a legitimate charitable and commercial interest in
-    giving people an easy and public way to report street problems, even if they
-    don't know who the problems should go to, and in sending them updates or
-    alerts. The benefits of reporting problems publicly are that others can
-    quickly see what has already been reported, so it prevents the council from
-    having to deal with duplicates. It also creates a snapshot for local
-    communities, so it's easy to see what the common problems are in a given
-    area, and how quickly they get fixed. Other local residents can browse, read
-    and comment on problems – and perhaps even offer a solution.
-</p>
-
-<h2>
-    Retention periods and your right to removal
-</h2>
-
-<h3>
-    Reports and updates
-</h3>
-
-<p>
-    Except in exceptional circumstances, we do not delete reports or updates made through
-    FixMyStreet. Historic FixMyStreet reports provide an invaluable resource for
-    researchers into the quantity and type of street problems made across the UK during
-    the years the site has been running. This research can help inform civic planners,
-    developers, coders, historians and social scientists, among others.
-</p>
-
-<p>
-    Therefore, <b>if you ask for a report to be removed, in most cases we will instead invite
-    you to anonymise it</b>, so that there is no public connection between the content and
-    your name. You can anonymise reports singly, or in bulk, by logging in to your account
-    and clicking on the ‘“Hide your name” link beside the time and date of your report.
-    From here you may anonymise this report or all reports you have made.
-</p>
-
-<h3>
-    Your personal information
-</h3>
-
-<p>
-    As well as your report or update appearing on the FixMyStreet website, your details,
-    including name and email address, are stored in our admin system.
-</p>
-
-<p>
-    If you submit a report but do not click on the confirmation email, your report will
-    not be sent to the council; however, the report and your details remain in our system
-    and are accessible to site administrators.
-</p>
-
-<p>
-    <a href="/contact">Contact us</a> if you would like your details to be removed from our admin
-    database.
-</p>
-
-<h3>
-    Support mail
-</h3>
-
-<p>
-    If you contact FixMyStreet via our support email address we keep your message for two
-    years at which point they will be automatically deleted. This is to aid continuity
-    and so that we can view any historic context which may have bearing on subsequent
-    support mail, even if members of the support staff change. Support staff adhere to
-    internal privacy policies which may be viewed on request.
-</p>
-
-<h2>
-    Your right to object
-</h2>
-<p>
-    The General Data Protection Regulation gives you the right to object to our
-    processing of your personal information and to ask us to stop processing it.
-    However, it also gives us the right to continue to process it if we can demonstrate
-    compelling legitimate grounds for the processing that override your interests, rights
-    and freedoms. To exercise your right to object, you can <a href="/contact">
-    contact us</a>, giving specific reasons why you are objecting to the processing of
-    your personal data. These reasons should be based upon your particular situation.
-</p>
-<h2>
-    Your right to access
-</h2>
-
-<p>
-    You may <a href="/contact">contact us</a> at any time to ask to see what personal data we hold about you.
-</p>
-
-<h2>
-    Your right to complain
-</h2>
-
-<p>
-    If you believe that we have mishandled your data, you have the right to lodge a
-    complaint with the Information Commissioner’s Office.
-    <a href="https://ico.org.uk/concerns/handling/">You can report a concern here</a>
-    (but do contact us first, so that we can try and help).
-</p>
-
-<h3>
-    Who we are
-</h3>
-
-<p>
-    FixMyStreet is run by mySociety, a UK not-for-profit social enterprise. Our registered
-    address is:
-</p>
-
-<p>
-mySociety<br>
-483 Green Lanes<br>
-London<br>
-N13 4BS<br>
-United Kingdom<br>
-</p>
-
-<p>
-    …and we can also be <a href="/contact">contacted here</a>.
-</p>
-
-
-<h2>Cookies</h2>
-
-<p>To make our service easier or more useful, we sometimes place small data
-files on your computer or mobile phone, known as cookies; many websites do
-this. We use this information to, for example, remember you have logged in so
-you don’t need to do that on every page, or to measure how people use the
-website so we can improve it and make sure it works properly. Below, we list
-the cookies and services that this site can use.
-
-<table class="nicetable">
-    <tr>
-        <th scope="col">Name</th>
-        <th scope="col">Typical Content</th>
-        <th scope="col">Expires</th>
-    </tr>
-    <tr>
-        <td>fixmystreet_app_session</td>
-        <td nowrap>A random unique identifier</td>
-        <td>When browser is closed, or four weeks if &ldquo;Keep me signed in&rdquo; is ticked</td>
-    </tr>
-</table>
-
-<h3>Measuring website usage (Google Analytics)</h3>
-
-<p>We use Google Analytics software to collect information about how you use
-this site. We do this to help make sure the site is meeting the needs of its
-users and to help us make improvements.
-
-<p>Google Analytics stores information such as what
-pages you visit, how long you are on the site, how you got here, what you click
-on, and information about your web browser. IP addresses are masked (only a
-portion is stored) and personal information is only reported in aggregate. We
-do not allow Google to use or share our analytics data for any purpose besides
-providing us with analytics information, and we recommend that any user of
-Google Analytics does the same.
-
-<h3>Opting out</h3>
-<p>You can <a href="https://tools.google.com/dlpage/gaoptout">opt out of Google
-Analytics cookies</a>.
-
-<p>If you want to disable advertising-based tracking, you can
-<a href="https://www.google.com/settings/ads">adjust your Google Ads
-Settings</a>, or opt out of advertising-based tracking across a
-number of providers in one go using the
-<a href="http://www.networkadvertising.org/choices/">Network
-Advertising Initiative’s opt-out form</a>.
-
-<p>Rest assured, we only track usage data for one reason: to help us
-understand how we can make the site work better for you, our
-users.
-
-<h2>Credits</h2>
-
-<p>Bits of wording taken from the <a
-href="https://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open
-Government Licence).
-
-[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/fixmystreet-uk-councils/about/faq-en-gb.html b/templates/web/fixmystreet-uk-councils/about/faq-en-gb.html
new file mode 100755
index 000000000..762fc0093
--- /dev/null
+++ b/templates/web/fixmystreet-uk-councils/about/faq-en-gb.html
@@ -0,0 +1,251 @@
+[% INCLUDE 'header.html', title = loc('Frequently Asked Questions'), bodyclass = 'twothirdswidthpage' %]
+
+[% INCLUDE 'about/_sidebar.html' %]
+
+<h1>Frequently Asked Questions</h1>
+
+<dl>
+
+<dt>What sort of issues can I report?</dt>
+<dd>
+<p>This site is for reporting things which are <strong>broken, dirty,
+damaged</strong> or <strong>dumped</strong>, and need <strong>fixing,
+cleaning</strong> or <strong>clearing</strong>.
+</dd>
+
+<dt>Which issues shouldn't I report?</dt>
+
+<dd>
+<p>Please don’t use this site to inform us of:</p>
+
+<ul>
+    <li>Urgent and emergency problems</li>
+    <li>Complaints about people, including anti-social behaviour</li>
+    <li>Issues with council services, such as bins and recycling</li>
+    <li>Proposals for change, eg to road layouts</li>
+    <li>Complaints about [% c.cobrand.council_name %]</li>
+</ul>
+
+<p>
+    For these types of issue, please contact us through the appropriate
+    channel.
+</p>
+
+<p>
+    If you use this site to report issues it wasn’t designed for, there may be
+    a delay in your report getting to the right department.
+</p>
+
+<p>
+    Also: remember that all reports are published online, so it’s not a good
+    idea to use it for any issue that requires the inclusion of people’s
+    personal information, like names, addresses, photos of people, or car
+    number plates.
+</p>
+</dd>
+
+<dt>Where do my reports go?</dt>
+
+<dd>
+<p>
+    This site is an official street fault reporting system for
+    [% c.cobrand.council_name %].
+</p>
+
+<p>
+    Your report will go directly to the department responsible for getting it
+    fixed, or, if it’s not our responsibility, will be routed to the relevant
+    body. Reports are also published online for others to see.
+</p>
+
+<p>
+    The system is provided by SocietyWorks, and operates in tandem with their
+    nationwide site <a href="https://www.fixmystreet.com/">FixMyStreet.com</a>
+    — so reports made on FixMyStreet.com will also be shown here, and vice
+    versa.
+</p>
+</dd>
+
+<dt>How do I use this site?</dt>
+
+<dd>
+<p>
+    Begin by entering the location of your issue <a href="/">on the front
+    page</a>. You can use the name of a street, area, a place or a postcode —
+    or you can click “use my location” which will automatically detect where
+    you are.
+</p>
+<p>
+    You’ll be taken to a map centred on that location, where you can view
+    reports already made in that area. If someone has already reported your
+    issue, there’s no need to report it again: click ‘get updates’ at the
+    bottom of the report to be kept informed on progress.
+</p>
+<p>
+    If you don’t see the issue you’ve come to report, start a new one by
+    clicking on the map to show precisely where the issue is.
+</p>
+<p>
+    You’ll then be asked to fill in a few details.
+</p>
+</dd>
+
+<dt>Do I have to be a [% c.cobrand.council_name %] resident to use this site?</dt>
+
+<dd>
+<p>
+    No — anyone can use this site.
+</p>
+</dd>
+
+<dt>Do I need to make an account to use this site?</dt>
+
+<dd>
+<p>
+    No; if you wish to see previous reports you have made, you can sign in by
+    clicking ‘Sign in’ and then either have a link sent to your email, sign in
+    with a previously set password, or set a password using the ‘create an
+    account’ link.
+</p>
+<p>
+    If you already have an account on fixmystreet.com, you can use the same
+    details on this site.
+</p>
+</dd>
+
+<dt>How are the issues resolved?
+
+<dd>
+<p>
+    When you make a report on this site, we ask you where the issue is, what
+    category it fits within, and perhaps some other information, like questions
+    specific to the category, or which particular street light is broken.
+</p>
+
+<p>
+    These pieces of information will help direcrt your report to the right
+    place to get it fixed. If the issue is our responsibility, it will drop
+    into our internal system which will route it to the correct department. If
+    it’s more suited to another authority, we will try and send it there
+    instead.
+</p>
+</dd>
+
+<dt>What happens next?
+
+<dd>
+<p>
+    When there’s a change in your report’s status, and where you have provided
+    your email address, you’ll receive an update. This might tell you, for
+    example, that:
+</p>
+
+<ul>
+    <li>our inspectors have gone out to assess the issue</li>
+    <li>our contractors have scheduled the issue for repair</li>
+    <li>the issue has been resolved</li>
+    <li>The issue has been deemed unsuitable for fixing (as happens in some cases)</li>
+</ul>
+
+<p>
+    These updates are also published on the site so that everyone can see what
+    progress has been made.
+</p>
+</dd>
+
+<dt>Can I use this site on my smartphone or tablet?</dt>
+
+<dd>
+<p>
+    Yes - use your device’s browser to visit this site or fixmystreet.com. The
+    site works well on all sizes of screen, resizing automatically.
+</p>
+</dd>
+
+<dt>Why do you publish reports online?</dt>
+
+<dd>
+<p>
+    There’s no need to make a report if we’re already aware of the issue, so by
+    showing which issues have already been reported, we save your time and
+    ours.
+</p>
+<p>
+    Having everything visible online also allows everyone to keep up with an
+    issue’s status, even if they aren’t the one who reported it.
+</p>
+</dd>
+
+<dt>What else can I do on this site?</dt>
+
+<dd>
+<p>
+    You can subscribe to a specific area, so you’ll get an email whenever
+    someone makes a report in your chosen neighbourhood.
+</p>
+<p>
+    Search for a location, and then click ‘get updates’ at the bottom of the
+    list of reports.
+</p>
+<p>
+    If you run a website and you’d like to publish reports automatically from a
+    specific area, you can also access an RSS feed from the ‘get updates’
+    interface.
+</p>
+</dd>
+
+<dt>Can I edit or delete a report?</dt>
+
+<dd>
+<p>
+    You can remove your name from a report if you have included it by accident,
+    or changed your mind about it being published. Visit the report page when
+    signed in and click on the link marked ‘hide your name?’.
+</p>
+<p>
+    You’ll then have the option to remove your name from one report or every
+    report you’ve made.
+</p>
+<p>
+    If you’d like to edit some other part of your report, please get in touch.
+</p>
+</dd>
+
+[% IF c.cobrand.feature('updates_allowed') == 'open' %]
+    <dt>Can I make updates to my report?</dt>
+    <p>
+        Yes, you can leave updates on open reports, by visiting a report page and
+        filling in the update form.
+    </p>
+[% ELSIF c.cobrand.feature('updates_allowed') == 'reporter-open' %]
+    <dt>Can I make updates to my report?</dt>
+    <p>
+        Yes, you can leave updates on open reports you have made, by visiting a
+        report page and filling in the update form.
+    </p>
+[% ELSIF c.cobrand.feature('updates_allowed') == 'reporter' %]
+    <dt>Can I make updates to my report?</dt>
+    <p>
+        Yes, you can leave updates on reports you have made, by visiting a report
+        page and filling in the update form.
+    </p>
+[% END %]
+
+<dt>Do you remove content from this site?</dt>
+
+<dd>
+<p>
+    [% c.cobrand.council_name %] is not responsible for the content and
+    accuracy of material submitted by its users. We reserve the right to edit
+    or remove any problems or updates which we consider to be inappropriate
+    upon being informed by a user of the site.
+</p>
+<p>
+    If you have seen content that is offensive or inappropriate, please click
+    the ‘report abuse’ link at the foot of the report and let us know.
+</p>
+</dd>
+
+</dl>
+
+[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/fixmystreet-uk-councils/about/privacy.html b/templates/web/fixmystreet-uk-councils/about/privacy.html
index 1290ee7fb..aee2f6978 100644
--- a/templates/web/fixmystreet-uk-councils/about/privacy.html
+++ b/templates/web/fixmystreet-uk-councils/about/privacy.html
@@ -1,12 +1,10 @@
 [% INCLUDE 'header.html',
-    title = loc('Privacy and cookies'),
+    title = 'Privacy policy',
     bodyclass = 'twothirdswidthpage' %]
 
 [% INCLUDE 'about/_sidebar.html' %]
 
-<h1>Privacy, cookies, and third party services</h1>
-
-<h2>Privacy Policy</h2>
+<h1>Privacy policy</h1>
 
 [% IF c.cobrand.moniker == 'bathnes' %]
 <p>Your email address identifies you and your report, and so it is your
@@ -25,37 +23,36 @@ The Council’s Data Protection Officer may be contacted at
 <hr>
 [% END %]
 
+<h2>Who runs this service?</h2>
+
 <p>
-    FixMyStreet is run by the charity <a href="https://www.mysociety.org/">mySociety</a>.
+    This site is a service provided to [% c.cobrand.council_name %] by
+    <a href="https://www.societyworks.org/">SocietyWorks Ltd</a>, a limited
+    company (05798215). SocietyWorks is a trading subsidiary of mySociety, a
+    registered charity in England and Wales (1076346), who also run the
+    national <a href="https://www.fixmystreet.com/">fixmystreet.com</a> website
+    with which this site is linked. Henceforth this privacy policy will refer
+    to mySociety.
 </p>
 
 <p>
-    Working in the fields of transparency and accountability, mySociety thinks hard and
-    cares very much about the privacy and security of our users: the length of this
-    privacy policy is one result of that. We know no-one goes through Privacy Policies for
-    fun though, so we’ve tried to keep it a clear and reasonably quick read.
+    Reports made on this site also appear on fixmystreet.com, and vice versa.
 </p>
 
 <p>
-    We hope it covers everything you need to know, but if you still have any questions
-    please feel free to <a href="/contact">contact us</a>.
+    These reports and the associated user data are stored in a single database
+    which is hosted by mySociety. They are accessible to mySociety and
+    [% c.cobrand.council_name %] administrators.
 </p>
 
 <h2>What information we collect and how we use it</h2>
 
-<p>
-    When you submit a report, <b>we pass on your details, and details of the issue, to the
-    council contact</b> or contacts responsible for the area where you located the issue, or
-    other relevant body such as TfL.
-</p>
-
 <h3>
 When you make a report
 </h3>
 
 <p>
-    When you use FixMyStreet to send a report, you provide us with personal information
-    including:
+    You may have provided us with personal information including:
 </p>
 
 <ul>
@@ -64,74 +61,94 @@ When you make a report
 </ul>
 
 <p>
-    We <b>send this information to the body responsible for fixing your issue</b>, as per your
-    choice of category and location.
+    This information, together with details of the issue, are routed directly
+    to the contact or contacts responsible for fixing it, based on two pieces
+    of data: the issue category, and its location.
 </p>
 
 <p>
-    At the same time, <b>your report appears on the FixMyStreet website</b>. Your email address
-    and phone number are not published, and your name is only published if you have opted
-    to do so.
+    If the issue is the responsibility of [% c.cobrand.council_name %], your
+    report comes into our system. But this site also has the ability to route
+    your report to a different authority if they are the ones responsbile for
+    it. This might be a different council, or a body such as TfL or Highways
+    England.
 </p>
 
 <p>
-    Some councils use FixMyStreet on their own websites. If you make a report within the
-    boundaries of one of these councils (either through FixMyStreet.com or via the council
-    website), it will be published on both sites.
+    If the report falls within our boundaries, <b>your report appears publicly
+    on both this site and on fixmystreet.com</b>, in some cases even if it has
+    been sent to another authority. It may additionally appear on that other
+    authority’s website, if they also use FixMyStreet as their reporting
+    software.
 </p>
 
 <p>
-    FixMyStreet provides RSS/JSON feeds which allow anyone to publish reports on their own
-    website or page. Typically these feeds consist of reports made within a specific local
-    area, and are published on community or local interest sites.
+    Information that you enter in the email address and phone number fields
+    <strong>are not published</strong>, and your name is <strong>only published
+    if you have checked the box opting to do so</strong>.
 </p>
 
 <p>
-    Note that anything you include in the body of your report will be published in one or
-    all of the places listed above, so please take care to keep personal information such
-    as your contact details to the correct fields.
+    FixMyStreet provides RSS/JSON feeds, accessible from both fixmystreet.com
+    and this site, which allow anyone to publish reports on their own website
+    or page. Typically these feeds consist of reports made within a specific
+    local area, and are published on community or local interest sites.
 </p>
 
 <p>
-    We <b>store your personal details</b>, along with your password where used (passwords are
-    stored in a format that is unreadable to anyone — including us —  known as a hash) and
-    any reports or updates you make, in our own database.
+  [% IF c.cobrand.moniker == 'cheshireeast' %]
+    Anything you include in the body of your report will be published in one or
+    all of the places listed above, so <strong>keep personal information such
+        as your contact details to the correct fields</strong>.
+  [% ELSE %]
+    <strong>Note that</strong> anything you include in the body of your report
+    will be published in one or all of the places listed above, so
+    <strong>please take care to keep personal information such as your contact
+        details to the correct fields</strong>.
+  [% END %]
 </p>
 
 <p>
-    These are accessible only to FixMyStreet administrators who adhere to strict internal
-    data-handling policies, and, where a council is a <a href="https://www.fixmystreet.com/pro/">FixMyStreet Pro</a> client, to council
-    staff, whose own data-handling and security policies will apply.
+    mySociety <b>stores your personal details</b>, along with your password
+    where used (passwords are stored in a format that is unreadable to anyone —
+    including mySociety staff — known as a hash) and any reports or updates you
+    make, in our own database.
 </p>
 
-<h3>
-    When you add an update
-  [% IF c.cobrand.send_questionnaires %]
-    or respond to our ‘has your problem been fixed?’ survey
-  [% END %]
-</h3>
-
 <p>
-    When you add an update to a report,
-  [% IF c.cobrand.send_questionnaires %]
-    or click through from our ‘has your problem been fixed?’ survey,
-  [% END %]
-    we record this along with the initial report and your user data.
+    These are accessible only to mySociety’s administrators, who adhere to
+    strict data-handling policies, and to [% c.cobrand.council_name %] staff,
+    who abide by their own data-handling and security policies.
 </p>
 
-<p>
-    <b>Updates are published on the website</b> but not routinely sent to the council except in
-    cases where a council has opted for full integration. You may opt to include your
-    name; your email address is not published.
-</p>
+[% IF c.cobrand.feature('updates_allowed') != 'staff' AND c.cobrand.send_questionnaires %]
+    <h3>When you add an update or respond to the email asking whether your problem was fixed</h3>
+    <p>
+    When you add an update to a report, or click through from our ‘has your
+    problem been fixed?’ email (where this function is available), this is
+    recorded along with the initial report and your user data.
+    </p>
+[% ELSIF c.cobrand.feature('updates_allowed') != 'staff' %]
+    <h3>When you add an update</h3>
+    <p>
+    When you add an update to a report, this is recorded along with the initial
+    report and your user data.
+    </p>
+[% ELSIF c.cobrand.send_questionnaires %]
+    <h3>When you respond to the email asking whether your problem was fixed</h3>
+    <p>
+    When you click through from our ‘has your problem been fixed?’ email, this
+    is recorded along with the initial report and your user data.
+    </p>
+[% END %]
 
 <h3>
     When you subscribe to an alert by email
 </h3>
 
 <p>
-    We collect your email address, which we store with the details of whichever alert/s
-    you have subscribed to.
+    mySociety collects your email address, which they store with the details of
+    whichever alert/s you have subscribed to.
 </p>
 
 <h3>
@@ -139,8 +156,12 @@ When you make a report
 </h3>
 
 <p>
-    Your message will be accessible to our small team of support staff, who adhere to
-    strict internal data-handling policies.
+    Your message will be accessible to [% c.cobrand.council_name %]’s support
+    staff, who adhere to our data-handling and security policies. If your issue
+    is about the use or functions of FixMyStreet, it may be passed to
+    mySociety’s support staff (including personal details, such as name and
+    email address, in order to help troubleshoot issues), whose privacy policy
+    <a href="https://www.fixmystreet.com/about/privacy">can be seen here</a>.
 </p>
 
 <p>
@@ -153,32 +174,23 @@ When you make a report
 </h2>
 
 <p>
-    We sometimes use data from FixMyStreet, or share it with trusted third parties, for
-    research. This data is completely anonymised and contains no identifying details such
-    as names, email addresses or the content of reports. Our Research Data Release policy
-    may be seen on request.
+    mySociety sometimes use report data, or share it with trusted third
+    parties, for research. This data is completely anonymised and contains
+    <strong>no identifying details</strong> such as names, email addresses or
+    the content of reports. mySociety’s Research Data Release policy may be
+    seen <a href="mailto:research@mysociety.org">on request to them</a>.
 </p>
 
-<h2>
-    What happens when you use FixMyStreet
-</h2>
-
-<h2>
-    Making a report
-</h2>
+<h2>What to expect</h2>
 
 <ul>
     <li>
-        When your council responds to your report, if you have provided us with an email
-        address, in most cases <b>their reply will go directly to your email inbox</b>. This
-        response, and any subsequent correspondence, happens outside the FixMyStreet
-        system, except in the case of some councils which have integrated with FixMyStreet
-        so that their responses and auto-updates are published on the report page. If you
-        have submitted via phone verification, you may not receive any response from the
-        council, depending on how their systems are set up.
+        When we respond to your report, if you have provided us with an email
+        address, in most cases <b>our reply will go directly to your email inbox</b>.
+        Responses and updates are also published on the report’s public webpage.
     </li>
     <li>
-        We <b>email you if someone leaves an update</b> on a report you’ve made.
+        You’ll receive an email <b>if someone leaves an update</b> on a report you’ve made.
     </li>
   [% IF c.cobrand.send_questionnaires %]
     <li>
@@ -188,13 +200,9 @@ When you make a report
     </li>
   [% END %]
     <li>
-        If your report is particularly interesting, our Communications Manager may get in
-        touch, as we like to feature notable requests on the
-        <a href="https://www.mysociety.org/blog/">mySociety blog</a> (or just
-        <a href="mailto:press@mysociety.org">let us know</a> directly!).
-    </li>
-    <li>
-        We only ever send you emails in relation to your reports or use of the site.
+        [% c.cobrand.council_name %] and/or mySociety will only ever send you
+        emails in relation to your reports or use of the site. Your personal
+        details will not be used for any other purpose.
     </li>
 </ul>
 
@@ -203,20 +211,21 @@ When you make a report
 </h3>
 
 <p>
-    We’ll send you an automated email every time someone makes a report within the area
-    you specify, or when updates are made to a report you’ve opted to follow. The
-    frequency of these emails will depend on how large your chosen area is and how many
-    reports are made within it, but you won’t get more than one an hour.
+    If you subscribe to an alert, you’ll receive an automated email every time
+    someone makes a report within the area you specify. The frequency of these
+    emails will depend on how large your chosen area is and how many reports
+    are made within it, but you won’t get more than one an hour.
+
+    If you’ve opted to follow a report, you’ll receive an email each time an
+    update is made, which could be a change in status made by our team, a
+    comment made by another member of the public, or an update from the person
+    who made the report originally.
 </p>
 
 <h2>
     Unsubscribing
 </h2>
 
-<h3>
-    How do I stop receiving emails from you?
-</h3>
-
 <p>
     Every alert email we send contains an unsubscribe link at the bottom for you to stop
     receiving that alert.
@@ -231,24 +240,44 @@ When you make a report
 </h2>
 
 <p>
-[% IF c.cobrand.moniker == 'hackney' %]
     In using FixMyStreet for any of the functions listed above (sending a
-    report, leaving an update, email alerts or site registration), we are
-    processing your data under the legal basis 6(1)(a) – consent.
+    report, leaving an update, email alerts or site registration), your data is
+    processed by both [% c.cobrand.council_name %] and mySociety.
+</p>
+<p>
+    [% c.cobrand.council_name %] is the data controller and mySociety is a data
+    processor.
+</p>
+[% IF c.cobrand.moniker == 'hackney' %]
+<p>
+    Your data is processed by [% c.cobrand.council_name %] under the legal
+    basis 6(1)(a) – consent.
+</p>
 [% ELSE %]
-    In using FixMyStreet for any of the functions listed above (sending a
-    report, leaving an update, email alerts or site registration), we are
-    processing your data under the legal basis 6(1)(f) – legitimate interests.
-    We assert that we have a legitimate charitable and commercial interest in
-    giving people an easy and public way to report street problems, even if they
-    don't know who the problems should go to, and in sending them updates or
-    alerts. The benefits of reporting problems publicly are that others can
-    quickly see what has already been reported, so it prevents the council from
-    having to deal with duplicates. It also creates a snapshot for local
-    communities, so it's easy to see what the common problems are in a given
-    area, and how quickly they get fixed. Other local residents can browse, read
-    and comment on problems – and perhaps even offer a solution.
+<p>
+    Your data is processed by [% c.cobrand.council_name %] under the legal
+    basis 6(1)(e) – <strong>public task</strong>. [% c.cobrand.council_name %]
+    asserts that the processing of users’ personal information is necessary for
+    us to perform a task in the public interest or for our official functions,
+    and the task or function has a clear basis in law. Our obligation to keep
+    highways in good order and to keep public areas safe and functional are set
+    in law.
+</p>
 [% END %]
+
+<p>
+    mySociety also runs a service called FixMyStreet. If you report a problem
+    that [% c.cobrand.council_name %] is responsible for directly on
+    FixMyStreet, rather than this site, mySociety will share your report (and
+    personal details if provided) with us.
+</p>
+
+<p>
+    This sharing is in accordance with the FixMyStreet
+    <a href="https://www.fixmystreet.com/faq">terms of service</a> and their
+    <a href="https://www.fixmystreet.com/about/privacy">privacy statement</a>.
+    When [% c.cobrand.council_name %] receives this information we will hold it
+    as explained on this page.
 </p>
 
 <h2>
@@ -260,51 +289,69 @@ When you make a report
 </h3>
 
 <p>
-    Except in exceptional circumstances, we do not delete reports or updates made through
-    FixMyStreet. Historic FixMyStreet reports provide an invaluable resource for
+    Except in exceptional circumstances, reports or updates made through this site
+    or FixMyStreet are not deleted. Historic reports provide an invaluable resource for
     researchers into the quantity and type of street problems made across the UK during
     the years the site has been running. This research can help inform civic planners,
     developers, coders, historians and social scientists, among others.
 </p>
 
 <p>
-    Therefore, <b>if you ask for a report to be removed, in most cases we will instead invite
-    you to anonymise it</b>, so that there is no public connection between the content and
+    Therefore, <b>if you ask for a report to be removed, in most cases you will instead be
+    invited to anonymise it</b>, so that there is no public connection between the content and
     your name. You can anonymise reports singly, or in bulk, by logging in to your account
-    and clicking on the ‘“Hide your name” link beside the time and date of your report.
-    From here you may anonymise this report or all reports you have made.
+    on either this site or on fixmystreet.com and clicking on the ‘“Hide your
+    name” link beside the time and date of your report. From here you may
+    anonymise this report or all reports you have made.
 </p>
 
-<h3>
-    Your personal information
-</h3>
-
 <p>
-    As well as your report or update appearing on the FixMyStreet website, your details,
-    including name and email address, are stored in our admin system.
+    If you do not already have an account, it is simple to register, and once
+    you have done so you will have access to all the reports you have made
+    under that email address.
 </p>
 
 <p>
-    If you submit a report but do not click on the confirmation email, your report will
-    not be sent to the council; however, the report and your details remain in our system
-    and are accessible to site administrators.
+    Changes you make to your reports will apply immediately on this site, on
+    fixmystreet.com and will also be reflected, sometimes with a delay,
+    anywhere else they appear (see “What information we collect and how we use
+    it”, above, for more details about where reports are published). If you do
+    not see the changes, please ‘hard refresh’ your browser by eg pressing the
+    Ctrl and F5 keys simultaneously.
 </p>
 
 <p>
-    Please <a href="/contact">contact us</a> if you would like your details to be removed from our admin
-    database.
+    Search engines such as Google often take a little time to reflect changes
+    to content, but anonymising your report should also remove your name from
+    their search results once the pages have been recrawled by their robots.
 </p>
 
 <h3>
-    Support mail
+    Your personal information
 </h3>
 
 <p>
-    If you contact FixMyStreet via our support email address we keep your message for two
-    years at which point they will be automatically deleted.. This is to aid continuity
-    and so that we can view any historic context which may have bearing on subsequent
-    support mail, even if members of the support staff change. Support staff adhere to
-    internal privacy policies which may be viewed on request.
+    As well as your report or update appearing on this site and the FixMyStreet
+    website, your details, including name and email address, are stored in
+    FixMyStreet’s admin system.
+</p>
+
+<p>
+    If you submit a report but do not click on the confirmation email, your
+    report will not be sent or published; however, the report and your details
+    remain in our system and are accessible to site administrators.
+</p>
+
+<p>
+    Personal details will automatically be removed from the database after two
+    years of inactivity of the associated account.
+  [% IF c.cobrand.moniker == 'cheshireeast' %]
+    <a href="/contact">Contact us</a>
+  [% ELSE %]
+    Please <a href="/contact">contact us</a>
+  [% END %]
+    if you would like your details to be removed from our admin database sooner
+    than that.
 </p>
 
 <h2>
@@ -319,12 +366,14 @@ When you make a report
     contact us</a>, giving specific reasons why you are objecting to the processing of
     your personal data. These reasons should be based upon your particular situation.
 </p>
+
 <h2>
     Your right to access
 </h2>
 
 <p>
-    You may <a href="/contact">contact us</a> at any time to ask to see what personal data we hold about you.
+    You may <a href="/contact">contact us</a> at any time to ask to see what
+    personal data we hold about you.
 </p>
 
 <h2>
@@ -332,34 +381,12 @@ When you make a report
 </h2>
 
 <p>
-    If you believe that we have mishandled your data, you have the right to lodge a
-    complaint with the Information Commissioner’s Office.
+    If you believe that we have mishandled your data, you have the right to
+    lodge a complaint with the Information Commissioner’s Office.
     <a href="https://ico.org.uk/concerns/handling/">You can report a concern here</a>
     (but do contact us first, so that we can try and help).
 </p>
 
-<h3>
-    Who we are
-</h3>
-
-<p>
-    FixMyStreet is run by mySociety, a UK not-for-profit social enterprise. Our registered
-    address is:
-</p>
-
-<p>
-mySociety<br>
-483 Green Lanes<br>
-London<br>
-N13 4BS<br>
-United Kingdom<br>
-</p>
-
-<p>
-    …and we can also be <a href="/contact">contacted here</a>.
-</p>
-
-
 <h2 id="cookies">Cookies</h2>
 
 <p>To make our service easier or more useful, we sometimes place small data
@@ -378,43 +405,8 @@ the cookies and services that this site can use.
     <tr>
         <td>fixmystreet_app_session</td>
         <td nowrap>A random unique identifier</td>
-        <td>When browser is closed, or four weeks if &ldquo;Keep me signed in&rdquo; is ticked</td>
+        <td>When browser is closed</td>
     </tr>
 </table>
 
-<h3>Measuring website usage (Google Analytics)</h3>
-
-<p>We use Google Analytics software to collect information about how you use
-this site. We do this to help make sure the site is meeting the needs of its
-users and to help us make improvements.
-
-<p>Google Analytics stores information such as what
-pages you visit, how long you are on the site, how you got here, what you click
-on, and information about your web browser. IP addresses are masked (only a
-portion is stored) and personal information is only reported in aggregate. We
-do not allow Google to use or share our analytics data for any purpose besides
-providing us with analytics information, and we recommend that any user of
-Google Analytics does the same.
-
-<h3>Opting out</h3>
-<p>You can <a href="https://tools.google.com/dlpage/gaoptout">opt out of Google
-Analytics cookies</a>.
-
-<p>If you want to disable advertising-based tracking, you can
-<a href="https://www.google.com/settings/ads">adjust your Google Ads
-Settings</a>, or opt out of advertising-based tracking across a
-number of providers in one go using the
-<a href="http://www.networkadvertising.org/choices/">Network
-Advertising Initiative’s opt-out form</a>.
-
-<p>Rest assured, we only track usage data for one reason: to help us
-understand how we can make the site work better for you, our
-users.
-
-<h2>Credits</h2>
-
-<p>Bits of wording taken from the <a
-href="https://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open
-Government Licence).
-
 [% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/fixmystreet.com/about/privacy.html b/templates/web/fixmystreet.com/about/privacy.html
index 665b0968b..9e1316819 100755
--- a/templates/web/fixmystreet.com/about/privacy.html
+++ b/templates/web/fixmystreet.com/about/privacy.html
@@ -385,7 +385,7 @@ the cookies and services that this site can use.
     <tr>
         <td>fixmystreet_app_session</td>
         <td nowrap>A random unique identifier</td>
-        <td>When browser is closed, or four weeks if &ldquo;Keep me signed in&rdquo; is ticked</td>
+        <td>When browser is closed</td>
     </tr>
 </table>
 
diff --git a/templates/web/rutland/about/faq-en-gb.html b/templates/web/rutland/about/faq-en-gb.html
index cfe1d9153..31fdf5e0d 100644
--- a/templates/web/rutland/about/faq-en-gb.html
+++ b/templates/web/rutland/about/faq-en-gb.html
@@ -3,7 +3,7 @@
 <div class="sticky-sidebar">
     <aside>
         <ul class="plain-list">
-            <li><strong>Frequently Asked Questions</strong</li>
+            <li><strong>Frequently Asked Questions</strong></li>
             <li><a href="/privacy">Privacy and cookies</a></li>
             <li><a href="https://www.rutland.gov.uk/my-council/contact-us/">Contact Rutland County Council</a></li>
         </ul>
-- 
cgit v1.2.3


From b93e33f8be67642feea27af44d120a2b7c3434dc Mon Sep 17 00:00:00 2001
From: Kennt Calixto <kennet.emerson@gmail.com>
Date: Sat, 5 Sep 2020 17:54:38 -0300
Subject: Update pt_BR translation.

---
 locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po | 3345 +++++++++++--------------
 1 file changed, 1451 insertions(+), 1894 deletions(-)

diff --git a/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po
index 8409aef2d..dd50bbcab 100644
--- a/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -1,42 +1,40 @@
 # FixMyStreet original .po file, autogenerated by gettext-extract.
 # Copyright (C) 2011 UK Citizens Online Democracy
 # This file is distributed under the same license as the main FixMyStreet code.
-# Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
 # Translators:
-# mySociety <transifex@mysociety.org>, 2019
-# Eugenio Pierazzoli <pierazzoli@gmail.com>, 2019
 #
+# Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
+# mySociety <transifex@mysociety.org>, 2019.
+# Eugenio Pierazzoli <pierazzoli@gmail.com>, 2019.
+# Kennet Calixto <kennet.emerson@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2020-05-06 13:37+0100\n"
-"PO-Revision-Date: 2019-04-29 18:03+0000\n"
-"Last-Translator: Eugenio Pierazzoli <pierazzoli@gmail.com>, 2019\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/mysociety/teams/12067/pt_BR/)\n"
+"PO-Revision-Date: 2020-09-01 17:04-0300\n"
+"Last-Translator: Kennet Calixto <kennet.emerson@gmail.com>\n"
+"Language-Team: English <kde-i18n-doc@kde.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 2.4.1\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:714 perllib/FixMyStreet/DB/Result/Problem.pm:716
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
-msgstr "e"
+msgstr " e "
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:52
-#: templates/web/base/report/new/category_extras.html:17
-#: templates/web/base/report/new/councils_text_all.html:6
-#: templates/web/base/report/new/top_message_none.html:13
-#: templates/web/base/report/new/top_message_none.html:15
-#: templates/web/base/report/new/top_message_some.html:10
+#: templates/web/base/js/translation_strings.html:52 templates/web/base/report/new/category_extras.html:17
+#: templates/web/base/report/new/councils_text_all.html:6 templates/web/base/report/new/top_message_none.html:13
+#: templates/web/base/report/new/top_message_none.html:15 templates/web/base/report/new/top_message_some.html:10
 #: templates/web/base/report/new/top_message_some.html:12
 msgid " or "
-msgstr "ou"
+msgstr " ou "
 
 #: templates/web/base/report/inspect/_extra_details_field.html:5
 msgid "%d characters maximum"
@@ -54,9 +52,7 @@ msgstr "%d de %d de %d"
 msgid "%d users already existed"
 msgstr "%d usuários já existem"
 
-#: templates/web/base/dashboard/heatmap.html:0
-#: templates/web/base/dashboard/heatmap.html:9
-#: templates/web/base/reports/body.html:0
+#: templates/web/base/dashboard/heatmap.html:0 templates/web/base/dashboard/heatmap.html:9 templates/web/base/reports/body.html:0
 #: templates/web/base/reports/body.html:31
 msgid "%s - Summary reports"
 msgstr "Denúncias resumidas"
@@ -68,16 +64,15 @@ msgstr "%s admin:"
 
 #: templates/web/base/status/stats.html:26
 msgid "%s bodies"
-msgstr "%s orgãos"
+msgstr "%s órgãos"
 
 #: templates/web/base/status/stats.html:24
 msgid "%s confirmed alerts, %s unconfirmed"
 msgstr "%s alertas confirmados,%s não confirmados"
 
-#: templates/web/base/status/stats.html:27
-#: templates/web/zurich/admin/index.html:6
+#: templates/web/base/status/stats.html:27 templates/web/zurich/admin/index.html:6
 msgid "%s council contacts &ndash; %s confirmed, %s unconfirmed"
-msgstr "%s contatos do conselho &ntraço ; %s confirmado, %s não confirmado"
+msgstr "%s contatos de órgãos &ndash; %s confirmado, %s não confirmado"
 
 #. ("%s is the site name")
 #: templates/web/base/alert/_index_text.html:3
@@ -86,8 +81,8 @@ msgid ""
 "problems, including alerts for all problems within a particular ward, or all\n"
 "problems within a certain distance of a particular location."
 msgstr ""
-"%s tem uma variedade de feeds RSS e alertas de email para problemas \n"
-"locais,incluindo alertas para todos os problemas dentro de uma ala em particular, \n"
+"%s tem uma variedade de Feeds RSS e alertas de e-mail para problemas \n"
+"locais,incluindo alertas para todos os problemas dentro de um sinalizador em particular, \n"
 "ou todos os problemas dentro de uma certa distância de um determinado local."
 
 #. ("%s is the site name")
@@ -97,16 +92,15 @@ msgid ""
 "alerts for all problems within a particular ward or council, or all problems\n"
 "within a certain distance of a particular location."
 msgstr ""
-"%s tem uma variedade de feeds RSS e alertas de email para problemas \n"
-"locais, incluindo alertas para todos os problemas dentro de uma determinada\n"
-" ala ou conselho, ou todos os problemas dentro de uma certa distância de um determinado local."
+"%s tem uma variedade de Feeds RSS e alertas de e-mail para problemas \n"
+"locais, incluindo alertas para todos os problemas dentro de um determinado\n"
+" sinalizador ou órgão, ou todos os problemas dentro de uma certa distância de um determinado local."
 
 #: templates/web/base/status/stats.html:23
 msgid "%s live updates"
 msgstr "%s atualizações"
 
-#: templates/web/base/dashboard/index.html:166
-#: templates/web/base/dashboard/index.html:169
+#: templates/web/base/dashboard/index.html:166 templates/web/base/dashboard/index.html:169
 msgid "%s opened, %s closed, %s fixed"
 msgstr "%s aberto, %s fechado, %s consertado"
 
@@ -120,19 +114,17 @@ msgstr "%sref:&nbsp;%s"
 
 #: perllib/FixMyStreet/Map/OSM.pm:44
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
-msgstr ""
+msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contribuidores"
 
 #: templates/web/zurich/report/new/fill_in_details_form.html:21
 msgid "(Defect &amp; location of defect)"
-msgstr ""
+msgstr "(Defeito &amp; localização do defeito)"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:50
-#: templates/web/zurich/admin/reports/edit.html:78
+#: templates/web/zurich/admin/report_edit-sdm.html:50 templates/web/zurich/admin/reports/edit.html:78
 msgid "(No name)"
 msgstr "(Sem nome)"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:57
-#: templates/web/zurich/admin/reports/edit.html:85
+#: templates/web/zurich/admin/report_edit-sdm.html:57 templates/web/zurich/admin/reports/edit.html:85
 msgid "(No phone number)"
 msgstr "(Sem número de telefone)"
 
@@ -162,10 +154,9 @@ msgstr "(não existe mais)"
 
 #: templates/web/base/report/_item_small.html:30
 msgid "(not sent to council)"
-msgstr "(não enviado ao conselho)"
+msgstr "(não enviado ao órgão)"
 
-#: templates/web/base/report/new/form_user_loggedin.html:39
-#: templates/web/zurich/report/new/fill_in_details_form.html:59
+#: templates/web/base/report/new/form_user_loggedin.html:39 templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
 msgstr "(opcional)"
 
@@ -180,42 +171,41 @@ msgstr "(enviar ambos)"
 #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]")
 #: templates/web/base/alert/_list.html:29
 msgid "(we also have RSS feeds for problems within %s)"
-msgstr "(também temos feeds RSS para problemas internos %s)"
+msgstr "(também temos Feeds RSS para problemas internos %s)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: 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 "-- Escolha uma categoria --"
 
 #: templates/web/base/report/new/category_extras_fields.html:19
 msgid "-- Pick an option --"
-msgstr " -- Escolha uma opção -- "
+msgstr "-- Escolha uma opção --"
 
 #: templates/web/base/contact/enquiry/index.html:35
-#, fuzzy
 msgid "-- Please select --"
-msgstr "Por favor, selecione um orgão"
+msgstr "-- Selecione --"
 
 #: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
-msgstr "--Escolha um template--"
+msgstr "-- Escolha um modelo --"
 
-#: templates/web/base/admin/bodies/form.html:50
-#: templates/web/base/admin/bodies/form.html:51
+#: templates/web/base/admin/bodies/form.html:50 templates/web/base/admin/bodies/form.html:51
 msgid ""
 "<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n"
 "              This is probably why \"area covered\" is empty (below).<br>\n"
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
+"<code>MAPIT_URL</code> está definido (<code>%s</code>) mas <code>MAPIT_TYPES</code> não está.<br>\n"
+"              Provavelmente por que a \"área coberta\" está vazia (abaixo).<br>\n"
+"              Talvez você deva adicionar<code>MAPIT_TYPES</code> ao seu arquivo de configuração?"
 
 #: templates/web/base/dashboard/index.html:18
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr "Denúncias, Estatísticas e Ações para</h2> <h1>%s</h1>"
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:23 templates/web/base/reports/_list-filters.html:39
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Mostrar</label> %s denúncias <label for=\"filter_categories\">sobre</label> %s"
 
@@ -224,8 +214,7 @@ msgstr "<label for=\"statuses\">Mostrar</label> %s denúncias <label for=\"filte
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> salvo."
 
-#: templates/web/base/status/stats.html:17
-#: 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 "<strong>%s</strong> problemas ao vivo"
 
@@ -235,7 +224,7 @@ msgstr "<strong>Não</strong> Deixe-me confirmar a denúncia por e-mail"
 
 #: templates/web/base/report/form/user_loggedout_by_email_heading.html:5
 msgid "<strong>No</strong> Let me confirm my report by email/text"
-msgstr "<strong>Não</strong> Deixe-me confirmar a denúncia por email/mensagem"
+msgstr "<strong>Não</strong> Deixe-me confirmar a denúncia por e-mail/mensagem"
 
 #: templates/web/base/report/form/user_loggedout_by_email_heading.html:9
 msgid "<strong>No</strong> Let me confirm my update by email"
@@ -252,11 +241,11 @@ msgstr "<strong>Sim</strong> Eu tenho uma senha"
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:78
 msgid "<u>Take or choose existing photo</u>"
-msgstr ""
+msgstr "<u>Tire ou escolha uma foto existente</u>"
 
 #: templates/web/base/admin/bodies/contact-form.html:12
 msgid "A service ID (Open311 or similar)."
-msgstr ""
+msgstr "Um ID de serviço (Open311 ou similar)."
 
 #: templates/web/base/report/new/form_user.html:8
 msgid "About the problem"
@@ -264,10 +253,9 @@ msgstr "Sobre o problema"
 
 #: perllib/FixMyStreet/App/Controller/Root.pm:128
 msgid "Access denied"
-msgstr ""
+msgstr "Acesso negado"
 
-#: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/2fa/intro.html:20 templates/web/base/auth/generate_token.html:61
 msgid "Activate two-factor authentication"
 msgstr "Ativar autenticação de duas etapas"
 
@@ -275,15 +263,14 @@ msgstr "Ativar autenticação de duas etapas"
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/web/base/admin/bodies/form.html:3
-#: templates/web/base/admin/bodies/form.html:4
+#: templates/web/base/admin/bodies/form.html:3 templates/web/base/admin/bodies/form.html:4
 msgid ""
 "Add a <strong>body</strong> for each administrative body, such as a council or department\n"
 "          to which problem reports can be sent. You can add one or more contacts (for different\n"
 "          categories of problem) to each body."
 msgstr ""
-"Adicionar um <strong>órgão </strong> para cada órgão administrativo, como um conselho ou departamento \n"
-"para o qual relatórios de problemas podem ser enviados. Você pode adicionar um ou mais contatos (para diferentes\n"
+"Adicionar um <strong>órgão </strong> para cada órgão administrativo, como uma secretaria ou departamento \n"
+"para o qual denúncias de problemas podem ser enviados. Você pode adicionar um ou mais contatos (para diferentes\n"
 " categorias de problemas) a cada corpo."
 
 #: templates/web/base/admin/bodies/body.html:61
@@ -291,20 +278,17 @@ msgid "Add a contact using the form below."
 msgstr "Adicione um contato usando o formulário abaixo."
 
 #: templates/web/base/admin/bodies/contact-form.html:108
-#, fuzzy
 msgid "Add another parent category"
-msgstr "Adicionar nova categoria"
+msgstr "Adicionar nova categoria pai"
 
-#: templates/web/base/admin/bodies/form.html:139
-#: templates/web/base/admin/bodies/index.html:78
+#: templates/web/base/admin/bodies/form.html:139 templates/web/base/admin/bodies/index.html:78
 #: templates/web/zurich/admin/bodies/form.html:63
 msgid "Add body"
 msgstr "Adicionar corpo"
 
-#: templates/web/base/auth/change_email.html:2
-#: templates/web/base/auth/change_email.html:7
+#: templates/web/base/auth/change_email.html:2 templates/web/base/auth/change_email.html:7
 msgid "Add email address"
-msgstr "Adicionar e-mail"
+msgstr "Adicionar endereço de e-mail"
 
 #: templates/web/base/admin/reportextrafields/index.html:24
 msgid "Add extra fields"
@@ -318,8 +302,7 @@ msgstr "Adicionar campo"
 msgid "Add fixed state"
 msgstr "Adicionar estado fixo"
 
-#: templates/web/base/admin/bodies/body.html:146
-#: templates/web/zurich/admin/bodies/body.html:33
+#: templates/web/base/admin/bodies/body.html:146 templates/web/zurich/admin/bodies/body.html:33
 msgid "Add new category"
 msgstr "Adicionar nova categoria"
 
@@ -327,27 +310,20 @@ msgstr "Adicionar nova categoria"
 msgid "Add option"
 msgstr "Adicionar opção"
 
-#: templates/web/base/auth/change_phone.html:2
-#: templates/web/base/auth/change_phone.html:7
+#: templates/web/base/auth/change_phone.html:2 templates/web/base/auth/change_phone.html:7
 msgid "Add phone number"
 msgstr "Adicionar número de telefone"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
-#: templates/web/base/report/_main.html:149
-#: templates/web/base/report/_main.html:25
-#: templates/web/base/report/_main.html:36
+#: templates/web/base/report/_item.html:10 templates/web/base/report/_item.html:16 templates/web/base/report/_main.html:149
+#: templates/web/base/report/_main.html:25 templates/web/base/report/_main.html:36
 msgid "Add to shortlist"
-msgstr "Adicione para lista"
+msgstr "Adicione para lista de atalhos"
 
-#: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/edit.html:4 templates/web/base/admin/users/index.html:95 templates/web/base/admin/users/index.html:98
 msgid "Add user"
 msgstr "Adicione usuário"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:777 perllib/FixMyStreet/Cobrand/KiitC.pm:209
 msgid "Add/edit problem categories"
 msgstr "Adicionar / editar categorias de problemas"
 
@@ -365,7 +341,7 @@ msgstr "%s Adicionado"
 
 #: templates/web/base/report/_main.html:158
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
-msgstr ""
+msgstr "Adicionar esta denúncia à sua lista de atalhos a removerá da lista de% s."
 
 #: templates/web/base/main_nav_items.html:31
 msgid "Admin"
@@ -377,14 +353,13 @@ msgstr "Novamente:"
 
 #: templates/web/base/admin/timeline.html:35
 msgid "Alert %d created for %s, type %s, parameters %s / %s"
-msgstr ""
+msgstr "Alerta %d criado para %s, tipo %s, parâmetros %s / %s"
 
 #: templates/web/base/admin/timeline.html:37
 msgid "Alert %d disabled (created %s)"
-msgstr ""
+msgstr "Alerta %d desativado (criado %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:46 templates/web/base/report/update/form_user_loggedin.html:35
 msgid "Alert me to future updates"
 msgstr "Alerte me para futuras atualizações"
 
@@ -392,11 +367,8 @@ msgstr "Alerte me para futuras atualizações"
 msgid "Alerts:"
 msgstr "Alertas:"
 
-#: templates/web/base/dashboard/index.html:40
-#: templates/web/base/dashboard/index.html:52
-#: templates/web/base/dashboard/index.html:65
-#: templates/web/base/reports/_list-filter-status.html:4
-#: templates/web/zurich/reports/_list-filter-status.html:2
+#: templates/web/base/dashboard/index.html:40 templates/web/base/dashboard/index.html:52 templates/web/base/dashboard/index.html:65
+#: templates/web/base/reports/_list-filter-status.html:4 templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Tudo"
 
@@ -408,25 +380,21 @@ msgstr "Todos as Denúncias"
 msgid "All Reports as CSV"
 msgstr "Todos as denúncias em CSV"
 
-#: templates/web/base/admin/category-multiselect.html:5
-#: templates/web/base/admin/responsepriorities/index.html:26
+#: templates/web/base/admin/category-multiselect.html:5 templates/web/base/admin/responsepriorities/index.html:26
 #: templates/web/base/admin/templates/view.html:19
 msgid "All categories"
 msgstr "Todas categorias"
 
 #: templates/web/base/admin/reportextrafields/edit.html:26
 msgid "All cobrands"
-msgstr ""
+msgstr "Todas as cobranças"
 
 #: templates/web/base/admin/reportextrafields/edit.html:47
 msgid "All languages"
 msgstr "Todas as línguas"
 
-#: templates/web/base/navigation/_all_reports.html:0
-#: templates/web/base/navigation/_all_reports.html:12
-#: templates/web/zurich/admin/index-dm.html:14
-#: templates/web/zurich/admin/stats/index.html:11
-#: templates/web/zurich/footer.html:20
+#: templates/web/base/navigation/_all_reports.html:0 templates/web/base/navigation/_all_reports.html:12
+#: templates/web/zurich/admin/index-dm.html:14 templates/web/zurich/admin/stats/index.html:11 templates/web/zurich/footer.html:20
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Todos as denúncias"
@@ -451,39 +419,32 @@ msgstr "Como alternativa, podemos ocultar o seu nome de <strong>todas as suas de
 msgid "Always fetch all problems"
 msgstr "Sempre buscar todos os problemas"
 
-#: templates/web/base/admin/bodies/contact-form.html:10
-#: templates/web/base/admin/bodies/contact-form.html:16
+#: templates/web/base/admin/bodies/contact-form.html:10 templates/web/base/admin/bodies/contact-form.html:16
 msgid "An email address or service ID (Open311 or similar)."
-msgstr ""
+msgstr "Um endereço de e-mail ou ID de serviço (Open311 ou similar)."
 
 #: templates/web/base/admin/bodies/contact-form.html:14
-#, fuzzy
 msgid "An email address."
-msgstr "Adicionar e-mail"
+msgstr "Adicionar e-mail."
 
 #: templates/web/base/questionnaire/index.html:33
 msgid "An update marked this problem as fixed."
 msgstr "Uma atualização marcou este problema como solucionado."
 
-#: templates/web/base/admin/list_updates.html:33
-#: templates/web/base/admin/problem_row.html:20
+#: templates/web/base/admin/list_updates.html:33 templates/web/base/admin/problem_row.html:20
 msgid "Anonymous"
 msgstr "Anônimo"
 
-#: templates/web/base/report/new/form_user_loggedin.html:22
-#: templates/web/base/report/update/form_user_loggedin.html:19
+#: templates/web/base/report/new/form_user_loggedin.html:22 templates/web/base/report/update/form_user_loggedin.html:19
 msgid "Anonymous user"
 msgstr "Usuário anônimo"
 
-#: templates/web/base/admin/reports/edit.html:135
-#: templates/web/base/admin/update_edit.html:23
-#: templates/web/base/admin/update_edit.html:96
-#: templates/web/base/report/update/moderation_diff.html:5
+#: templates/web/base/admin/reports/edit.html:135 templates/web/base/admin/update_edit.html:23
+#: templates/web/base/admin/update_edit.html:96 templates/web/base/report/update/moderation_diff.html:5
 msgid "Anonymous:"
 msgstr "Anônimo:"
 
-#: templates/web/base/report/new/form_user_loggedin.html:25
-#: templates/web/base/report/update/form_user_loggedin.html:16
+#: templates/web/base/report/new/form_user_loggedin.html:25 templates/web/base/report/update/form_user_loggedin.html:16
 msgid "Another user"
 msgstr "Outro usuário"
 
@@ -493,18 +454,14 @@ msgid "Are you sure you want to cancel this upload?"
 msgstr "Tem certeza de que deseja cancelar este upload?"
 
 #. ("JS")
-#: templates/web/base/admin/manifesttheme/form.html:62
-#: templates/web/base/admin/reports/edit.html:85
-#: templates/web/base/admin/roles/form.html:25
-#: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/manifesttheme/form.html:62 templates/web/base/admin/reports/edit.html:85
+#: templates/web/base/admin/roles/form.html:25 templates/web/base/admin/states/index.html:48
+#: templates/web/base/admin/templates/edit.html:88 templates/web/base/js/translation_strings.html:99
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Você tem certeza?"
 
-#: templates/web/base/admin/bodies/body.html:21
-#: templates/web/base/admin/bodies/form.html:77
+#: templates/web/base/admin/bodies/body.html:21 templates/web/base/admin/bodies/form.html:77
 #: templates/web/zurich/admin/bodies/form.html:36
 msgid "Area covered"
 msgstr "Área coberta"
@@ -513,28 +470,29 @@ msgstr "Área coberta"
 msgid "Area:"
 msgstr "Área:"
 
-#: templates/web/base/admin/bodies/body.html:65
-#: templates/web/base/admin/bodies/index.html:19
-msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category."
-msgstr "Como este é um site de testes e %s é falso, as denúncias feitas neste site serão enviadas para o relator do problema, não para o contato fornecido na categoria da denúncia."
+#: templates/web/base/admin/bodies/body.html:65 templates/web/base/admin/bodies/index.html:19
+msgid ""
+"As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for "
+"the report’s category."
+msgstr ""
+"Como este é um site de testes e %s é falso, as denúncias feitas neste site serão enviadas para o relator do problema, não para o "
+"contato fornecido na categoria da denúncia."
 
 #: templates/web/base/admin/users/index.html:73
-#, fuzzy
 msgid "Assign selected to role:"
-msgstr "Atribuir usuários à áreas"
+msgstr "Atribuir usuários à áreas:"
 
 #: templates/web/zurich/admin/reports/edit.html:199
 msgid "Assign to competent body:"
-msgstr "Atribuir ao orgão competente:"
+msgstr "Atribuir ao órgão competente:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
-#: templates/web/zurich/admin/stats/index.html:57
+#: templates/web/zurich/admin/reports/edit.html:158 templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Atribuir a uma categoria diferente:"
 
 #: templates/web/zurich/admin/reports/edit.html:197
 msgid "Assign to external body:"
-msgstr "Atribuir a um orgão externo:"
+msgstr "Atribuir a um órgão externo:"
 
 #: templates/web/zurich/admin/reports/edit.html:176
 msgid "Assign to subdivision:"
@@ -549,16 +507,20 @@ msgid "Assigned to %s"
 msgstr "Atribuído a: %s"
 
 #: templates/web/base/open311/index.html:76
-msgid "At most %d requests are returned in each query.  The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date."
+msgid ""
+"At most %d requests are returned in each query.  The returned requests are ordered by requested_datetime, so to get all requests, do "
+"several searches with rolling start_date and end_date."
 msgstr ""
+"No máximo %d requisições são retornadas em cada consulta. As requisições retornadas são ordenadas por requested_datetime, e para "
+"pegar todas as requisições, faça várias consultas com start_date e end_date."
 
 #: templates/web/base/open311/index.html:68
 msgid "At the moment only searching for and looking at reports work."
-msgstr ""
+msgstr "No momento, apenas a pesquisa e a visualização de denúncias funcionam."
 
 #: templates/web/base/admin/users/form.html:99
 msgid "Authorised staff users can be associated with the categories in which they operate."
-msgstr ""
+msgstr "Usuários autorizados podem ser associados às categorias em que operam."
 
 #: templates/web/base/admin/templates/view.html:9
 msgid "Auto Response"
@@ -580,8 +542,7 @@ msgstr "Tempo médio entre a denúncia de um problema e a solução das últimas
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Evite informações pessoais e números de placa de veículos"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
-#: templates/web/zurich/report/_item.html:11
+#: perllib/FixMyStreet/DB/Result/Problem.pm:342 templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Aguardando moderação"
 
@@ -596,7 +557,7 @@ msgstr "Voltar para todas as denúncias"
 
 #: templates/web/base/admin/manifesttheme/index.html:9
 msgid "Background Colour"
-msgstr ""
+msgstr "Cor de fundo"
 
 #: templates/web/base/admin/report_blocks.html:18
 msgid "Ban user"
@@ -604,31 +565,23 @@ msgstr "Banir usuário"
 
 #: templates/web/base/admin/extra-metadata-item.html:35
 msgid "Behaviour"
-msgstr ""
+msgstr "Comportamento"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
-#: templates/web/base/admin/bodies/index.html:1
-#: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: perllib/FixMyStreet/Cobrand/Default.pm:693 perllib/FixMyStreet/Cobrand/Default.pm:776 perllib/FixMyStreet/Cobrand/KiitC.pm:208
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:325 perllib/FixMyStreet/Cobrand/Zurich.pm:418 templates/web/base/admin/bodies/index.html:1
+#: templates/web/base/admin/reports/edit.html:56 templates/web/zurich/header.html:52
 msgid "Bodies"
-msgstr "Orgãos"
+msgstr "Órgãos"
 
-#: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:69
-#: templates/web/base/admin/reports/index.html:15
-#: templates/web/base/admin/users/import.html:25
-#: templates/web/base/admin/users/import.html:48
+#: templates/web/base/admin/flagged.html:17 templates/web/base/admin/index.html:69 templates/web/base/admin/reports/index.html:15
+#: templates/web/base/admin/users/import.html:25 templates/web/base/admin/users/import.html:48
 #: templates/web/base/admin/users/index.html:45
 msgid "Body"
-msgstr "Orgão"
+msgstr "Órgão"
 
 #: templates/web/base/admin/users/form.html:53
 msgid "Body:"
-msgstr "Orgão:"
+msgstr "Órgão:"
 
 #: templates/web/base/admin/users/import.html:12
 msgid "CSV File"
@@ -636,40 +589,29 @@ msgstr "Arquivo CSV"
 
 #: templates/web/base/auth/token.html:27 templates/web/base/email_sent.html:20
 msgid "Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time."
-msgstr ""
+msgstr "Não encontrou nosso e-mail? Cheque sua pasta de spam&nbsp;&ndash; esta é a solução em 99% das vezes."
 
 #: templates/web/base/around/_report_banner.html:5
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Não consegue ver o mapa? <em>Pular este passo</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: templates/web/base/admin/responsepriorities/index.html:8
-#: templates/web/base/admin/templates/view.html:7
+#: perllib/FixMyStreet/Cobrand/Default.pm:693 perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: templates/web/base/admin/responsepriorities/index.html:8 templates/web/base/admin/templates/view.html:7
 msgid "Categories"
 msgstr "Categorias"
 
-#: templates/web/base/admin/category-checkboxes.html:26
-#: templates/web/base/admin/category-multiselect.html:2
+#: templates/web/base/admin/category-checkboxes.html:26 templates/web/base/admin/category-multiselect.html:2
 #: templates/web/base/admin/responsepriorities/edit.html:31
 msgid "Categories:"
 msgstr "Categorias:"
 
-#: templates/web/base/admin/bodies/_category_field.html:12
-#: templates/web/base/admin/bodies/body.html:73
-#: templates/web/base/admin/stats/fix_rate.html:4
-#: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
-#: templates/web/base/report/new/category.html:23
-#: templates/web/base/report/new/category_wrapper.html:3
-#: templates/web/zurich/admin/bodies/body.html:14
-#: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
-#: templates/web/zurich/admin/stats/index.html:26
-#: templates/web/zurich/admin/stats/index.html:71
+#: templates/web/base/admin/bodies/_category_field.html:12 templates/web/base/admin/bodies/body.html:73
+#: templates/web/base/admin/stats/fix_rate.html:4 templates/web/base/dashboard/index.html:101 templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:74 templates/web/base/report/new/category.html:23
+#: templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/bodies/body.html:14
+#: templates/web/zurich/admin/bodies/form.html:25 templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/stats/index.html:26 templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
 msgstr "Categoria"
 
@@ -681,51 +623,44 @@ msgstr "Categoria e estado"
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Categoria alterada de ‘%s’ para ‘%s’"
 
-#: templates/web/base/admin/stats/fix_rate.html:1
-#: templates/web/base/admin/stats/index.html:14
+#: 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 "Taxa de correção para categoria de problemas > 4 semanas "
-
-#: templates/web/base/admin/reports/edit.html:131
-#: templates/web/base/dashboard/index.html:39
-#: templates/web/base/report/update/moderation_diff.html:7
-#: templates/web/zurich/admin/bodies/contact-form.html:8
-#: templates/web/zurich/admin/report_edit-sdm.html:60
-#: templates/web/zurich/admin/reports/edit.html:88
+msgstr "Taxa de correção para categoria de problemas > 4 semanas"
+
+#: templates/web/base/admin/reports/edit.html:131 templates/web/base/dashboard/index.html:39
+#: templates/web/base/report/update/moderation_diff.html:7 templates/web/zurich/admin/bodies/contact-form.html:8
+#: templates/web/zurich/admin/report_edit-sdm.html:60 templates/web/zurich/admin/reports/edit.html:88
 msgid "Category:"
 msgstr "Categoria:"
 
-#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44
-#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57
+#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 templates/web/base/my/my.html:52 templates/web/base/my/my.html:57
 msgid "Change"
 msgstr "Alterar"
 
-#: templates/web/base/auth/change_email.html:2
-#: templates/web/base/auth/change_email.html:3
+#: templates/web/base/auth/change_email.html:2 templates/web/base/auth/change_email.html:3
 msgid "Change email address"
 msgstr "Alterar e-mail"
 
-#: templates/web/base/auth/change_password.html:2
-#: templates/web/base/auth/change_password.html:5
-#: templates/web/base/my/my.html:64 templates/web/base/my/my.html:68
+#: templates/web/base/auth/change_password.html:2 templates/web/base/auth/change_password.html:5 templates/web/base/my/my.html:64
+#: templates/web/base/my/my.html:68
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/web/base/auth/change_phone.html:2
-#: templates/web/base/auth/change_phone.html:3
+#: templates/web/base/auth/change_phone.html:2 templates/web/base/auth/change_phone.html:3
 msgid "Change phone number"
 msgstr "Alterar o número do telefone"
 
 #: templates/web/base/auth/generate_token.html:56
-#, fuzzy
 msgid "Change two-factor authentication"
-msgstr "Ativar autenticação de duas etapas"
+msgstr "Ativar autenticação de dois fatores"
 
 #: templates/web/base/admin/bodies/_category_field.html:3
 msgid ""
 "Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n"
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
-msgstr "Escolha o nome de uma <strong>categoria</strong> que faça sentido para o público (por exemplo, \"Buraco na rua\", \"Iluminação pública\") mas que  também seja útil para o orgão. Elas aparecerão no menu suspenso da página de denunciar um problema."
+msgstr ""
+"Escolha o nome de uma <strong>categoria</strong> que faça sentido para o público (por exemplo, \"Buraco na rua\", \"Iluminação pública"
+"\") mas que  também seja útil para o órgão. Elas aparecerão no menu suspenso da página de denunciar um problema."
 
 #: templates/web/base/report/_inspect.html:44
 msgid "Choose another"
@@ -742,23 +677,23 @@ msgstr "Clique no mapa para denunciar um problema"
 
 #: templates/web/base/email_sent.html:13
 msgid "Click the link in our confirmation email to activate your alert."
-msgstr "Clique no link em nosso email de confrmação para ativar seu alerta."
+msgstr "Clique no link em nosso e-mail de confrmação para ativar seu alerta."
 
 #: templates/web/base/email_sent.html:9
 msgid "Click the link in our confirmation email to publish your problem."
-msgstr "Clique no link em nosso email de confrmação para publicar seu problema."
+msgstr "Clique no link em nosso e-mail de confrmação para publicar seu problema."
 
 #: templates/web/base/email_sent.html:11
 msgid "Click the link in our confirmation email to publish your update."
-msgstr " Clique no link em nosso email de confrmação para publicar sua atualização."
+msgstr "Clique no link do seu e-mail de confirmação para publicar sua atualização."
 
 #: templates/web/base/auth/token.html:23
 msgid "Click the link in our confirmation email to sign in."
-msgstr "Clique no link de nosso email de confirmação para entrar"
+msgstr "Clique no link de seu e-mail de confirmação para entrar."
 
 #: templates/web/base/auth/token.html:20
 msgid "Click the link in that email to sign in."
-msgstr "Clique no link do email para entrar."
+msgstr "Clique no link do e-mail para entrar."
 
 #: templates/web/base/report/new/fill_in_details_form.html:7
 msgid "Click the map or drag the pin to adjust the location"
@@ -766,23 +701,18 @@ msgstr "Clique no mapa ou arraste o pino para ajustar a localização"
 
 #: templates/web/base/report/new/duplicate_suggestions.html:6
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
-#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:72
-#: templates/web/base/admin/states/index.html:103
-#: templates/web/base/admin/states/index.html:27
-#: templates/web/base/admin/states/index.html:33
-#: templates/web/base/dashboard/index.html:118
-#: templates/web/zurich/admin/stats/index.html:52
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 perllib/FixMyStreet/Cobrand/Zurich.pm:158 perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:72 templates/web/base/admin/states/index.html:103
+#: templates/web/base/admin/states/index.html:27 templates/web/base/admin/states/index.html:33
+#: templates/web/base/dashboard/index.html:118 templates/web/zurich/admin/stats/index.html:52
 msgid "Closed"
 msgstr "Fechado"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:905
 msgid "Closed by council"
-msgstr "Fechado pelo conselho"
+msgstr "Fechado pelo órgão responsável"
 
 #: templates/web/base/admin/reports/edit.html:181
 msgid "Closed to updates"
@@ -792,27 +722,21 @@ msgstr "Fechado para atualizações"
 msgid "Co-ordinates:"
 msgstr "Coordenadas:"
 
-#: templates/web/base/admin/list_updates.html:10
-#: templates/web/base/admin/manifesttheme/index.html:6
-#: templates/web/base/admin/reportextrafields/edit.html:24
-#: templates/web/base/admin/reportextrafields/index.html:7
+#: templates/web/base/admin/list_updates.html:10 templates/web/base/admin/manifesttheme/index.html:6
+#: templates/web/base/admin/reportextrafields/edit.html:24 templates/web/base/admin/reportextrafields/index.html:7
 msgid "Cobrand"
-msgstr ""
+msgstr "Multimarca"
 
-#: templates/web/base/admin/reports/edit.html:99
-#: templates/web/base/admin/update_edit.html:54
+#: templates/web/base/admin/reports/edit.html:99 templates/web/base/admin/update_edit.html:54
 msgid "Cobrand data:"
-msgstr ""
+msgstr "Dados multimarca:"
 
-#: templates/web/base/admin/reports/edit.html:98
-#: templates/web/base/admin/update_edit.html:53
+#: templates/web/base/admin/reports/edit.html:98 templates/web/base/admin/update_edit.html:53
 msgid "Cobrand:"
-msgstr ""
+msgstr "Multimarca:"
 
-#: templates/web/base/admin/extra-metadata-item.html:29
-#: templates/web/base/auth/2fa/form-add.html:11
-#: templates/web/base/auth/2fa/form.html:17
-#: templates/web/base/auth/smsform.html:24
+#: templates/web/base/admin/extra-metadata-item.html:29 templates/web/base/auth/2fa/form-add.html:11
+#: templates/web/base/auth/2fa/form.html:17 templates/web/base/auth/smsform.html:24
 msgid "Code"
 msgstr "Código"
 
@@ -821,9 +745,7 @@ msgstr "Código"
 msgid "Collapse map"
 msgstr "Recolher mapa"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:687 perllib/FixMyStreet/Cobrand/KiitC.pm:321 perllib/FixMyStreet/Cobrand/Zurich.pm:432
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Configuração"
@@ -832,8 +754,7 @@ msgstr "Configuração"
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: templates/web/base/auth/2fa/form.html:1
-#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1
+#: templates/web/base/auth/2fa/form.html:1 templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1
 msgid "Confirm account"
 msgstr "Confirmar conta"
 
@@ -841,23 +762,18 @@ msgstr "Confirmar conta"
 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated."
 msgstr "Confirme por e-mail, fornecendo uma nova senha nesse ponto. Quando você confirmar, sua senha será atualizada."
 
-#: templates/web/base/questionnaire/creator_fixed.html:1
-#: templates/web/base/tokens/confirm_problem.html:1
-#: templates/web/base/tokens/confirm_update.html:1
-#: templates/web/zurich/tokens/confirm_problem.html:1
+#: templates/web/base/questionnaire/creator_fixed.html:1 templates/web/base/tokens/confirm_problem.html:1
+#: templates/web/base/tokens/confirm_update.html:1 templates/web/zurich/tokens/confirm_problem.html:1
 #: templates/web/zurich/tokens/confirm_problem.html:3
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: templates/web/base/admin/bodies/contact-form.html:30
-#: templates/web/base/admin/users/alerts.html:10
-#: templates/web/zurich/admin/bodies/contact-form.html:39
-#: templates/web/zurich/admin/stats/index.html:61
+#: templates/web/base/admin/bodies/contact-form.html:30 templates/web/base/admin/users/alerts.html:10
+#: templates/web/zurich/admin/bodies/contact-form.html:39 templates/web/zurich/admin/stats/index.html:61
 msgid "Confirmed"
 msgstr "Confirmado"
 
-#: templates/web/base/admin/list_updates.html:40
-#: templates/web/base/admin/problem_row.html:36
+#: templates/web/base/admin/list_updates.html:40 templates/web/base/admin/problem_row.html:36
 #: templates/web/base/admin/reports/edit.html:79
 msgid "Confirmed:"
 msgstr "Confirmado:"
@@ -867,9 +783,7 @@ msgstr "Confirmado:"
 msgid "Contact %s"
 msgstr "Contato"
 
-#: templates/web/base/contact/index.html:4
-#: templates/web/base/contact/index.html:5
-#: templates/web/base/contact/submit.html:1
+#: templates/web/base/contact/index.html:4 templates/web/base/contact/index.html:5 templates/web/base/contact/submit.html:1
 msgid "Contact Us"
 msgstr "Contate-nos"
 
@@ -878,21 +792,19 @@ msgid "Contact the team"
 msgstr "Contactar o time"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:62
-#: templates/web/base/report/form/user.html:8
+#: templates/web/base/js/translation_strings.html:62 templates/web/base/report/form/user.html:8
 msgid "Continue"
 msgstr "Continuar"
 
 #: templates/web/base/report/new/duplicate_suggestions.html:17
 msgid "Continue – report a new problem"
-msgstr ""
+msgstr "Continuar - denunciar um novo problema"
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:151
 msgid "Convert location from Easting/Northing"
-msgstr ""
+msgstr "Converter localização de Leste/Norte"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:723
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:753
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:723 perllib/FixMyStreet/App/Controller/Admin/Users.pm:753
 msgid "Could not find user"
 msgstr "Não foi possível encontrar o usuário"
 
@@ -903,31 +815,27 @@ msgstr "Não foi possível encontrar a localização"
 
 #: templates/web/base/admin/list_updates.html:9
 msgid "Council"
-msgstr "Conselho"
+msgstr "Órgão"
 
-#: templates/web/base/admin/bodies/body.html:1
-#: templates/web/base/admin/bodies/body.html:2
-#: templates/web/base/admin/bodies/category.html:1
-#: templates/web/base/admin/bodies/category.html:2
+#: templates/web/base/admin/bodies/body.html:1 templates/web/base/admin/bodies/body.html:2
+#: templates/web/base/admin/bodies/category.html:1 templates/web/base/admin/bodies/category.html:2
 #: templates/web/zurich/admin/bodies/body.html:1
 msgid "Council contacts for %s"
-msgstr ""
+msgstr "Contratos municipais para %s"
 
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
-msgstr ""
+msgstr "Ref municipal:&nbsp;%s"
 
 #: templates/web/base/dashboard/index.html:51
 msgid "Council:"
-msgstr "Conselho:"
+msgstr "Órgão responsável:"
 
-#: templates/web/zurich/admin/stats/index.html:66
-#: templates/web/zurich/admin/stats/index.html:71
+#: templates/web/zurich/admin/stats/index.html:66 templates/web/zurich/admin/stats/index.html:71
 msgid "Count"
-msgstr ""
+msgstr "Contar"
 
-#: templates/web/base/admin/manifesttheme/index.html:31
-#: templates/web/base/admin/roles/index.html:32
+#: templates/web/base/admin/manifesttheme/index.html:31 templates/web/base/admin/roles/index.html:32
 #: templates/web/base/admin/states/index.html:114
 msgid "Create"
 msgstr "Criar"
@@ -940,38 +848,31 @@ msgstr "Criar uma denúncia"
 msgid "Create an account"
 msgstr "Criar uma conta"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
-#: 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 "Criar uma categoria"
 
-#: templates/web/base/admin/responsepriorities/edit.html:41
-#: templates/web/base/admin/responsepriorities/index.html:41
+#: templates/web/base/admin/responsepriorities/edit.html:41 templates/web/base/admin/responsepriorities/index.html:41
 msgid "Create priority"
 msgstr "Criar prioridade"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:765 perllib/FixMyStreet/Cobrand/KiitC.pm:200
 msgid "Create reports/updates as anonymous user"
 msgstr "Criar denúncias/atualizações como usuário anônimo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:766 perllib/FixMyStreet/Cobrand/KiitC.pm:201
 msgid "Create reports/updates as the council"
-msgstr "Criar denúncias/atualizações como o conselho"
+msgstr "Criar denúncias/atualizações como o órgão"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:764 perllib/FixMyStreet/Cobrand/KiitC.pm:199
 msgid "Create reports/updates on a user's behalf"
-msgstr ""
+msgstr "Criar denúncia/atualização em nome de um usuário"
 
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/zurich/admin/templates/edit.html:32
+#: templates/web/base/admin/templates/edit.html:84 templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Criar template"
 
-#: templates/web/base/admin/problem_row.html:34
-#: templates/web/zurich/admin/templates/view.html:10
+#: templates/web/base/admin/problem_row.html:34 templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Criado"
 
@@ -979,10 +880,8 @@ msgstr "Criado"
 msgid "Created %d new users"
 msgstr "%d novos usuários criados"
 
-#: templates/web/base/admin/list_updates.html:39
-#: templates/web/base/admin/reports/edit.html:78
-#: templates/web/base/admin/update_edit.html:55
-#: templates/web/zurich/admin/update_edit.html:29
+#: templates/web/base/admin/list_updates.html:39 templates/web/base/admin/reports/edit.html:78
+#: templates/web/base/admin/update_edit.html:55 templates/web/zurich/admin/update_edit.html:29
 msgid "Created:"
 msgstr "Criado:"
 
@@ -998,19 +897,15 @@ msgstr "Código de acesso atual:"
 msgid "Currently grouped by %s"
 msgstr "Atualmente agrupado por %s"
 
-#: templates/web/base/admin/bodies/index.html:9
-#: templates/web/base/admin/index.html:17
+#: templates/web/base/admin/bodies/index.html:9 templates/web/base/admin/index.html:17
 msgid "Currently no bodies have been created."
-msgstr ""
+msgstr "Atualmente nenhum corpo foi criado."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 templates/web/zurich/admin/report_edit-sdm.html:92
 msgid "Customer not contactable"
-msgstr ""
+msgstr "Cliente não contatável"
 
-#: templates/web/base/dashboard/index.html:8
-#: templates/web/base/dashboard/index.html:9
-#: templates/web/base/reports/index.html:15
+#: templates/web/base/dashboard/index.html:8 templates/web/base/dashboard/index.html:9 templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Painel de Controle"
@@ -1021,7 +916,7 @@ msgstr "Desativar autenticação de duas etapas"
 
 #: templates/web/zurich/admin/stats/index.html:56
 msgid "Dealt with by subdivision within 5 working days"
-msgstr ""
+msgstr "Processado por subdivisão em 5 dias úteis"
 
 #: templates/web/base/admin/responsepriorities/index.html:9
 msgid "Default"
@@ -1029,120 +924,107 @@ msgstr "Padrão"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:767
 msgid "Default to creating reports/updates as the council"
-msgstr ""
+msgstr "Padrão para criação de denúncias/atualizações como o: órgão"
 
-#: templates/web/base/admin/roles/form.html:25
-#: templates/web/base/admin/users/alerts.html:15
+#: templates/web/base/admin/roles/form.html:25 templates/web/base/admin/users/alerts.html:15
 msgid "Delete"
 msgstr "Excluír"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79 templates/web/base/admin/templates/edit.html:88
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Deletar template"
 
 #: templates/web/base/admin/manifesttheme/form.html:62
-#, fuzzy
 msgid "Delete theme"
-msgstr "Deletar template"
+msgstr "Deletar tema"
 
-#: templates/web/base/admin/bodies/contact-form.html:40
-#: templates/web/base/admin/bodies/index.html:31
+#: templates/web/base/admin/bodies/contact-form.html:40 templates/web/base/admin/bodies/index.html:31
 #: templates/web/zurich/admin/bodies/contact-form.html:41
 msgid "Deleted"
 msgstr "Deletado"
 
-#: templates/web/base/report/_main.html:125
-#: templates/web/base/report/update.html:56
+#: templates/web/base/report/_main.html:125 templates/web/base/report/update.html:56
 msgid "Describe why you are moderating this"
-msgstr ""
+msgstr "Descreva por que você está moderando isto"
 
-#: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/base/admin/responsepriorities/index.html:7 templates/web/zurich/admin/index-dm.html:24
+#: templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports/index.html:12
 msgid "Description"
 msgstr "Descrição"
 
 #: templates/web/base/admin/bodies/contact-form.html:7
-#, fuzzy
 msgid "Destination"
-msgstr "Descrição"
+msgstr "Destino"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:442
 msgid "Detailed information is limited to %d characters."
-msgstr ""
+msgstr "Informações detalhadas são limitadas a %d caracteres."
 
 #. ("JS")
-#: templates/web/base/admin/users/alerts.html:12
-#: templates/web/base/js/translation_strings.html:47
+#: templates/web/base/admin/users/alerts.html:12 templates/web/base/js/translation_strings.html:47
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
 msgid "Details"
 msgstr "Detalhes"
 
-#: templates/web/base/admin/reports/edit.html:124
-#: templates/web/base/report/update/moderation_diff.html:3
-#: templates/web/zurich/admin/report_edit-sdm.html:29
-#: templates/web/zurich/admin/reports/edit.html:31
+#: templates/web/base/admin/reports/edit.html:124 templates/web/base/report/update/moderation_diff.html:3
+#: templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/reports/edit.html:31
 #: templates/web/zurich/admin/reports/edit.html:45
 msgid "Details:"
 msgstr "Detalhes:"
 
 #: templates/web/base/dashboard/index.html:105
 msgid "Device and Site"
-msgstr ""
+msgstr "Dispositivo e Site"
 
 #: templates/web/base/admin/bodies/body.html:94
 msgid "Devolved"
-msgstr ""
+msgstr "Desenvolvido"
 
 #: templates/web/base/admin/bodies/edit-league.html:8
 msgid "Diligency prize league table"
-msgstr ""
+msgstr "Tabela da liga de prêmios de diligência"
 
 #: templates/web/base/admin/users/alerts.html:14
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/bodies/contact-form.html:58 templates/web/base/admin/extra-metadata-item.html:99
 msgid "Disable form when this category is selected"
-msgstr ""
+msgstr "Desabilitar formulário quando esta categoria é selecionada"
 
 #: templates/web/base/admin/extra-metadata-option.html:18
 msgid "Disable form when this option is selected"
-msgstr ""
+msgstr "Desabilitar formulário quando esta opção é selecionada"
 
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr "Desabilitado:"
 
-#: templates/web/base/report/_main.html:130
-#: templates/web/base/report/update.html:59
+#: templates/web/base/report/_main.html:130 templates/web/base/report/update.html:59
 msgid "Discard changes"
 msgstr "Descartar mudanças"
 
 #: templates/web/base/admin/extra-metadata-item.html:67
 msgid "Display as"
-msgstr ""
+msgstr "Mostrar como"
 
 #: templates/web/base/admin/extra-metadata-option.html:10
 msgid "Displayed label"
-msgstr ""
+msgstr "Etiqueta mostrada"
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:107
 msgid "Do not send email alerts on fetched comments to problem creator"
-msgstr ""
+msgstr "Não enviar alertas de e-mail sobre comentários para o criador de problemas"
 
 #. ("%s is the site name")
 #: templates/web/base/report/form/user_loggedout.html:5
 msgid "Do you have a %s password?"
-msgstr ""
+msgstr "Você tem uma %s senha?"
 
 #: templates/web/base/questionnaire/index.html:43
 msgid "Don&rsquo;t know"
-msgstr ""
+msgstr "Não sabe"
 
 #: templates/web/base/contact/index.html:128
 msgid "Don't like forms?"
@@ -1150,17 +1032,16 @@ msgstr "Não gosta de formulários?"
 
 #: templates/web/base/report/_item.html:27
 msgid "Down one"
-msgstr ""
+msgstr "Descer um"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:77
-#, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Arraste e solte as fotos aqui ou <u>clique para enviar</u>"
 
 #: templates/web/base/admin/extra-metadata-item.html:70
 msgid "Drop-down list"
-msgstr ""
+msgstr "Menu Suspenso"
 
 #: templates/web/base/report/_inspect.html:39
 msgid "Duplicate of"
@@ -1177,34 +1058,30 @@ msgid ""
 "            This means you can add many categories even if you only have one contact for the body.\n"
 "    "
 msgstr ""
+"Cada contato para com um órgão tem uma categoria, que é exibida ao público. \n"
+"            Diferentes categorias <strong> podem ter o mesmo contato</strong> (endereço de e-mail).\n"
+"            Isso significa que você pode adicionar muitas categorias, mesmo se você tiver apenas um contato para o órgão.\n"
+"     "
 
-#: templates/web/base/report/_item.html:65
-#: templates/web/base/report/inspect/information.html:22
+#: templates/web/base/report/_item.html:65 templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
-msgstr ""
+msgstr "Leste/Norte:"
 
-#: templates/web/base/admin/list_updates.html:44
-#: templates/web/base/admin/manifesttheme/index.html:22
-#: templates/web/base/admin/problem_row.html:43
-#: templates/web/base/admin/responsepriorities/index.html:34
-#: templates/web/base/admin/roles/index.html:24
-#: templates/web/base/admin/templates/view.html:31
-#: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/base/admin/list_updates.html:44 templates/web/base/admin/manifesttheme/index.html:22
+#: templates/web/base/admin/problem_row.html:43 templates/web/base/admin/responsepriorities/index.html:34
+#: templates/web/base/admin/roles/index.html:24 templates/web/base/admin/templates/view.html:31
+#: templates/web/base/admin/users/index.html:67 templates/web/zurich/admin/problem_row.html:49
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/web/base/admin/bodies/body.html:161
-#: templates/web/base/admin/index.html:43
-#: templates/web/zurich/admin/bodies/body.html:47
+#: templates/web/base/admin/bodies/body.html:161 templates/web/base/admin/index.html:43 templates/web/zurich/admin/bodies/body.html:47
 msgid "Edit body details"
-msgstr ""
+msgstr "Editar detalhes do órgão"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:772 perllib/FixMyStreet/Cobrand/KiitC.pm:206
 msgid "Edit other users' permissions"
-msgstr ""
+msgstr "Editar a permissão de outros usuários"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:757
 msgid "Edit report category"
@@ -1212,40 +1089,34 @@ msgstr "Editar categoria da denúncia"
 
 #: templates/web/base/report/new/form_user.html:13
 msgid "Edit report details"
-msgstr ""
+msgstr "Editar detalhes da denúncia"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:758
 msgid "Edit report priority"
 msgstr "Editar prioridade da denúncia"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:756 perllib/FixMyStreet/Cobrand/KiitC.pm:198
 msgid "Edit reports"
 msgstr "Editar denúncias"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:771 perllib/FixMyStreet/Cobrand/KiitC.pm:205
 msgid "Edit users' details/search for their reports"
-msgstr ""
+msgstr "Editar os detalhes dos usuários/pesquisas para suas denúncias"
 
 #: templates/web/base/report/update/form_user.html:8
 msgid "Edit your update"
 msgstr "Editar sua atualização"
 
-#: templates/web/base/admin/reports/edit.html:0
-#: templates/web/base/admin/reports/edit.html:15
-#: templates/web/base/admin/reports/edit.html:6
-#: templates/web/zurich/admin/report_edit-sdm.html:2
-#: templates/web/zurich/admin/report_edit-sdm.html:6
-#: templates/web/zurich/admin/reports/edit.html:2
+#: templates/web/base/admin/reports/edit.html:0 templates/web/base/admin/reports/edit.html:15
+#: templates/web/base/admin/reports/edit.html:6 templates/web/zurich/admin/report_edit-sdm.html:2
+#: templates/web/zurich/admin/report_edit-sdm.html:6 templates/web/zurich/admin/reports/edit.html:2
 #: templates/web/zurich/admin/reports/edit.html:6
 msgid "Editing problem %d"
 msgstr "Editando problema %d"
 
-#: templates/web/base/admin/update_edit.html:1
-#: templates/web/zurich/admin/update_edit.html:1
+#: templates/web/base/admin/update_edit.html:1 templates/web/zurich/admin/update_edit.html:1
 msgid "Editing update %d"
-msgstr ""
+msgstr "Editando atualização %d"
 
 #: templates/web/base/admin/users/edit.html:2
 msgid "Editing user %d"
@@ -1255,109 +1126,108 @@ msgstr "Editando usuário %d"
 msgid "Editor"
 msgstr "Editor"
 
-#: templates/web/base/admin/bodies/category.html:29
-#: templates/web/base/admin/bodies/index.html:27
-#: templates/web/base/admin/flagged.html:38
-#: templates/web/base/admin/users/import.html:24
-#: templates/web/base/admin/users/import.html:47
-#: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
-#: templates/web/base/report/new/duplicate_suggestions.html:33
-#: templates/web/zurich/admin/bodies/body.html:15
-#: templates/web/zurich/admin/bodies/form.html:9
-#: templates/web/zurich/auth/general.html:14
-#: templates/web/zurich/auth/general.html:37
+#: templates/web/base/admin/bodies/category.html:29 templates/web/base/admin/bodies/index.html:27
+#: templates/web/base/admin/flagged.html:38 templates/web/base/admin/users/import.html:24 templates/web/base/admin/users/import.html:47
+#: templates/web/base/admin/users/index.html:44 templates/web/base/alert/updates.html:21 templates/web/base/report/display_tools.html:50
+#: templates/web/base/report/new/duplicate_suggestions.html:33 templates/web/zurich/admin/bodies/body.html:15
+#: templates/web/zurich/admin/bodies/form.html:9 templates/web/zurich/auth/general.html:14 templates/web/zurich/auth/general.html:37
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
-#: templates/web/base/alert/_list.html:69
-#: templates/web/base/auth/change_email.html:37
-#: templates/web/base/report/new/form_user_loggedin.html:39
-#: templates/web/base/report/update/form_user_loggedin.html:25
+#: templates/web/base/alert/_list.html:69 templates/web/base/auth/change_email.html:37
+#: templates/web/base/report/new/form_user_loggedin.html:39 templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
-msgstr "Endereço de email"
+msgstr "Endereço de e-mail"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:38 templates/web/base/report/new/form_user_loggedin.html:60
 msgid "Email address (optional)"
-msgstr "Endereço de email (opcional)"
+msgstr "Endereço de e-mail (opcional)"
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
-msgstr "Alerta de email criado"
+msgstr "Alerta de e-mail criado"
 
 #: templates/web/base/tokens/confirm_alert.html:10
 msgid "Email alert deleted"
-msgstr "Alerta de email deletado"
+msgstr "Alerta de e-mail deletado"
 
 #: templates/web/base/auth/general.html:106
 msgid "Email me a link or text me a code to sign in"
-msgstr "Me envie um email ou um código por mensagem de texto para entrar"
+msgstr "Me envie um e-mail ou um código por mensagem de texto para entrar"
 
 #: templates/web/base/auth/general.html:108
 msgid "Email me a link to sign in"
-msgstr "Me envie um email para entrar"
+msgstr "Me envie um e-mail para entrar"
 
 #: templates/web/base/admin/users/form.html:28
 msgid "Email verified:"
-msgstr "Email verificado:"
+msgstr "E-mail verificado:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:151 templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
-msgstr "Email:"
+msgstr "E-mail:"
 
 #: templates/web/base/admin/users/alerts.html:13
 msgid "Enable"
 msgstr "Habilitar"
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:156
-#: templates/web/base/admin/bodies/open311-form-fields.html:157
+#: templates/web/base/admin/bodies/open311-form-fields.html:156 templates/web/base/admin/bodies/open311-form-fields.html:157
 msgid ""
 "Enable <strong>Always fetch all problems</strong> if you've enabled Open311 problem-fetching above\n"
 "                and the endpoint always returns a list of all problems. This will suppress error messages about\n"
 "                bad dates in the problems fetched."
 msgstr ""
+"Habilite <strong>Sempre buscar todos os problemas</strong> se você habilitou a busca de problemas do Open311 acima\n"
+"                e o endereço sempre retornará uma lista de todos os problemas. Isso suprimirá mensagens de erro sobre\n"
+"                dados ruins nos problemas buscados."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:143
-#: templates/web/base/admin/bodies/open311-form-fields.html:144
+#: templates/web/base/admin/bodies/open311-form-fields.html:143 templates/web/base/admin/bodies/open311-form-fields.html:144
 msgid ""
 "Enable <strong>Convert location from Easting/Northing</strong> if you've enabled Open311 problem-fetching above\n"
 "                and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude."
 msgstr ""
+"Habilite <strong>Converter localização de Leste / Norte</strong> se você habilitou a busca de problemas do Open311 acima\n"
+"                e os problemas buscados têm a localização em Leste / Norte e não em Latitude / Longitude."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:127
-#: templates/web/base/admin/bodies/open311-form-fields.html:128
+#: templates/web/base/admin/bodies/open311-form-fields.html:127 templates/web/base/admin/bodies/open311-form-fields.html:128
 msgid ""
 "Enable <strong>Open311 problem-fetching</strong> if you want to display reports created at\n"
 "          the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n"
 "          For more information, see \n"
 "          <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>."
 msgstr ""
+"Habilite <strong>a busca de problemas do Open311</strong> se você quiser exibir denúncias criados no\n"
+"          caminho para o FixMyStreet. Se você não tem certeza, você provavelmente não deve habilitar, então deixe isso desmarcado.\n"
+"          Para obter mais informações, consulte \n"
+"          <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>este artigo</a>."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:66
-#: templates/web/base/admin/bodies/open311-form-fields.html:67
+#: templates/web/base/admin/bodies/open311-form-fields.html:66 templates/web/base/admin/bodies/open311-form-fields.html:67
 msgid ""
 "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n"
 "          updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n"
 "          For more information, see \n"
 "          <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>."
 msgstr ""
+"Habilite o <strong>envio de atualizações do Open311</strong> se o caminho envia e recebe\n"
+"          atualizações para denúncias existentes. Se você não tem certeza, provavelmente não deve habilitar, então deixe isso "
+"desmarcado.\n"
+"          Para obter mais informações, consulte \n"
+"          <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>este artigo</a>."
 
-#: templates/web/base/admin/bodies/form.html:121
-#: templates/web/base/admin/bodies/form.html:122
+#: templates/web/base/admin/bodies/form.html:121 templates/web/base/admin/bodies/form.html:122
 msgid ""
 "Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n"
 "          different endpoint (and send method) from the body's. For example, if reports for some categories of\n"
 "          problem must be emailed, while others can be sent over Open311."
 msgstr ""
+"Habilitar a configuração <strong>pode ser retornado</strong> se um ou mais contatos têm um \n"
+"          caminho diferente (e método de envio) do órgão. Por exemplo, se as denúncias para algumas categorias de\n"
+"          problema deve ser enviado por e-mail, enquanto outros podem ser enviados pelo Open311."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:54
-#: templates/web/base/admin/bodies/open311-form-fields.html:55
+#: templates/web/base/admin/bodies/open311-form-fields.html:54 templates/web/base/admin/bodies/open311-form-fields.html:55
 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description"
-msgstr ""
+msgstr "Habilitar isto irá suprimir a mensagem de erro que normalmente é mostrada quando uma atualização não tem descrição"
 
 #: templates/web/base/dashboard/index.html:79
 msgid "End Date"
@@ -1365,21 +1235,19 @@ msgstr "Data Final"
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:21
 msgid "Endpoint"
-msgstr ""
+msgstr "Endereço"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:83
-#, fuzzy
 msgid "Enter a Zürich street name"
-msgstr "Digite um nome de rua e área próximas"
+msgstr "Digite um nome da rua"
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:22
 msgid "Enter a nearby UK postcode, or street name and area"
-msgstr ""
+msgstr "Digite um CEP próximo a sua região, ou nome de rua e bairro"
 
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20
-#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21
 msgid "Enter a nearby postcode, or street name and area"
-msgstr ""
+msgstr "Especifique um CEP, Nome de Rua ou Bairro"
 
 #: templates/web/base/around/postcode_form.html:8
 msgid "Enter a nearby street name and area"
@@ -1390,24 +1258,17 @@ msgid "Enter details of the problem"
 msgstr "Digite detalhes do problema"
 
 #. ("JS")
-#: templates/web/base/errors/generic.html:1
-#: templates/web/base/js/translation_strings.html:7
-#: templates/web/base/tokens/abuse.html:1
-#: templates/web/base/tokens/abuse.html:3
-#: templates/web/base/tokens/error.html:1
-#: templates/web/base/tokens/error.html:5
+#: templates/web/base/errors/generic.html:1 templates/web/base/js/translation_strings.html:7 templates/web/base/tokens/abuse.html:1
+#: templates/web/base/tokens/abuse.html:3 templates/web/base/tokens/error.html:1 templates/web/base/tokens/error.html:5
 msgid "Error"
 msgstr "Erro"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
-#: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:12 templates/web/base/admin/triage/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:16 templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "Tudo"
 
-#: templates/web/base/admin/bodies/body.html:19
-#: templates/web/base/admin/bodies/category.html:19
+#: templates/web/base/admin/bodies/body.html:19 templates/web/base/admin/bodies/category.html:19
 msgid "Example postcode %s"
 msgstr "CEP exemplo %s"
 
@@ -1448,34 +1309,29 @@ msgstr "URL Externa"
 msgid "External body"
 msgstr "Corpo externo"
 
-#: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/reports/edit.html:112 templates/web/base/admin/templates/edit.html:63
 msgid "External status code"
-msgstr ""
+msgstr "Código de status externo"
 
 #: templates/web/base/admin/update_edit.html:57
 msgid "External status code:"
-msgstr ""
+msgstr "Código de status externo:"
 
 #: templates/web/base/admin/reports/edit.html:107
 msgid "External team"
 msgstr "Time externo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
-#: templates/web/base/admin/reportextrafields/edit.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:718 templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "Campos Extras"
 
-#: 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
+#: 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 ""
+msgstr "Dados extra:"
 
-#: templates/web/base/report/_item.html:90
-#: templates/web/base/report/inspect/_extra_details_field.html:2
+#: templates/web/base/report/_item.html:90 templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
 msgstr "Detalhes extras"
@@ -1486,63 +1342,56 @@ msgstr "Campos externos:"
 
 #: templates/web/base/admin/extra-metadata-item.html:38
 msgid "Extra question shown to user"
-msgstr ""
+msgstr "Questão extra mostrada ao usuário"
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
-msgstr ""
+msgstr "Falhou ao enviar a mensagem"
 
-#: templates/web/base/admin/reportextrafields/edit.html:58
-#: templates/web/base/admin/reportextrafields/index.html:9
+#: templates/web/base/admin/reportextrafields/edit.html:58 templates/web/base/admin/reportextrafields/index.html:9
 msgid "Fields"
 msgstr "Campos"
 
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:42
 msgid "File type not recognised. Please upload an image."
-msgstr ""
+msgstr "Tipo de arquivo não reconhecido. Por favor, carregue uma imagem."
 
-#: templates/web/base/report/form/user_loggedout_password.html:21
-#: templates/web/base/report/form/user_loggedout_password.html:8
+#: templates/web/base/report/form/user_loggedout_password.html:21 templates/web/base/report/form/user_loggedout_password.html:8
 msgid "Fill in your details manually."
-msgstr "Preencha seus detalhes manualmente"
+msgstr "Preencha seus detalhes manualmente."
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:71
 msgid "Filter"
-msgstr ""
+msgstr "Filtro"
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
+#: templates/web/zurich/admin/index-dm.html:35 templates/web/zurich/admin/index-sdm.html:30
 msgid "Filter report list"
 msgstr "Filtrar lista de denúncias"
 
-#: templates/web/base/questionnaire/creator_fixed.html:16
-#: templates/web/base/questionnaire/index.html:68
+#: templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Primeira vez"
 
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
-msgstr ""
+msgstr "Corriga isto escolhendo uma <strong>área coberta</strong> no formulário <em>Editar detalhes do órgão</em> abaixo."
 
-#: perllib/FixMyStreet/App/Controller/Admin/States.pm:35
-#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:179
-#: templates/web/base/admin/states/index.html:29
-#: templates/web/base/admin/stats/fix_rate.html:4
+#: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:179
+#: templates/web/base/admin/states/index.html:29 templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:119
 msgid "Fixed"
 msgstr "Resolvido"
 
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:67
 msgid "Fixed - Council"
-msgstr ""
+msgstr "Resolvido - Órgão"
 
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:68
 msgid "Fixed - User"
-msgstr ""
+msgstr "Resolvido - Usuário"
 
-#: templates/web/base/admin/bodies/form.html:96
-#: templates/web/zurich/admin/bodies/form.html:47
+#: templates/web/base/admin/bodies/form.html:96 templates/web/zurich/admin/bodies/form.html:47
 msgid "Flag as deleted"
 msgstr "Marcar como deletado"
 
@@ -1550,124 +1399,110 @@ msgstr "Marcar como deletado"
 msgid "Flag user"
 msgstr "Marcar usuário"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
-#: templates/web/base/admin/users/index.html:47
+#: perllib/FixMyStreet/Cobrand/Default.pm:685 templates/web/base/admin/users/index.html:47
 msgid "Flagged"
-msgstr ""
+msgstr "Marcado"
 
 #: templates/web/base/admin/flagged.html:1
 msgid "Flagged reports and users"
-msgstr ""
+msgstr "Usuários e denúncias marcadas"
 
 #: templates/web/base/admin/users/form.html:110
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
-msgstr ""
+msgstr "Usuários marcados são listados na página <a href='%s'>de marcação</a>."
 
 #: templates/web/base/admin/flagged.html:31
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
-msgstr ""
+msgstr "Os usuários marcados não são restritos de forma alguma. Esta é apenas uma lista de usuários que foram marcados para atenção."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:155 templates/web/base/admin/users/form.html:117
 msgid "Flagged:"
 msgstr "Marcado:"
 
 #: templates/web/base/reports/_ward-list.html:6
 msgid "Follow a ward link to view only reports within that ward."
-msgstr ""
+msgstr "Siga o link de um sinalizador para ver denúncias na área do sinalizador."
 
 #: templates/web/base/report/new/after_photo.html:4
 msgid "For best results include a close-up and a wide shot"
-msgstr ""
+msgstr "Para melhores resultados inclua fotos de perto e na horizontal"
 
 #: templates/web/base/admin/bodies/form.html:73
-msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
+msgid ""
+"For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses "
+"Mapit</a>."
 msgstr ""
+"Para mais informações, veja <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Como o "
+"AjeitaMinhaRua usa Mapit</a>."
 
 #: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:3
 msgid "Forgot password"
 msgstr "Esqueceu a senha"
 
-#: templates/web/base/auth/general.html:98
-#: templates/web/base/report/form/user_loggedout_password.html:20
+#: templates/web/base/auth/general.html:98 templates/web/base/report/form/user_loggedout_password.html:20
 #: templates/web/base/report/form/user_loggedout_password.html:25
 msgid "Forgotten your password?"
 msgstr "Esqueceu sua senha?"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:818
 msgid "Forwarded to external body"
-msgstr "Encaminhado ao orgão externo"
+msgstr "Encaminhado ao órgão externo"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:819
 msgid "Forwarded wish to external body"
-msgstr ""
+msgstr "Desejo encaminhado para órgão externo"
 
-#: templates/web/base/about/_sidebar.html:4
-#: templates/web/base/about/faq-en-gb.html:1
-#: templates/web/base/about/faq-en-gb.html:5
+#: templates/web/base/about/_sidebar.html:4 templates/web/base/about/faq-en-gb.html:1 templates/web/base/about/faq-en-gb.html:5
 msgid "Frequently Asked Questions"
 msgstr "Perguntas Frequentes"
 
-#: templates/web/base/contact/enquiry/index.html:1
-#: templates/web/base/contact/enquiry/index.html:3
+#: templates/web/base/contact/enquiry/index.html:1 templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
-msgstr ""
+msgstr "Inquérito geral"
 
 #: templates/web/base/auth/generate_token.html:78
 msgid "Generate token"
 msgstr "Gerar token"
 
-#: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:15
-#: templates/web/base/report/new/duplicate_suggestions.html:36
-#: templates/web/base/report/new/duplicate_suggestions.html:39
+#: templates/web/base/around/_updates.html:3 templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/new/duplicate_suggestions.html:36 templates/web/base/report/new/duplicate_suggestions.html:39
 #: templates/web/base/report/new/duplicate_suggestions.html:45
 msgid "Get updates"
 msgstr "Receber atualizações"
 
-#: templates/web/base/reports/_rss.html:12
-#: templates/web/base/reports/_rss.html:4
+#: templates/web/base/reports/_rss.html:12 templates/web/base/reports/_rss.html:4
 msgid "Get updates of %s problems"
-msgstr ""
+msgstr "Receber atualizações de %s problemas"
 
-#: templates/web/base/reports/_rss.html:14
-#: templates/web/base/reports/_rss.html:4
+#: templates/web/base/reports/_rss.html:14 templates/web/base/reports/_rss.html:4
 msgid "Get updates of problems in this %s"
-msgstr ""
+msgstr "Receber atualizações de problemas em %s"
 
 #: templates/web/base/alert/_list.html:80
 msgid "Give me an RSS feed"
-msgstr ""
+msgstr "Incluir em um Feed RSS"
 
 #: templates/web/base/admin/reportextrafields/edit.html:6
 msgid "Give this collection of fields a name. It is not shown publicly, just here in the admin."
-msgstr ""
+msgstr "Dê um nome a essa coleção de campos. Ela não é mostrado publicamente, apenas aqui na administração."
 
 #: templates/web/base/questionnaire/completed.html:14
 msgid "Glad to hear it’s been fixed!"
 msgstr "Ficamos felizes em saber que foi solucionado!"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/index.html:37
-#: templates/web/base/admin/index.html:54
-#: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
-#: templates/web/base/admin/users/index.html:32
-#: templates/web/base/around/_postcode_submit_button.html:2
-#: templates/web/base/around/_postcode_submit_button.html:5
-#: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
-#: templates/web/base/reports/index.html:89
-#: templates/web/zurich/admin/stats/index.html:37
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/index.html:37 templates/web/base/admin/index.html:54
+#: templates/web/base/admin/responsepriorities/index.html:48 templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/admin/triage/_list-filters.html:39 templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/users/index.html:32 templates/web/base/around/_postcode_submit_button.html:2
+#: templates/web/base/around/_postcode_submit_button.html:5 templates/web/base/reports/_list-filters-sort.html:13
+#: templates/web/base/reports/_list-filters.html:40 templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/index.html:89 templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
 msgstr "Ir"
 
 #: templates/web/base/admin/reports/edit.html:101
 msgid "Going to send questionnaire?"
-msgstr ""
+msgstr "Vai enviar questionário?"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Grant access to the admin"
@@ -1675,7 +1510,7 @@ msgstr "Garantir acesso ao administrador"
 
 #: templates/web/base/admin/stats/index.html:7
 msgid "Graph of problem creation by status over time"
-msgstr ""
+msgstr "Gráfico de criação de problemas por status no decorrer do tempo"
 
 #: templates/web/base/dashboard/index.html:95
 msgid "Group by %s"
@@ -1691,43 +1526,41 @@ msgstr "Este problema foi solucionado?"
 
 #: templates/web/base/questionnaire/index.html:63
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
-msgstr "Você já denunciou um problema para um concelho antes, ou esta é sua primeira vez?"
+msgstr "Você já denunciou um problema para um município antes, ou esta é sua primeira vez?"
 
-#: templates/web/base/admin/stats/index.html:17
-#: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/admin/stats/index.html:17 templates/web/base/admin/stats/index.html:23
 msgid "Heatmap"
-msgstr ""
+msgstr "Mapa de calor"
 
-#: 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/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 "Ajuda"
 
-#: templates/web/base/report/new/category_extras.html:17
-#: templates/web/base/report/new/category_extras.html:18
-msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online."
+#: templates/web/base/report/new/category_extras.html:17 templates/web/base/report/new/category_extras.html:18
+msgid ""
+"Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published "
+"online."
 msgstr ""
+"Ajude <string>%s</strong> a resolver seu problema mais rápido, fornecendo alguns detalhes extras. Estas informações não serão "
+"publicadas no site."
 
 #: templates/web/base/around/on_map_list_items.html:8
 msgid "Here are some other nearby reports:"
-msgstr ""
+msgstr "Aqui estão algumas das denúncias nas redondezas:"
 
 #: templates/web/zurich/footer.html:11
 msgid "Hi %s"
-msgstr "Oi"
+msgstr "Oi %s"
 
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:65
-#: templates/web/base/admin/update_edit.html:30
-#: templates/web/zurich/admin/stats/index.html:53
-#: templates/web/zurich/admin/update_edit.html:18
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 templates/web/base/admin/update_edit.html:30
+#: templates/web/zurich/admin/stats/index.html:53 templates/web/zurich/admin/update_edit.html:18
 msgid "Hidden"
 msgstr "Escondido"
 
 #: templates/web/base/admin/extra-metadata-item.html:46
 msgid "Hidden data in reporting form"
-msgstr ""
+msgstr "Dados ocultos no formulário de denúncia"
 
 #: templates/web/base/admin/users/form.html:196
 msgid "Hide all reports and updates"
@@ -1737,8 +1570,7 @@ msgstr "Esconder todas as denúncias e atualizações"
 msgid "Hide entire report"
 msgstr "Esconder toda a denúncia"
 
-#: templates/web/base/my/anonymize.html:1
-#: templates/web/base/my/anonymize.html:2
+#: templates/web/base/my/anonymize.html:1 templates/web/base/my/anonymize.html:2
 msgid "Hide my name"
 msgstr "Esconder meu nome"
 
@@ -1755,23 +1587,20 @@ msgid "Hide my name on this report"
 msgstr "Esconder meu nome nesta denúncia"
 
 #. ("JS")
-#: templates/web/base/around/display_location.html:65
-#: templates/web/base/around/display_location.html:73
+#: templates/web/base/around/display_location.html:65 templates/web/base/around/display_location.html:73
 #: templates/web/base/js/translation_strings.html:74
 msgid "Hide pins"
-msgstr "Esconder pinos"
+msgstr "Esconder marcadores"
 
 #: templates/web/base/admin/bodies/contact-form.html:52
-#, fuzzy
 msgid "Hide reports made in this category"
-msgstr "Denunciado na categoria %s"
+msgstr "Esconder denúncias feitas nesta categoria"
 
 #: templates/web/base/report/update.html:18
 msgid "Hide update completely?"
 msgstr "Esconder toda a atualização?"
 
-#: templates/web/base/report/_report_meta_info.html:3
-#: templates/web/base/report/_update_state.html:16
+#: templates/web/base/report/_report_meta_info.html:3 templates/web/base/report/_update_state.html:16
 msgid "Hide your name?"
 msgstr "Esconder seu nome?"
 
@@ -1792,69 +1621,65 @@ msgstr "Como denunciar um problema"
 msgid "How to send successful reports"
 msgstr "Como enviar denúncias com sucesso"
 
-#: templates/web/base/tokens/confirm_problem.html:46
-#: templates/web/base/tokens/confirm_problem.html:51
+#: templates/web/base/tokens/confirm_problem.html:46 templates/web/base/tokens/confirm_problem.html:51
 msgid "I just reported a problem on @fixmystreet"
-msgstr ""
+msgstr "Acabei de denunciar um problema no @ajeitaMinhaRua"
 
-#: templates/web/base/tokens/confirm_update.html:20
-#: templates/web/base/tokens/confirm_update.html:25
+#: templates/web/base/tokens/confirm_update.html:20 templates/web/base/tokens/confirm_update.html:25
 msgid "I just updated a problem on @fixmystreet"
-msgstr ""
+msgstr "Acabei de atualizar um problema no @ajeitaMinhaRua"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:86
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
-msgstr ""
+msgstr "Nós não conseguimos localizar seu problema no banco de dados.\n"
 
-#: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:66
-#: templates/web/base/admin/list_updates.html:6
-#: templates/web/base/admin/reports/index.html:12
-#: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
-#: templates/web/zurich/admin/list_updates.html:24
-#: templates/web/zurich/admin/list_updates.html:38
+#: templates/web/base/admin/flagged.html:14 templates/web/base/admin/index.html:66 templates/web/base/admin/list_updates.html:6
+#: templates/web/base/admin/reports/index.html:12 templates/web/base/admin/users/alerts.html:8
+#: templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/list_updates.html:24 templates/web/zurich/admin/list_updates.html:38
 #: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
-#: templates/web/base/admin/bodies/form.html:32
-#: templates/web/base/admin/bodies/form.html:33
+#: templates/web/base/admin/bodies/form.html:32 templates/web/base/admin/bodies/form.html:33
 msgid ""
 "Identify a <strong>parent</strong> if this body is itself part of another body.\n"
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
+"Identifique um <strong>pai</strong> se este órgão for parte de outro órgão.\n"
+"          Para instalações básicas, você não precisa juntar órgãos desta forma."
 
 #: templates/web/base/auth/token.html:19
 msgid "If there's a user associated with the address you entered, we've sent a confirmation email."
-msgstr ""
+msgstr "Se houver um usuário associado ao endereço inserido, enviaremos um e-mail de confirmação."
 
 #: templates/web/base/admin/responsepriorities/edit.html:12
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
-msgstr ""
+msgstr "Se esta prioridade é passada a um serviço externo, especifique aqui o código de prioridade a ser usado neste serviço."
 
 #: templates/web/base/admin/extra-metadata-item.html:100
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
-msgstr ""
+msgstr "Se marcado, o formulário será desativado e o texto de aviso deste item será exibido."
 
 #: templates/web/base/admin/extra-metadata-item.html:106
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
-msgstr ""
+msgstr "Se marcado, esses dados extras não serão editados ou excluídos pelo script do Open311."
 
 #: templates/web/base/admin/templates/edit.html:72
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
-msgstr ""
+msgstr "Se selecionado, este modelo será usado para atualizações do Open311 que colocam problemas neste estado."
 
 #: templates/web/base/admin/bodies/_category_field.html:6
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
 "                  the menu. Make sure you use the same category name in the bodies if you want this to happen."
 msgstr ""
+"Se dois ou mais órgãos atendem ao mesmo local, AjeitaMinhaRua combina categorias idênticas em uma única entrada no\n"
+"                   menu. Certifique-se de usar o mesmo nome de categoria nos órgãos se quiser que isso aconteça."
 
 #: templates/web/base/contact/index.html:116
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
-msgstr "Se você está nos contatando sobre uma denúncia ou atualização específica, por favor inclua o link para a denúncia na mensagem."
+msgstr "Se você está nos contatando sobre uma denúncia ou atualização específica, por favor, inclua o link para a denúncia na mensagem."
 
 #: templates/web/base/auth/generate_token.html:83
 msgid "If you generate a new token the existing token will no longer work."
@@ -1862,64 +1687,84 @@ msgstr "Se você gerou um novo código de acesso, o código antigo não funciona
 
 #: templates/web/base/questionnaire/completed.html:8
 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
-msgstr "Se você conseguir mais alguma informação sobre o estado do seu problema, por favor volte e nos forneça uma atualização."
+msgstr "Se você conseguir mais alguma informação sobre o estado do seu problema, por favor, volte e nos forneça uma atualização."
 
 #: templates/web/base/report/new/duplicate_suggestions.html:25
 msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed."
-msgstr ""
+msgstr "Se você nos informar seu endereço de e-mail, nós notificaremos você quando este problema for resolvido ou atualizado."
 
 #: templates/web/base/admin/responsepriorities/edit.html:28
-msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories."
-msgstr "Se você deseja que esta prioridade seja uma opção para categorias específicas, escolha elas aqui. Por padrão ela será mostrada para todas as categorias."
+msgid ""
+"If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories."
+msgstr ""
+"Se você deseja que esta prioridade seja uma opção para categorias específicas, escolha elas aqui. Por padrão ela será mostrada para "
+"todas as categorias."
 
 #: templates/web/base/admin/templates/edit.html:39
-msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories."
+msgid ""
+"If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories."
 msgstr ""
+"Se você deseja que este modelo seja uma opção para categorias específicas, escolha-os aqui. Por padrão, eles serão exibidos para "
+"todas as categorias."
 
 #: templates/web/base/report/new/top_message_none.html:10
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Se você enviar um problema aqui, o problema <strong>não</strong> será denunciado para o concelho."
+msgstr "Se você enviar um problema aqui, o problema <strong>não</strong> será denunciado para o órgão."
 
 #: templates/web/base/admin/templates/edit.html:59
-msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
+msgid ""
+"If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status "
+"code changes, enter the status code here."
 msgstr ""
+"Se você deseja usar este modelo para preencher previamente o campo de atualização quando o código de status<strong>externo</strong> "
+"de uma denúncia (ex.: Confirmar) muda, insira o código de status aqui."
 
 #: templates/web/base/admin/templates/edit.html:46
 msgid "If you want to use this template to prefill the update field when changing a report&rsquo;s state, select the state here."
 msgstr ""
+"Se você deseja usar este modelo para preencher previamente o campo de atualização ao mudar o estado da denúncia, selecione o estado "
+"aqui."
 
 #: templates/web/base/questionnaire/index.html:72
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
 "(please note it will not be sent to the council)."
 msgstr ""
+"Se você deseja deixar uma atualização pública no problema, por favor, especifique-a aqui\n"
+"(note que esta atualização não será enviada ao órgão)."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:112
-#: templates/web/base/admin/bodies/open311-form-fields.html:113
+#: templates/web/base/admin/bodies/open311-form-fields.html:112 templates/web/base/admin/bodies/open311-form-fields.html:113
 msgid ""
 "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n"
 "              its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n"
 "              Check that your cobrand supports this feature before switching it on."
 msgstr ""
+"Se você habilitou o envio de atualizações do Open311 acima, o Open311 geralmente só aceitará status ABERTO ou FECHADO em \n"
+"              suas atualizações. Habilite <strong>os statuses Open311 estendidos</strong> se você quiser permitir que estados extras "
+"sejam aprovados.\n"
+"              Verifique se sua multimarca suporta esse recurso antes de ligá-lo."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:100
-#: templates/web/base/admin/bodies/open311-form-fields.html:99
+#: templates/web/base/admin/bodies/open311-form-fields.html:100 templates/web/base/admin/bodies/open311-form-fields.html:99
 msgid ""
 "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n"
 "              if you do <strong>not</strong> want that user to be notified whenever these updates are created."
 msgstr ""
+"Se você habilitou o envio de atualizações do Open311 acima, habilite <strong>a supressão de alertas</strong> \n"
+"              se você <strong>não</strong> quiser que esse usuário seja notificado sempre que essas atualizações forem criadas."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:82
-#: templates/web/base/admin/bodies/open311-form-fields.html:83
+#: templates/web/base/admin/bodies/open311-form-fields.html:82 templates/web/base/admin/bodies/open311-form-fields.html:83
 msgid ""
 "If you've enabled Open311 update-sending above, you must identify which \n"
 "              FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n"
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
+"Se você habilitou o envio de atualizações do Open311 acima, você deve identificar qual \n"
+"              <strong>usuário</strong> AjeitaMinhaRua será atribuído como o criador dessas atualizações\n"
+"              quando eles são mostrados no site. Digite o ID (número) desse usuário."
 
 #: 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 ""
+msgstr "Se você fez mudanças, deixe uma descrição explicando o que foi modificado, para que outros administradores vejam."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:166
 msgid "Illegal ID"
@@ -1927,7 +1772,7 @@ msgstr "ID Ilegal"
 
 #: perllib/FixMyStreet/App/Controller/Alert.pm:106
 msgid "Illegal feed selection"
-msgstr ""
+msgstr "Seleção de feed ilegal"
 
 #: templates/web/base/admin/users/import.html:15
 msgid "Import users"
@@ -1935,46 +1780,49 @@ msgstr "Importar usuários"
 
 #: templates/web/base/admin/flagged.html:39
 msgid "In abuse table?"
-msgstr ""
+msgstr "Na tabela de abuso?"
 
 #: templates/web/base/open311/index.html:80
-msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
+msgid ""
+"In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title "
+"(also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to "
+"be shown on this site)."
 msgstr ""
+"Além disso, os seguintes atributos que não fazem parte da especificação Open311 v2 são retornados: agency_sent_datetime, título "
+"(também retornados como parte da descrição), interface_used, comment_count, requestor_name (só presentes se o solicitante permitisse "
+"que o nome fosse mostrado neste site)."
 
-#: templates/web/base/admin/bodies/contact-form.html:35
-#: templates/web/zurich/admin/bodies/contact-form.html:40
+#: templates/web/base/admin/bodies/contact-form.html:35 templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
 msgstr "Inativo"
 
 #: templates/web/base/tokens/confirm_alert.html:11
 msgid "Inbox zero, here we come!"
-msgstr ""
+msgstr "Inbox zero, vamos lá!"
 
 #: templates/web/zurich/admin/reports/edit.html:213
 msgid "Include reporter personal details"
-msgstr ""
+msgstr "Incluir detalhes pessuais de quem fez a denúncia"
 
 #: perllib/FixMyStreet/App/Controller/Open311.pm:348
 msgid "Incorrect has_photo value \"%s\""
-msgstr ""
+msgstr "Valor %s incorreto para o campo has_photo"
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:31 templates/web/base/report/_inspect.html:5
 msgid "Inspect report"
 msgstr "Inspecionar denúncia"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:761
 msgid "Instruct contractors to fix problems"
-msgstr ""
+msgstr "Instruir empreiteiros para corrigir o problema"
 
 #: templates/web/base/admin/extra-metadata-item.html:50
 msgid "Internal data set by Open311"
-msgstr ""
+msgstr "Dados internos definidos pelo Open311"
 
 #: templates/web/base/admin/extra-metadata-option.html:6
-#, fuzzy
 msgid "Internal key"
-msgstr "Notas internas"
+msgstr "Chave interna"
 
 #: templates/web/zurich/admin/list_updates.html:35
 msgid "Internal notes"
@@ -1982,52 +1830,47 @@ msgstr "Notas internas"
 
 #: perllib/FixMyStreet/App/Controller/Open311.pm:333
 msgid "Invalid agency_responsible value %s"
-msgstr ""
+msgstr "Valor %s incorreto para o campo agency_responsible"
 
 #: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Invalid format %s specified."
-msgstr ""
+msgstr "Fromato inválido % especificado."
 
-#: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 perllib/FixMyStreet/App/Controller/Report.pm:504
 msgid "Invalid location. New location must be covered by the same council."
-msgstr ""
+msgstr "Localização inválida. A nova localização deve ser coberta pelo mesmo deparatmento/secretaria."
 
 #: templates/web/base/contact/blurb.html:2
 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
-msgstr ""
+msgstr "Normalmente é bem mais rápido <a href=\"%s\">checar nossas Perguntas Frequentes</a> e ver se há uma resposta lá."
 
 #: templates/web/base/tokens/confirm_problem.html:31
 msgid "It’s on its way to the council right now."
-msgstr "Está a caminho do conselho agora."
+msgstr "Está a caminho do órgão."
 
-#: templates/web/base/admin/states/index.html:9
-#: templates/web/base/admin/states/index.html:95
+#: templates/web/base/admin/states/index.html:9 templates/web/base/admin/states/index.html:95
 msgid "Label"
-msgstr ""
+msgstr "Etiqueta"
 
-#: templates/web/base/admin/bodies/_translations.html:6
-#: templates/web/base/admin/reportextrafields/edit.html:45
+#: templates/web/base/admin/bodies/_translations.html:6 templates/web/base/admin/reportextrafields/edit.html:45
 msgid "Language"
 msgstr "<br>"
 
 #: templates/web/base/admin/reportextrafields/index.html:8
 msgid "Languages"
-msgstr ""
+msgstr "Linguagens"
 
 #: templates/web/base/reports/index.html:40
 msgid "Last 7 days"
 msgstr "Últimos 7 dias"
 
-#: templates/web/base/admin/bodies/body.html:75
-#: templates/web/zurich/admin/bodies/body.html:16
+#: templates/web/base/admin/bodies/body.html:75 templates/web/zurich/admin/bodies/body.html:16
 msgid "Last editor"
 msgstr "Último editor"
 
 #: templates/web/base/admin/reports/edit.html:92
-#, fuzzy
 msgid "Last failure:"
-msgstr "Última atualização:"
+msgstr "Última falha:"
 
 #: templates/web/base/questionnaire/index.html:55
 msgid "Last update"
@@ -2039,22 +1882,20 @@ msgstr "Última atualização:"
 
 #: templates/web/base/admin/problem_row.html:39
 msgid "Last&nbsp;update:"
-msgstr ""
+msgstr "Última&nbsp;atualização:"
 
-#: templates/web/base/report/_item.html:70
-#: templates/web/base/report/inspect/information.html:26
+#: templates/web/base/report/_item.html:70 templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Latitude/Longitude:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
-#: templates/web/base/reports/_list-filters-sort.html:10
+#: templates/web/base/admin/triage/_list-filters.html:36 templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Menos atualizado recentemente"
 
 #: templates/web/base/admin/bodies/form.html:128
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
-msgstr "Deixe em branco se todos os relatórios para este corpo devem ser enviados usando o mesmo método de envio (por exemplo, \"%s\")."
+msgstr "Deixe em branco se todos as denúncias para este corpo devem ser enviados usando o mesmo método de envio (por exemplo, \"%s\")."
 
 #: templates/web/base/admin/bodies/body.html:32
 msgid "List all reported problems"
@@ -2062,28 +1903,24 @@ msgstr "Listar todas os problemas denunciados"
 
 #: templates/web/base/around/on_map_list_items.html:18
 msgid "Loading reports…"
-msgstr "Carregando denúncias..."
+msgstr "Carregando denúncias…"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: 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 "Carregando..."
 
-#: templates/web/base/alert/choose.html:2
-#: templates/web/base/alert/choose.html:4 templates/web/base/alert/index.html:2
-#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:2
-#: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1
-#: templates/web/base/tokens/confirm_alert.html:1
+#: templates/web/base/alert/choose.html:2 templates/web/base/alert/choose.html:4 templates/web/base/alert/index.html:2
+#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5
+#: templates/web/base/alert/updates.html:1 templates/web/base/tokens/confirm_alert.html:1
 msgid "Local RSS feeds and email alerts"
-msgstr "Feeds RSS locais e alertas de email"
+msgstr "Feeds RSS locais e alertas de e-mail"
 
-#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14
-#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3
+#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:2
+#: templates/web/base/alert/list.html:3
 msgid "Local RSS feeds and email alerts for ‘%s’"
-msgstr "Feeds RSS locais e alertas de email para ''%s''"
+msgstr "Feeds RSS locais e alertas de e-mail para ''%s''"
 
-#: templates/web/base/main_nav_items.html:16
-#: templates/web/base/main_nav_items.html:21
+#: templates/web/base/main_nav_items.html:16 templates/web/base/main_nav_items.html:21
 msgid "Local alerts"
 msgstr "Alertas locais"
 
@@ -2091,36 +1928,31 @@ msgstr "Alertas locais"
 msgid "Locate the problem on a map of the area"
 msgstr "Localize o problema no mapa da área"
 
-#: templates/web/base/auth/general.html:29
-#: templates/web/base/report/form/user.html:13
+#: templates/web/base/auth/general.html:29 templates/web/base/report/form/user.html:13
 msgid "Log in with Facebook"
 msgstr "Entrar com o Facebook"
 
-#: templates/web/base/auth/general.html:44
-#: templates/web/base/report/form/user.html:24
+#: templates/web/base/auth/general.html:44 templates/web/base/report/form/user.html:24
 msgid "Log in with Twitter"
 msgstr "Entrar com o Twitter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
-#: templates/web/base/report/form/user.html:27
+#: templates/web/base/js/translation_strings.html:85 templates/web/base/report/form/user.html:27
 msgid "Log in with email"
-msgstr "Entrar com o email"
+msgstr "Entrar com o e-mail"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:83
 msgid "Log in with email/text"
-msgstr "Entrar com email/sms"
+msgstr "Entrar com e-mail/sms"
 
 #: templates/web/base/admin/users/form.html:194
 msgid "Log out of all sessions"
 msgstr "Sair de todas as sessões"
 
-#: templates/web/base/auth/general.html:36
-#: templates/web/base/report/form/user.html:18
-#, fuzzy
+#: templates/web/base/auth/general.html:36 templates/web/base/report/form/user.html:18
 msgid "Login with %s"
-msgstr "Entrar com o email"
+msgstr "Logado como %s"
 
 #: templates/web/base/dashboard/index.html:83
 msgid "Look up"
@@ -2133,18 +1965,17 @@ msgstr "MAPA"
 
 #: templates/web/base/admin/users/form.html:195
 msgid "Make anonymous on all reports and updates"
-msgstr "Tornar anônimo em todos os relatórios e atualizações"
+msgstr "Tornar anônimo em todas as denúncias e atualizações"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:763
 msgid "Manage shortlist"
-msgstr "Gerenciar lista restrita"
+msgstr "Gerenciar lista de atalhos"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:688
 msgid "Manifest Theme"
-msgstr ""
+msgstr "Tema de Manifesto"
 
-#: templates/web/base/admin/triage/_list-filters.html:31
-#: templates/web/base/reports/_list-filters-sort.html:5
+#: templates/web/base/admin/triage/_list-filters.html:31 templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr "Ordem manual"
 
@@ -2165,8 +1996,7 @@ msgstr "Marcar usuários cujo comportamento você deseja uma verificação sobre
 msgid "Markup problem details"
 msgstr "Detalhes do problema de marcação"
 
-#: templates/web/base/contact/enquiry/index.html:41
-#: templates/web/base/contact/index.html:109
+#: templates/web/base/contact/enquiry/index.html:41 templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Mensagem"
 
@@ -2178,10 +2008,9 @@ msgstr "Mensagem ao organismo competente:"
 msgid "Message to external body:"
 msgstr "Mensagem para o corpo externo:"
 
-#: templates/web/base/admin/bodies/contact-form.html:62
-#: templates/web/base/admin/extra-metadata-option.html:21
+#: templates/web/base/admin/bodies/contact-form.html:62 templates/web/base/admin/extra-metadata-option.html:21
 msgid "Message to show when form is disabled (HTML permitted)"
-msgstr ""
+msgstr "Mensagem a ser mostrada quando o formulário é desabilitado (HTML é permitido)"
 
 #: templates/web/base/admin/reports/edit.html:72
 msgid "Missing bodies:"
@@ -2189,16 +2018,15 @@ msgstr "Corpos ausentes:"
 
 #: perllib/FixMyStreet/App/Controller/Open311.pm:451
 msgid "Missing jurisdiction_id"
-msgstr ""
+msgstr "Ausência do campo: jurisdiction_id"
 
 #: templates/web/base/report/_main.html:143
 msgid "Moderate"
 msgstr "Moderado"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:755 perllib/FixMyStreet/Cobrand/KiitC.pm:197
 msgid "Moderate report details"
-msgstr "Detalhes moderados do relatório"
+msgstr "Detalhes moderados da denúncia"
 
 #: templates/web/base/report/_main.html:143
 msgid "Moderate this report"
@@ -2208,9 +2036,7 @@ msgstr "Moderar esta denúncia"
 msgid "Moderate this update"
 msgstr "Moderar esta atualização"
 
-#: templates/web/base/admin/update_edit.html:92
-#: templates/web/base/report/_main.html:85
-#: templates/web/base/report/_update_state.html:19
+#: templates/web/base/admin/update_edit.html:92 templates/web/base/report/_main.html:85 templates/web/base/report/_update_state.html:19
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "Moderated by %s at %s"
 msgstr "Moderado por %s às %s"
@@ -2219,62 +2045,43 @@ msgstr "Moderado por %s às %s"
 msgid "Moderated by division within one working day"
 msgstr "Moderado por divisão dentro de um dia útil"
 
-#: templates/web/base/admin/reports/edit.html:193
-#: templates/web/base/admin/update_edit.html:86
+#: templates/web/base/admin/reports/edit.html:193 templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr "Histórico de moderação"
 
-#: templates/web/base/dashboard/index.html:103
-#: templates/web/zurich/admin/stats/index.html:9
+#: templates/web/base/dashboard/index.html:103 templates/web/zurich/admin/stats/index.html:9
 msgid "Month"
 msgstr "Mês"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
-#: templates/web/base/reports/_list-filters-sort.html:11
+#: templates/web/base/admin/triage/_list-filters.html:37 templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Mais comentados"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
-#: templates/web/base/admin/category-checkboxes.html:32
+#: perllib/FixMyStreet/App/Controller/Report.pm:696 perllib/FixMyStreet/App/Controller/Report.pm:703
+#: perllib/FixMyStreet/App/Controller/Report.pm:707 templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
-msgstr ""
-
-#: templates/web/base/admin/bodies/form.html:24
-#: templates/web/base/admin/bodies/index.html:25
-#: templates/web/base/admin/flagged.html:16
-#: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:68
-#: templates/web/base/admin/list_updates.html:7
-#: templates/web/base/admin/manifesttheme/index.html:7
-#: templates/web/base/admin/reportextrafields/edit.html:11
-#: templates/web/base/admin/reportextrafields/index.html:6
-#: templates/web/base/admin/reports/index.html:14
-#: templates/web/base/admin/responsepriorities/index.html:6
-#: templates/web/base/admin/states/index.html:108
-#: templates/web/base/admin/states/index.html:11
-#: templates/web/base/admin/users/import.html:23
-#: templates/web/base/admin/users/import.html:46
-#: templates/web/base/admin/users/index.html:43
-#: templates/web/base/report/form/user_name.html:2
-#: templates/web/zurich/admin/bodies/form.html:4
-#: templates/web/zurich/auth/general.html:43
-#: templates/web/zurich/report/new/fill_in_details_form.html:59
+msgstr "Múltiplos Grupos"
+
+#: templates/web/base/admin/bodies/form.html:24 templates/web/base/admin/bodies/index.html:25 templates/web/base/admin/flagged.html:16
+#: templates/web/base/admin/flagged.html:37 templates/web/base/admin/index.html:68 templates/web/base/admin/list_updates.html:7
+#: templates/web/base/admin/manifesttheme/index.html:7 templates/web/base/admin/reportextrafields/edit.html:11
+#: templates/web/base/admin/reportextrafields/index.html:6 templates/web/base/admin/reports/index.html:14
+#: templates/web/base/admin/responsepriorities/index.html:6 templates/web/base/admin/states/index.html:108
+#: templates/web/base/admin/states/index.html:11 templates/web/base/admin/users/import.html:23
+#: templates/web/base/admin/users/import.html:46 templates/web/base/admin/users/index.html:43
+#: templates/web/base/report/form/user_name.html:2 templates/web/zurich/admin/bodies/form.html:4
+#: templates/web/zurich/auth/general.html:43 templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "Name"
 msgstr "Nome"
 
-#: templates/web/base/admin/reports/edit.html:140
-#: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
-#: templates/web/zurich/admin/stats/index.html:62
+#: templates/web/base/admin/reports/edit.html:140 templates/web/base/admin/update_edit.html:34
+#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35 templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Nome:"
 
-#: perllib/FixMyStreet/Cobrand/Rutland.pm:20
-#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:26
+#: perllib/FixMyStreet/Cobrand/Rutland.pm:20 perllib/FixMyStreet/Roles/ConfirmValidation.pm:26
 msgid "Names are limited to %d characters in length."
-msgstr "Os nomes são limitados a %dcaracteres de comprimento."
+msgstr "Os nomes são limitados a %d caracteres de comprimento."
 
 #: templates/web/base/report/inspect/information.html:40
 msgid "Navigate to this problem"
@@ -2292,8 +2099,7 @@ msgstr "Estrada com nome mais próximo do marcador colocado no mapa (gerado auto
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Código postal mais próximo do marcador colocado no mapa (gerado automaticamente): %s (%sm de distância)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
-#: perllib/FixMyStreet/Geocode/Address.pm:17
+#: perllib/FixMyStreet/Cobrand/Default.pm:607 perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Estrada mais próxima do marcador colocado no mapa (gerado automaticamente pelo Bing Maps): %s"
 
@@ -2311,16 +2117,15 @@ msgstr "Quase pronto!"
 
 #: templates/web/base/auth/token.html:22 templates/web/base/email_sent.html:5
 msgid "Nearly done! Now check your email&hellip;"
-msgstr "Quase pronto! Agora verifique seu email&hellip;"
+msgstr "Quase pronto! Agora verifique seu e-mail&hellip;"
 
-#: templates/web/base/auth/2fa/form.html:8
-#: templates/web/base/auth/smsform.html:19
+#: templates/web/base/auth/2fa/form.html:8 templates/web/base/auth/smsform.html:19
 msgid "Nearly done! Now check your phone&hellip;"
 msgstr "Quase pronto! Agora verifique seu telefone&hellip;"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:54
 msgid "New body added"
-msgstr "Novo orgão adicionado"
+msgstr "Novo órgão adicionado"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
 msgid "New category contact added"
@@ -2328,29 +2133,25 @@ msgstr "Nova categoria de contato adicionada"
 
 #: templates/web/base/auth/change_email.html:39
 msgid "New email address:"
-msgstr "Novo endereço de email:"
+msgstr "Novo endereço de e-mail:"
 
-#: templates/web/base/admin/extra-metadata-item.html:14
-#: templates/web/base/admin/extra-metadata-item.html:20
-#, fuzzy
+#: templates/web/base/admin/extra-metadata-item.html:14 templates/web/base/admin/extra-metadata-item.html:20
 msgid "New field"
-msgstr "Salvar novos campos"
+msgstr "Novo campo"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:96 templates/web/zurich/admin/reports/edit.html:125
 msgid "New internal note:"
 msgstr "Nova nota interna:"
 
 #: db/alert_types.pl:18 db/alert_types.pl:22
 msgid "New local problems on FixMyStreet"
-msgstr "Novos problemas locais no FixMyStreet"
+msgstr "Novos problemas locais no AjeitaMinhaRua"
 
 #: templates/web/zurich/admin/report_edit-sdm.html:100
 msgid "New note to DM:"
 msgstr "Nova nota para DM:"
 
-#: templates/web/base/auth/change_password.html:47
-#: templates/web/base/auth/create.html:64
+#: templates/web/base/auth/change_password.html:47 templates/web/base/auth/create.html:64
 #: templates/web/base/report/form/user_loggedout_by_email.html:50
 msgid "New password:"
 msgstr "Nova senha:"
@@ -2359,8 +2160,7 @@ msgstr "Nova senha:"
 msgid "New phone number:"
 msgstr "Novo número de telefone:"
 
-#: templates/web/base/admin/responsepriorities/edit.html:3
-#: templates/web/base/admin/responsepriorities/index.html:52
+#: templates/web/base/admin/responsepriorities/edit.html:3 templates/web/base/admin/responsepriorities/index.html:52
 msgid "New priority"
 msgstr "Nova prioridade"
 
@@ -2374,7 +2174,7 @@ msgstr "Novos problemas para <a href=\"%s\">%s</a>"
 
 #: templates/web/base/admin/users/alerts.html:35
 msgid "New problems for <a href=\"%s\">%s</a> ward in <a href=\"%s\">%s</a>"
-msgstr ""
+msgstr "Novo problema na <a href=\"%s\">%s</a> sinalizado em <a href=\"%s\">%s</a>"
 
 #: templates/web/base/admin/users/alerts.html:47
 msgid "New problems for area id <a href=\"%s\">%s</a>"
@@ -2382,54 +2182,50 @@ msgstr "Novos problemas para área de id <a href=\"%s\">%s</a>"
 
 #: templates/web/base/admin/users/alerts.html:37
 msgid "New problems for ward id %s in body id %s"
-msgstr ""
+msgstr "Novos problemas no sinalizador id %s no orgão id %s"
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
-msgstr ""
+msgstr "Novos problemas no {{COUNCIL}} dentro do sinalizador {{WARD}} no AjeitaMinhaRua"
 
 #: templates/web/base/admin/users/alerts.html:30
 msgid "New problems near <a href=\"%s\">%s,%s</a>"
-msgstr ""
+msgstr "Novos problemas próximo à <a href=\"%s\">%s,%s</a>"
 
 #: db/alert_types.pl:26 db/alert_types.pl:30
 msgid "New problems near {{POSTCODE}} on FixMyStreet"
-msgstr ""
+msgstr "Novo problema próximo à {{POSTCODE}} no FixMyStreet"
 
 #: db/alert_types.pl:10
 msgid "New problems on FixMyStreet"
-msgstr ""
+msgstr "Novos problemas em AjeitaMinhaRua"
 
 #: db/alert_types.pl:34
 msgid "New problems to {{COUNCIL}} on FixMyStreet"
-msgstr ""
+msgstr "Novos problemas no {{COUNCIL}} em AjeitaMinhaRua"
 
 #: db/alert_types.pl:42
 msgid "New problems within {{NAME}}'s boundary on FixMyStreet"
-msgstr ""
+msgstr "Novos problemas nas imediações de {{NAME}} no AjeitaMinhaRua"
 
 #: templates/web/zurich/admin/index-sdm.html:4
 msgid "New reports"
 msgstr "Novas denúncias"
 
-#: templates/web/base/admin/states/index.html:91
-#: templates/web/base/admin/stats/questionnaire.html:24
+#: templates/web/base/admin/states/index.html:91 templates/web/base/admin/stats/questionnaire.html:24
 msgid "New state"
 msgstr "Novo estado"
 
-#: templates/web/base/admin/templates/edit.html:4
-#: templates/web/base/admin/templates/view.html:37
-#: templates/web/zurich/admin/templates/edit.html:9
-#: templates/web/zurich/admin/templates/view.html:26
+#: templates/web/base/admin/templates/edit.html:4 templates/web/base/admin/templates/view.html:37
+#: templates/web/zurich/admin/templates/edit.html:9 templates/web/zurich/admin/templates/view.html:26
 msgid "New template"
 msgstr "Novo template"
 
 #: templates/web/base/admin/users/alerts.html:28
 msgid "New updates on report <a href=\"%s\">%s</a>"
-msgstr "Novas atualizações no relatório <a href=\"%s\">%s</a>"
+msgstr "Novas atualizações na denúncia <a href=\"%s\">%s</a>"
 
-#: templates/web/base/admin/triage/_list-filters.html:33
-#: templates/web/base/reports/_list-filters-sort.html:7
+#: templates/web/base/admin/triage/_list-filters.html:33 templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Mais novo"
 
@@ -2439,29 +2235,21 @@ msgstr "Próximo"
 
 #: templates/web/base/report/form/user.html:5
 msgid "Next:"
-msgstr "Próximo"
-
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
-#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
-#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
-#: templates/web/base/admin/bodies/category.html:5
-#: templates/web/base/admin/list_updates.html:33
-#: templates/web/base/admin/list_updates.html:35
-#: templates/web/base/admin/list_updates.html:36
-#: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
-#: templates/web/base/admin/update_edit.html:26
-#: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
-#: templates/web/base/questionnaire/index.html:41
+msgstr "Próximo:"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:1262 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
+#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122 templates/web/base/admin/bodies/category.html:5
+#: templates/web/base/admin/list_updates.html:33 templates/web/base/admin/list_updates.html:35
+#: templates/web/base/admin/list_updates.html:36 templates/web/base/admin/problem_row.html:20
+#: templates/web/base/admin/reports/edit.html:101 templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/update_edit.html:26 templates/web/base/admin/users/alerts.html:21
+#: templates/web/base/questionnaire/index.html:108 templates/web/base/questionnaire/index.html:41
 msgid "No"
 msgstr "Não"
 
 #: templates/web/base/admin/category-checkboxes.html:31
-#, fuzzy
 msgid "No Group"
-msgstr "Agrupar"
+msgstr "Sem grupo"
 
 #: templates/web/base/report/form/user_loggedout_password.html:7
 msgid "No account?"
@@ -2469,11 +2257,11 @@ msgstr "Sem conta?"
 
 #: templates/web/base/admin/users/form.html:55
 msgid "No body"
-msgstr "Nenhum orgão"
+msgstr "Nenhum órgão"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:374
 msgid "No council selected"
-msgstr "Nenhum concelho selecionado"
+msgstr "Nenhum órgão selecionado"
 
 #: templates/web/base/admin/bodies/edit-league.html:17
 msgid "No edits have yet been made."
@@ -2487,27 +2275,24 @@ msgstr "Nenhum problema sinalizado foi encontrado."
 msgid "No flagged users found."
 msgstr "Nenhum usuário sinalizado foi encontrado."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:112 templates/web/zurich/admin/reports/edit.html:248
 msgid "No further updates"
 msgstr "Nenhuma atualização adicional"
 
-#: templates/web/base/report/form/user.html:33
-#: templates/web/base/report/form/user.html:40
+#: templates/web/base/report/form/user.html:33 templates/web/base/report/form/user.html:40
 msgid "No personal details will be stored, and you will not receive updates about this report."
-msgstr ""
+msgstr "Nenhum dado pessoal será guardado, e você não receberá atualizações sobre  esta denúncia."
 
 #: templates/web/base/around/on_map_list_items.html:13
 msgid "No reports to show on map, here are some nearby:"
-msgstr "Não há relatórios para mostrar no mapa, aqui estão alguns nas proximidades:"
+msgstr "Não há denúncias para mostrar no mapa, aqui estão alguns nas proximidades:"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:56
 msgid "No result returned"
 msgstr "Nenhum resultado retornado"
 
-#: templates/web/base/admin/bodies/form.html:68
-#: templates/web/base/admin/bodies/form.html:69
+#: templates/web/base/admin/bodies/form.html:68 templates/web/base/admin/bodies/form.html:69
 msgid ""
 "No specific areas are currently available, because the <code>MAPIT_URL</code> in\n"
 "            your config file is not pointing to a live MapIt service."
@@ -2515,26 +2300,24 @@ msgstr ""
 "Não há áreas específicas disponíveis no momento, porque o no<code>MAPIT_URL</code> no\n"
 "seu arquivo de configuração não está apontando para um serviço válido no MapIt."
 
-#: templates/web/base/report/_support.html:3
-#: templates/web/base/report/_support.html:4
+#: templates/web/base/report/_support.html:3 templates/web/base/report/_support.html:4
 msgid "No supporters"
 msgstr "Sem apoiadores"
 
-#: templates/web/base/admin/reports/edit.html:67
-#: templates/web/base/admin/reports/edit.html:97
+#: templates/web/base/admin/reports/edit.html:67 templates/web/base/admin/reports/edit.html:97
 #: templates/web/base/admin/reports/edit.html:99
 msgid "None"
 msgstr "Nada"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:79 templates/web/base/admin/users/form.html:80
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
+"Usuários normais (públicos) não devem ser associados a nenhuma <strong>área</strong>.\n"
+"                  Os usuários autorizados da equipe podem ser associados à área na qual operam."
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:45 templates/web/base/admin/users/form.html:46
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2544,7 +2327,7 @@ msgstr ""
 "Usuários normais (públicos) não devem ser associados a nenhum <strong>corpo</strong>.<br>\n"
 "                 Usuários autorizados podem ser associados ao corpo que representam.<br>\n"
 "                 Dependendo da implementação, os usuários da equipe podem ter acesso ao painel (resumo da atividade \n"
-"em todo o corpo), a capacidade de ocultar relatórios ou definir status de relatórios especiais."
+"em todo o corpo), a capacidade de ocultar denúncias ou definir status de denúncias especiais."
 
 #: templates/web/zurich/admin/report_edit-sdm.html:88
 msgid "Not for my subdivision"
@@ -2556,10 +2339,9 @@ msgstr "Não denunciado antes"
 
 #: templates/web/base/report/_main_sent_info.html:4
 msgid "Not reported to council"
-msgstr "Não reportado ao conselho"
+msgstr "Não denunciado para o órgão"
 
-#: templates/web/base/admin/bodies/body.html:76
-#: templates/web/base/admin/bodies/category.html:32
+#: templates/web/base/admin/bodies/body.html:76 templates/web/base/admin/bodies/category.html:32
 #: templates/web/zurich/admin/bodies/body.html:17
 msgid "Note"
 msgstr "Nota"
@@ -2578,12 +2360,11 @@ msgstr "Notas do SDM para o DM"
 
 #: templates/web/base/admin/extra-metadata-item.html:42
 msgid "Notice shown to user"
-msgstr ""
+msgstr "Aviso mostrado ao usuário"
 
 #: templates/web/base/admin/extra-metadata-item.html:61
-#, fuzzy
 msgid "Notice text"
-msgstr "Aviso prévio"
+msgstr "Nota de aviso"
 
 #: templates/web/base/reports/index.html:127
 msgid "Number of problems reported in each category, in the last 7 days."
@@ -2591,11 +2372,11 @@ msgstr "Número de problemas denunciados em cada categoria, nos últimos 7 dias.
 
 #: templates/web/base/reports/index.html:99
 msgid "Number of problems reported in each ward, in the last 7 days."
-msgstr "Número de problemas relatados em cada ala, nos últimos 7 dias."
+msgstr "Número de problemas relatados em cada sinalizador, nos últimos 7 dias."
 
 #: templates/web/base/offline/fallback.html:4
 msgid "Offline"
-msgstr ""
+msgstr "Offline"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:100
@@ -2611,8 +2392,7 @@ msgstr "Dados de atualização off-line salvos"
 msgid "Old state"
 msgstr "Estado antigo"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
-#: templates/web/base/reports/_list-filters-sort.html:8
+#: templates/web/base/admin/triage/_list-filters.html:34 templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Mais antigo"
 
@@ -2622,17 +2402,12 @@ msgstr "Em nome de %s"
 
 #: templates/web/base/admin/bodies/contact-form.html:46
 msgid "Only staff users will be able to add reports in this category."
-msgstr ""
+msgstr "Apenas membros da equipe serão capazes de adicionar denúncias nesta categoria."
 
-#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:71
-#: templates/web/base/admin/states/index.html:102
-#: templates/web/base/admin/states/index.html:25
-#: templates/web/base/admin/states/index.html:32
-#: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:117
-#: templates/web/zurich/admin/update_edit.html:18
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 perllib/FixMyStreet/Cobrand/Zurich.pm:156 perllib/FixMyStreet/DB/ResultSet/State.pm:71
+#: templates/web/base/admin/states/index.html:102 templates/web/base/admin/states/index.html:25
+#: templates/web/base/admin/states/index.html:32 templates/web/base/admin/update_edit.html:30
+#: templates/web/base/dashboard/index.html:117 templates/web/zurich/admin/update_edit.html:18
 msgid "Open"
 msgstr "Abrir"
 
@@ -2642,19 +2417,19 @@ msgstr "Chave de API do Open311"
 
 #: templates/web/base/open311/index.html:62
 msgid "Open311 API for the mySociety FixMyStreet server"
-msgstr "API do Open311 para o servidor mySociety FixMyStreet"
+msgstr "API do Open311 para o servidor mySociety AjeitaMinhaRua"
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:34
 msgid "Open311 Jurisdiction"
-msgstr ""
+msgstr "Jurisdição Open311"
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
-msgstr ""
+msgstr "Página web inativa Open311"
 
 #: templates/web/base/open311/index.html:73
 msgid "Open311 specification"
-msgstr ""
+msgstr "Especificação Open311"
 
 #: templates/web/base/admin/extra-metadata-item.html:75
 msgid "Options"
@@ -2666,28 +2441,22 @@ msgstr "Ou <a href=\"/\">buscar por uma localização diferente</a>"
 
 #: templates/web/base/report/form/private_details.html:6
 msgid "Or sign in with password to prefill this information."
-msgstr ""
+msgstr "Ou entre com uma senha para preencher previamente essas informações."
 
 #: templates/web/base/alert/_list.html:79
 msgid "Or subscribe by RSS"
-msgstr ""
+msgstr "Ou se inscreva pelo RSS"
 
 #: templates/web/base/admin/extra-metadata-item.html:55
 msgid "Order"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
-#: perllib/FixMyStreet/Queue/Item/Report.pm:132
-#: perllib/FixMyStreet/Queue/Item/Report.pm:195
+msgstr "Ordem"
+
+#: 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 "Outro"
 
@@ -2697,7 +2466,7 @@ msgstr "Outras categorias"
 
 #: templates/web/base/reports/index.html:107
 msgid "Other wards"
-msgstr ""
+msgstr "Outros sinalizadores"
 
 #: templates/web/base/reports/index.html:120
 msgid "Overall average"
@@ -2707,45 +2476,38 @@ msgstr "Média geral"
 msgid "Owner"
 msgstr "Dono"
 
-#: templates/web/base/errors/page_error_404_not_found.html:1
-#: templates/web/base/errors/page_error_404_not_found.html:4
+#: templates/web/base/errors/page_error_404_not_found.html:1 templates/web/base/errors/page_error_404_not_found.html:4
 msgid "Page Not Found"
 msgstr "Página Não Encontrada"
 
-#: templates/web/base/admin/bodies/form.html:39
-#: templates/web/zurich/admin/bodies/form.html:14
+#: templates/web/base/admin/bodies/form.html:39 templates/web/zurich/admin/bodies/form.html:14
 msgid "Parent"
-msgstr ""
+msgstr "Pai"
 
 #: templates/web/base/admin/bodies/contact-form.html:98
-#, fuzzy
 msgid "Parent categories"
-msgstr "Outras categorias"
+msgstr "Categoria Pai"
 
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:66
 msgid "Partial"
-msgstr ""
+msgstr "Parcial"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
-#: templates/web/zurich/auth/general.html:20
+#: templates/web/base/report/form/user_loggedout_by_email.html:51 templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Senha (opcional)"
 
 #: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
-#, fuzzy
 msgid "Password change cancelled."
-msgstr "Sua senha foi alterada"
+msgstr "Mudança de senha cancelada."
 
 #: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:5
-#, fuzzy
 msgid "Password expired"
-msgstr "Senha (opcional)"
+msgstr "Senha expirada"
 
 #: templates/web/base/admin/roles/index.html:6
-#, fuzzy
 msgid "Permissions"
-msgstr "Permissões:"
+msgstr "Permissões"
 
 #: templates/web/base/admin/users/form.html:159
 msgid "Permissions:"
@@ -2753,20 +2515,18 @@ msgstr "Permissões:"
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:61
 msgid "Permit blank updates"
-msgstr ""
+msgstr "Permitir atualizações em branco"
 
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
-msgstr ""
+msgstr "Quem fez a denúncia:"
 
-#: templates/web/base/auth/change_phone.html:36
-#: templates/web/base/report/new/form_user_loggedin.html:34
+#: templates/web/base/auth/change_phone.html:36 templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Número de telefone"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
+#: templates/web/base/report/form/user_loggedout_by_email.html:13 templates/web/base/report/form/user_loggedout_by_email.html:33
 #: templates/web/base/report/new/form_user_loggedin.html:53
 msgid "Phone number (optional)"
 msgstr "Número de telefone (opcional)"
@@ -2779,30 +2539,20 @@ msgstr "Números de telefone são limitados a %s caracteres."
 msgid "Phone verified:"
 msgstr "Telefone verificado:"
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:148 templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefone:"
 
-#: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
-#: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/new/form_report.html:56
-#: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
-#: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
-#: templates/web/zurich/admin/stats/index.html:58
-#: templates/web/zurich/report/new/fill_in_details_form.html:20
-#: templates/web/zurich/report/new/fill_in_details_form.html:36
-#: templates/web/zurich/report/new/fill_in_details_form.html:38
+#: templates/web/base/admin/update_edit.html:95 templates/web/base/questionnaire/index.html:80
+#: templates/web/base/questionnaire/index.html:95 templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/new/form_report.html:41 templates/web/base/report/new/form_report.html:56
+#: templates/web/base/report/new/form_report.html:58 templates/web/base/report/update/form_update.html:22
+#: templates/web/base/report/update/form_update.html:24 templates/web/base/report/update/form_update.html:7
+#: templates/web/base/report/update/moderation_diff.html:4 templates/web/zurich/admin/index-dm.html:31
+#: templates/web/zurich/admin/index-sdm.html:24 templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/stats/index.html:58 templates/web/zurich/report/new/fill_in_details_form.html:20
+#: templates/web/zurich/report/new/fill_in_details_form.html:36 templates/web/zurich/report/new/fill_in_details_form.html:38
 msgid "Photo"
 msgstr "Foto"
 
@@ -2818,10 +2568,8 @@ msgstr "Foto requerida"
 msgid "Photo upload failed."
 msgstr "Falha ao enviar a foto."
 
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
-#: templates/web/zurich/report/new/fill_in_details_form.html:20
+#: templates/web/base/questionnaire/index.html:80 templates/web/base/report/new/form_report.html:41
+#: templates/web/base/report/update/form_update.html:7 templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Fotos"
 
@@ -2831,69 +2579,56 @@ msgstr "Fotos das denúncias recentes nas proximidades"
 
 #: templates/web/base/contact/enquiry/index.html:49
 msgid "Photos/Documents"
-msgstr ""
+msgstr "Fotos/Documentos"
 
-#: templates/web/base/reports/index.html:76
-#: templates/web/base/reports/index.html:79
+#: templates/web/base/reports/index.html:76 templates/web/base/reports/index.html:79
 msgid "Pick your council"
-msgstr "Escolha seu concelho:"
+msgstr "Escolha um órgão"
 
-#: templates/web/base/reports/index.html:66
-#: templates/web/base/reports/index.html:69
+#: templates/web/base/reports/index.html:66 templates/web/base/reports/index.html:69
 msgid "Pick your ward"
-msgstr ""
+msgstr "Escolha seu sinalizador"
 
 #. ("JS")
-#: templates/web/base/around/display_location.html:79
-#: templates/web/base/js/translation_strings.html:44
+#: templates/web/base/around/display_location.html:79 templates/web/base/js/translation_strings.html:44
 msgid "Place pin on map"
 msgstr "Coloque o pino no mapa"
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:143
 msgid "Please <a href=\"#%s\">check their changes</a> and resolve any differences."
-msgstr ""
+msgstr "Por favor, <a href=\"#%s\">cheque as mudanças</a> e resolva qualquer diferença."
 
 #: templates/web/base/report/new/notes.html:5
 msgid "Please be polite, concise and to the point."
-msgstr ""
+msgstr "Por favor, seja educado, conciso e objetivo."
 
-#: templates/web/base/auth/change_password.html:26
-#: templates/web/base/auth/change_password.html:31
+#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:31
 msgid "Please check the passwords and try again"
 msgstr "Por favor, verifique a senha e tente novamente"
 
-#: templates/web/base/auth/_username_error.html:1
-#: templates/web/base/auth/_username_error.html:9
-#: templates/web/base/auth/change_email.html:24
-#: templates/web/base/auth/change_email.html:27
+#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:9
+#: templates/web/base/auth/change_email.html:24 templates/web/base/auth/change_email.html:27
 msgid "Please check your email address is correct"
-msgstr "Por favor, verifique se seu email está correto"
+msgstr "Por favor, verifique se seu e-mail está correto"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
-#: templates/web/base/auth/_username_error.html:1
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521 perllib/FixMyStreet/DB/Result/User.pm:263
+#: perllib/FixMyStreet/DB/Result/User.pm:264 templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr "Por favor, verifique se seu telefone está correto"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
-#: 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 "Por favor escolha uma categoria"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
-#: perllib/FixMyStreet/App/Controller/Auth.pm:497
+#: perllib/FixMyStreet/App/Controller/Auth.pm:471 perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr "Por favor, escolha uma senha menos comum"
 
-#: 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
+#: 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 "Por favor, corrija os erros abaixo"
 
@@ -2903,87 +2638,73 @@ msgid ""
 "the team behind this site, not a council. To report a problem,\n"
 "please <a href=\"/\">go to the front page</a> and follow the instructions."
 msgstr ""
+"Por favor, <strong>não</strong> denuncie problemas por meio deste formulário; as mensagens vão para\n"
+"a equipe por trás deste site, não um órgão. Para relatar um problema, \n"
+"<a href=\"/\">vá para a página inicial</a> e siga as instruções."
 
 #: templates/web/base/report/new/notes.html:6
 msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
-msgstr ""
+msgstr "Por favor, não seja desrespeitoso&nbsp;&mdash; desrespeitar um órgão tira a credibilidade do serviço para todos os usuários."
 
 #. ("JS")
-#: 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
+#: 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 "Por favor, especifique uma mensagem"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
-#: templates/web/base/auth/_username_error.html:1
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519 perllib/FixMyStreet/DB/Result/User.pm:266
+#: perllib/FixMyStreet/DB/Result/User.pm:267 templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr "Por favor, digite um número de telefone"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
 msgid "Please enter a name"
 msgstr "Por favor, digite um nome"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
 msgid "Please enter a name for this body"
-msgstr "Por favor, digite um nome para este orgão"
+msgstr "Por favor, digite um nome para este órgão"
 
 #. ("JS")
-#: templates/web/base/auth/change_password.html:26
-#: templates/web/base/auth/change_password.html:29
+#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:29
 #: templates/web/base/js/translation_strings.html:31
 msgid "Please enter a password"
 msgstr "Por favor, especifique uma senha"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/App/Controller/Contact.pm:147 perllib/FixMyStreet/DB/Result/Problem.pm:365
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Por favor, digite um assunto"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
-#: templates/web/base/js/translation_strings.html:24
-#: templates/web/base/js/translation_strings.html:28
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255 perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261 perllib/FixMyStreet/DB/Result/User.pm:256
+#: templates/web/base/js/translation_strings.html:24 templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
-msgstr "Por favor, especifique um email válido"
+msgstr "Por favor, especifique um e-mail válido"
 
-#: perllib/FixMyStreet/App/Controller/Alert.pm:355
-#: perllib/FixMyStreet/App/Controller/Contact.pm:157
+#: perllib/FixMyStreet/App/Controller/Alert.pm:355 perllib/FixMyStreet/App/Controller/Contact.pm:157
 msgid "Please enter a valid email address"
-msgstr "Por favor, digite um endereço de email válido"
+msgstr "Por favor, digite um endereço de e-mail válido"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139 perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
 msgid "Please enter a valid email or phone number"
-msgstr "Por favor, digite um email válido ou número de telefone"
+msgstr "Por favor, digite um e-mail válido ou número de telefone"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
-#: templates/web/base/js/translation_strings.html:14
+#: perllib/FixMyStreet/DB/Result/Problem.pm:371 templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Por favor, especifique alguns detalhes"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
-#: templates/web/base/auth/_username_error.html:1
-#: templates/web/base/auth/_username_error.html:8
-#: templates/web/base/auth/change_email.html:24
-#: templates/web/base/auth/change_email.html:26
-#: templates/web/base/js/translation_strings.html:23
-#: templates/web/base/js/translation_strings.html:27
+#: perllib/FixMyStreet/App/Controller/Contact.pm:146 perllib/FixMyStreet/DB/Result/User.pm:254
+#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:8
+#: templates/web/base/auth/change_email.html:24 templates/web/base/auth/change_email.html:26
+#: templates/web/base/js/translation_strings.html:23 templates/web/base/js/translation_strings.html:27
 msgid "Please enter your email"
-msgstr "Por favor, especifique seu email"
+msgstr "Por favor, especifique seu e-mail"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:40
@@ -2991,28 +2712,27 @@ msgid "Please enter your first name"
 msgstr "Por favor, digite seu primeiro nome"
 
 #. ("JS")
-#: 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"
+#: 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 ""
+"Por favor, especifique seu nome completo, órgãos precisam desta informação – se você não deseja que seu nome seja mostrado no site, "
+"desmarque a caixa abaixo"
 
 #: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:35
-#, fuzzy
 msgid "Please enter your full name."
-msgstr "Por favor, digite seu nome"
+msgstr "Por favor, digite seu nome."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/App/Controller/Contact.pm:145 perllib/FixMyStreet/DB/Result/Comment.pm:140
+#: perllib/FixMyStreet/DB/Result/Problem.pm:379 perllib/FixMyStreet/DB/Result/User.pm:249
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Por favor, digite seu nome"
 
 #. ("JS")
-#: templates/web/base/auth/_username_error.html:1
-#: templates/web/base/auth/_username_error.html:6
+#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:6
 #: templates/web/base/js/translation_strings.html:37
 msgid "Please enter your phone number"
 msgstr "Por favor, digite seu número de telefone"
@@ -3027,20 +2747,20 @@ msgstr "Por favor, especifique seu segundo nome"
 msgid "Please enter your title"
 msgstr "Por favor, digite seu título"
 
-#: templates/web/base/auth/sign_out.html:5
-#: templates/web/zurich/auth/sign_out.html:5
+#: templates/web/base/auth/sign_out.html:5 templates/web/zurich/auth/sign_out.html:5
 msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>."
-msgstr ""
+msgstr "Sinta-se a vontade para <a href=\"%s\">entrar novamente</a>, ou voltara para a <a href=\"/\">página inicial</a>."
 
-#: templates/web/base/report/new/fill_in_details_text.html:2
-#: templates/web/base/report/new/fill_in_details_text.html:8
+#: templates/web/base/report/new/fill_in_details_text.html:2 templates/web/base/report/new/fill_in_details_text.html:8
 msgid "Please fill in details of the problem below."
 msgstr "Por favor, descreva em detalhes o problema abaiixo."
 
-#: templates/web/base/report/new/sidebar.html:7
-#: templates/web/zurich/report/new/sidebar.html:14
-msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
+#: templates/web/base/report/new/sidebar.html:7 templates/web/zurich/report/new/sidebar.html:14
+msgid ""
+"Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
 msgstr ""
+"Por favor, preencha o formulário abaixo com detalhes do problema, e descreva a localização da forma mais precisa possível na caixa de "
+"detalhes."
 
 #: templates/web/base/auth/2fa/form.html:9
 msgid "Please generate a two-factor code and enter it below:"
@@ -3051,43 +2771,40 @@ msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Por favor, indique se você gostaria de receber outro questionário"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
-#: templates/web/base/js/translation_strings.html:11
-#, fuzzy
+#: perllib/FixMyStreet/DB/Result/Problem.pm:368 templates/web/base/js/translation_strings.html:11
 msgid "Please make sure you are not including an email address"
-msgstr "Por favor, digite um endereço de email válido"
+msgstr "Por favor, certifique-se que não está digitando um endereço de e-mail"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
-#: templates/web/base/js/translation_strings.html:34
+#: perllib/FixMyStreet/App/Controller/Auth.pm:494 templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr "Por favor,  certifique-se que sua senha tem pelo menos %d caracteres"
 
 #: templates/web/base/report/updates-sidebar-notes.html:2
 msgid "Please note that updates are not sent to the council."
-msgstr ""
+msgstr "Atenção: as atualizações não são enviadas ao órgão."
 
 #: templates/web/base/report/new/oauth_email_form.html:4
 msgid "Please note your report has <strong>not yet been sent</strong>."
-msgstr ""
+msgstr "Atenção: sua denúncia <strong>ainda não foi enviada</strong>."
 
-#: templates/web/base/report/new/fill_in_details_form.html:23
-#: templates/web/zurich/report/new/sidebar.html:5
-msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit."
+#: templates/web/base/report/new/fill_in_details_form.html:23 templates/web/zurich/report/new/sidebar.html:5
+msgid ""
+"Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit."
 msgstr ""
+"Atenção: sua denúncia <strong>ainda não foi enviada</strong>. Escolha uma categoria e adicione mais informações abaixo, e então enive."
 
 #: templates/web/base/report/display.html:34
 msgid "Please note your update has <strong>not yet been posted</strong>."
-msgstr ""
+msgstr "Atenção: sua atualização <strong>ainda não foi postada</strong>."
 
-#: templates/web/base/report/new/notes.html:1
-#: templates/web/zurich/report/new/notes.html:1
+#: templates/web/base/report/new/notes.html:1 templates/web/zurich/report/new/notes.html:1
 msgid "Please note:"
-msgstr ""
+msgstr "Atenção:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:471
 msgid "Please provide a duplicate ID or public update for this report."
-msgstr ""
+msgstr "Por favor, forneça um ID ou uma atualização pública para esta denúncia."
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:453
 msgid "Please provide a public update for this report."
@@ -3101,22 +2818,24 @@ msgstr "Por favor, explique o motivo pelo qual você está reabrindo esta denún
 msgid "Please provide some text as well as a photo"
 msgstr "Por favor, forneça uma descrição e uma foto também"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114 perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please say whether you've ever reported a problem to your council before"
-msgstr ""
+msgstr "Por favor, nos diga se você já denunciou um problema ao seu órgão antes"
 
 #: templates/web/base/auth/2fa/form-add.html:1
-msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
+msgid ""
+"Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
+"Por favor, escaneie esta imagem com seu aplicativo ou insira o código em seu aplicativo e, em seguida, gere um novo código único e "
+"insira-o abaixo:"
 
 #: templates/web/zurich/admin/reports/edit.html:194
 msgid "Please select a body."
-msgstr "Por favor, selecione um orgão"
+msgstr "Por favor, selecione um órgão."
 
 #: perllib/FixMyStreet/App/Controller/Alert.pm:86
 msgid "Please select the feed you want"
-msgstr ""
+msgstr "Por favor, selecione o feed que você qyer"
 
 #: perllib/FixMyStreet/App/Controller/Alert.pm:134
 msgid "Please select the type of alert you want"
@@ -3124,18 +2843,15 @@ msgstr "Por favor, selecione o tipo de alerta que você quer"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please state whether or not the problem has been fixed"
-msgstr ""
+msgstr "Por favor, indique se o problema foi corrigido ou não"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:119 perllib/FixMyStreet/App/Model/PhotoSet.pm:138
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:140 templates/web/base/js/translation_strings.html:80
 msgid "Please upload an image only"
 msgstr "Por favor, envie apenas uma imagem"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142 perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
 msgid "Please verify at least one of email/phone"
 msgstr "Por favor, confirme pelo menos um dos e-mail/telefone"
 
@@ -3149,7 +2865,7 @@ msgstr "Postar"
 
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
-msgstr ""
+msgstr "CEP ou nome da rua e bairro"
 
 #: perllib/FixMyStreet/DB/Result/Comment.pm:215
 msgid "Posted anonymously at %s"
@@ -3169,19 +2885,19 @@ msgstr "Postado por <strong>%s</strong> às %s"
 
 #: templates/web/base/front/footer-marketing.html:6
 msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>"
-msgstr ""
+msgstr "Powered by <a class=\"platform-logo\" href=\"https://ajeitaminharua.com.br/\">AjeitaMinhaRua</a>"
 
 #: templates/web/base/admin/bodies/contact-form.html:41
 msgid "Prevent new reports from using this category, <em>and</em> also remove it from map filters."
-msgstr ""
+msgstr "Impede que esta categoria seja usada em novas denúncias, <em>e</em> também a remove dos filtros dos mapa."
 
 #: templates/web/base/admin/bodies/contact-form.html:36
 msgid "Prevent new reports from using this category, but keep it available in map filters."
-msgstr ""
+msgstr "Impede que esta categoria seja usada em novas denúncias, mas se mantém ativa no filtro dos mapas."
 
 #: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Prevent user from submitting the form until this field is filled in."
-msgstr ""
+msgstr "Impede que o usuário envie o formulário sem preencher este campo."
 
 #: templates/web/base/pagination.html:4
 msgid "Previous"
@@ -3191,8 +2907,7 @@ msgstr "Anterior"
 msgid "Priorities"
 msgstr "Prioridades"
 
-#: templates/web/base/report/_item.html:82
-#: templates/web/base/report/inspect/extra_details.html:2
+#: templates/web/base/report/_item.html:82 templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -3200,22 +2915,18 @@ msgstr "Prioridade"
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: templates/web/base/about/_sidebar.html:5
-#: templates/web/base/about/privacy.html:1
-#: templates/web/base/about/privacy.html:2
+#: templates/web/base/about/_sidebar.html:5 templates/web/base/about/privacy.html:1 templates/web/base/about/privacy.html:2
 msgid "Privacy and cookies"
 msgstr "Cookies e Privacidade"
 
-#: 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
+#: 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 "Privado"
 
 #: templates/web/base/reports/_list-filter-status.html:28
 msgid "Private only"
-msgstr ""
+msgstr "Apenas privado"
 
 #: templates/web/base/maps/pin.html:14
 msgid "Problem"
@@ -3226,50 +2937,42 @@ msgid "Problem %d created"
 msgstr "%d problemas criados"
 
 #: templates/web/base/admin/users/log.html:54
-#, fuzzy
 msgid "Problem %s added to shortlist"
-msgstr "Adicione para lista"
+msgstr "Problema %s adicionado à lista de atalhos"
 
 #: templates/web/base/admin/timeline.html:24
 msgid "Problem %s confirmed"
 msgstr "%s problemas confirmados"
 
 #: templates/web/base/admin/users/log.html:47
-#, fuzzy
 msgid "Problem %s created"
-msgstr "%d problemas criados"
+msgstr "Problema %s criado"
 
 #: templates/web/base/admin/users/log.html:49
-#, fuzzy
 msgid "Problem %s created on behalf of %s"
-msgstr "%d problemas criados"
+msgstr "Problema % criado no nome de %s"
 
 #: templates/web/base/admin/users/log.html:56
-#, fuzzy
 msgid "Problem %s removed from shortlist"
-msgstr "usuário removido da lista de abuso"
+msgstr "Problema %s removido da lista de atalhos"
 
 #: templates/web/base/admin/timeline.html:26
 msgid "Problem %s sent to council %s"
-msgstr ""
+msgstr "Problema % enviado ao órgão %s"
 
-#: templates/web/base/admin/stats/index.html:13
-#: 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 ""
+msgstr "Problemas separados por estado"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:244
 msgid "Problem marked as open."
-msgstr "Problema marcado como aberto"
+msgstr "Problema marcado em aberto."
 
 #: templates/web/base/admin/stats/questionnaire.html:21
 msgid "Problem state change based on survey results"
-msgstr ""
+msgstr "O estado do problema muda de acordo com o resultado das pesquisas"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
-#: templates/web/base/admin/flagged.html:10
+#: perllib/FixMyStreet/Cobrand/Default.pm:754 perllib/FixMyStreet/Cobrand/KiitC.pm:196 templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemas"
 
@@ -3283,53 +2986,48 @@ msgstr "Problemas nas proximidades"
 
 #: templates/web/base/report/display_tools.html:22
 msgid "Problems on the map"
-msgstr " Problemas no mapa"
+msgstr "Problemas no mapa"
 
 #: db/alert_types.pl:14
 msgid "Problems recently reported fixed on FixMyStreet"
-msgstr ""
+msgstr "Problemas recentes resolvidos que foram denúnciados no AjeitaMinhaRua"
 
 #: templates/web/base/alert/_list_rss_local.html:7
 msgid "Problems within %.1fkm of %s"
-msgstr ""
+msgstr "Problemas dentro de %.1fkm de %s"
 
-#: 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
+#: 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 ""
+msgstr "Problemas em %s"
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:234
 msgid "Problems within %s ward"
-msgstr ""
+msgstr "Problemas no sinalizador %s"
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
 msgid "Problems within %s ward, %s"
-msgstr ""
+msgstr "Problemas no sinalizador %s, %s"
 
 #. ("First %s is the body name, second %s the site name")
-#: templates/web/base/admin/triage/index.html:0
-#: templates/web/base/admin/triage/index.html:14
-#: templates/web/base/reports/body.html:0
+#: templates/web/base/admin/triage/index.html:0 templates/web/base/admin/triage/index.html:14 templates/web/base/reports/body.html:0
 #: templates/web/base/reports/body.html:32
 msgid "Problems within %s, %s"
-msgstr ""
+msgstr "Problemas em %s, %s"
 
 #: templates/web/base/admin/reports/edit.html:75
 msgid "Property address:"
-msgstr ""
+msgstr "Endereço da propriedade:"
 
 #: templates/web/base/admin/extra-metadata-item.html:105
 msgid "Protect from Open311 changes"
-msgstr ""
+msgstr "Proteger de mudanças no Open311"
 
 #: templates/web/base/admin/bodies/contact-form.html:69
 msgid "Protect this category's name and group(s) from Open311 changes"
-msgstr ""
+msgstr "Proteger o nome desta categoria e grupos de mudanças no Open311"
 
-#: templates/web/base/report/duplicate-no-updates.html:3
-#: templates/web/base/report/update-form-wrapper.html:9
+#: 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 "Forneça uma atualização"
@@ -3339,19 +3037,25 @@ msgid "Provide update as"
 msgstr "Forneça uma atualização como"
 
 #: templates/web/base/report/form/user_loggedout_by_email.html:57
-msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
-msgstr "Fornecer uma senha é opcional, mas definir uma te permitirá denunciar problemas, atualizar e administrar suas denúncias com mais facilidade no futuro, "
+msgid ""
+"Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your "
+"reports."
+msgstr ""
+"Fornecer uma senha é opcional, mas definir uma vai te denunciar problemas no futuro, assim como atualizar e administrar suas "
+"denúncias com mais facilidade."
 
 #: templates/web/base/report/form/user_loggedout_by_email.html:59
-msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
-msgstr "Fornecer um nome e uma senha é opcional, mas isto te permitirá denunciar problemas, fornecer atualizações ou administrar suas denúncias de maneira mais fácil."
+msgid ""
+"Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
+msgstr ""
+"Fornecer um nome e uma senha é opcional, mas isto te permitirá denunciar problemas, fornecer atualizações ou administrar suas "
+"denúncias de maneira mais fácil."
 
 #: templates/web/base/report/new/form_public_councils_text.html:2
 msgid "Public details"
 msgstr "Detalhes públicos"
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:230 templates/web/zurich/admin/reports/edit.html:257
 msgid "Public response:"
 msgstr "Resposta pública:"
 
@@ -3359,113 +3063,97 @@ msgstr "Resposta pública:"
 msgid "Public update:"
 msgstr "Atualização pública:"
 
-#: templates/web/zurich/admin/reports/edit.html:110
-#: templates/web/zurich/admin/stats/index.html:59
+#: templates/web/zurich/admin/reports/edit.html:110 templates/web/zurich/admin/stats/index.html:59
 msgid "Publish photo"
 msgstr "Publicar foto"
 
 #: templates/web/base/admin/extra-metadata-item.html:60
-#, fuzzy
 msgid "Question text"
 msgstr "Questionário"
 
-#: templates/web/base/questionnaire/completed.html:1
-#: templates/web/base/questionnaire/index.html:0
-#: templates/web/base/questionnaire/index.html:14
-#: templates/web/base/questionnaire/index.html:5
+#: templates/web/base/questionnaire/completed.html:1 templates/web/base/questionnaire/index.html:0
+#: templates/web/base/questionnaire/index.html:14 templates/web/base/questionnaire/index.html:5
 msgid "Questionnaire"
 msgstr "Questionário"
 
 #: templates/web/base/admin/timeline.html:30
 msgid "Questionnaire %d answered for problem %d, %s to %s"
-msgstr ""
+msgstr "Questionário %d respondido para o problema %d,%s para %s"
 
 #: templates/web/base/admin/timeline.html:28
 msgid "Questionnaire %d sent for problem %d"
-msgstr ""
+msgstr "Questionário %s enviado para o problema %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205
-#: templates/web/base/report/updates.html:20
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 templates/web/base/report/updates.html:20
 msgid "Questionnaire filled in by problem reporter"
-msgstr "Questionário preenchido pelo relator do problema "
+msgstr "Questionário preenchido pelo relator do problema"
 
-#: templates/web/base/alert/_list.html:35
-#: templates/web/base/alert/_list.html:53
-#: templates/web/base/alert/_list_rss_local.html:3
-#: templates/web/base/alert/updates.html:9
-#: templates/web/base/around/display_location.html:3
+#: templates/web/base/alert/_list.html:35 templates/web/base/alert/_list.html:53 templates/web/base/alert/_list_rss_local.html:3
+#: templates/web/base/alert/updates.html:9 templates/web/base/around/display_location.html:3
 #: templates/web/base/report/display_tools.html:44
 msgid "RSS feed"
-msgstr ""
+msgstr "Feed RSS"
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
 msgid "RSS feed for %s"
-msgstr ""
+msgstr "Feed RSS para %s"
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
 msgid "RSS feed for %s ward, %s"
-msgstr ""
+msgstr "Feed RSS para sinalizador %s, %s"
 
-#: 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
+#: 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 ""
+msgstr "Feed RSS de %s"
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
 msgid "RSS feed of %s, within %s ward"
-msgstr ""
+msgstr "Feed RSS no %s, dentro do sinalizador %s"
 
 #: templates/web/base/alert/_list_rss_local.html:3
 msgid "RSS feed of nearby problems"
-msgstr ""
+msgstr "Feed RSS de problemas próximos"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: 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 ""
+msgstr "Feed RSS de problemas em %s"
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:233
 msgid "RSS feed of problems within %s ward"
-msgstr ""
+msgstr "Feed RSS de problemas no sinalizador %s"
 
-#: templates/web/base/around/display_location.html:3
-#: templates/web/base/around/display_location.html:4
+#: templates/web/base/around/display_location.html:3 templates/web/base/around/display_location.html:4
 msgid "RSS feed of recent local problems"
-msgstr ""
+msgstr "Feed RSS de problemas locais recentes"
 
-#: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:44
+#: templates/web/base/alert/updates.html:9 templates/web/base/report/display_tools.html:44
 msgid "RSS feed of updates to this problem"
-msgstr ""
+msgstr "Feed RSS de atualizações deste problema"
 
 #: templates/web/base/report/_item_expandable.html:55
 msgid "Read less"
-msgstr ""
+msgstr "Ler menos"
 
 #: templates/web/base/report/_item_expandable.html:55
 msgid "Read more"
-msgstr ""
+msgstr "Ler mais"
 
 #: templates/web/base/admin/reports/edit.html:93
 msgid "Reason:"
-msgstr ""
+msgstr "Razão:"
 
-#: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/alert/updates.html:14 templates/web/base/report/display_tools.html:46
 msgid "Receive email when updates are left on this problem."
-msgstr ""
+msgstr "Receber e-mails quando atualizações forem cadastradas neste problema."
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:815
 msgid "Received by %s moments later"
-msgstr ""
+msgstr "Recebido por %s momentos depois"
 
 #. ("%s is the site name")
-#: templates/web/base/around/display_location.html:0
-#: templates/web/base/around/display_location.html:35
+#: templates/web/base/around/display_location.html:0 templates/web/base/around/display_location.html:35
 msgid "Recent local problems, %s"
 msgstr "Problemas locais recentes, %s"
 
@@ -3473,8 +3161,7 @@ msgstr "Problemas locais recentes, %s"
 msgid "Recently reported problems"
 msgstr "Problemas denunciados recentemente"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
-#: templates/web/base/reports/_list-filters-sort.html:9
+#: templates/web/base/admin/triage/_list-filters.html:35 templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Atualizados recentemente"
 
@@ -3483,8 +3170,13 @@ msgid "Reject report"
 msgstr "Rejeitar denúncia"
 
 #: templates/web/zurich/report/new/notes.html:5
-msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
+msgid ""
+"Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for "
+"submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
+"Lembre-se de que o AjeitaMinhaRua é usado para relatar problemas físicos que podem ser corrigidos. Se o seu problema não for "
+"apropriado para ser submetido através deste site, você pode entrar em contato com o seu município diretamente usando o próprio site "
+"da prefeitura."
 
 #: templates/web/base/admin/users/form.html:197
 msgid "Remove account details"
@@ -3496,27 +3188,22 @@ msgstr "Remover campo"
 
 #: templates/web/base/admin/report_blocks.html:23
 msgid "Remove flag"
-msgstr ""
+msgstr "Remover marcação"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
-#: templates/web/base/report/_main.html:147
-#: templates/web/base/report/_main.html:24
-#: templates/web/base/report/_main.html:32
+#: templates/web/base/report/_item.html:12 templates/web/base/report/_item.html:9 templates/web/base/report/_main.html:147
+#: templates/web/base/report/_main.html:24 templates/web/base/report/_main.html:32
 msgid "Remove from shortlist"
-msgstr ""
+msgstr "Remover da lista de atalhos"
 
 #: templates/web/base/report/display_tools.html:7
 msgid "Remove from site"
 msgstr "Remover do site"
 
 #: templates/web/base/admin/extra-metadata-option.html:26
-#, fuzzy
 msgid "Remove option"
-msgstr "Remover campo"
+msgstr "Remover opção"
 
-#: templates/web/base/admin/reports/edit.html:174
-#: templates/web/base/admin/update_edit.html:74
+#: templates/web/base/admin/reports/edit.html:174 templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Remover foto (não pode ser desfeito!)"
@@ -3533,24 +3220,18 @@ msgstr "Responder ao usuário:"
 msgid "Report"
 msgstr "Denunciar"
 
-#: templates/web/base/report/_item.html:60
-#: templates/web/base/report/inspect/information.html:7
+#: templates/web/base/report/_item.html:60 templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
-msgstr "ID da Denúnciia"
+msgstr "ID da Denúncia:"
 
 #. ("JS")
-#: 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
+#: 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 "Denunciar um problema"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
-#: templates/web/base/navigation/_report.html:4
+#: templates/web/base/js/translation_strings.html:90 templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr "Denunciar um problema aqui"
 
@@ -3558,35 +3239,31 @@ msgstr "Denunciar um problema aqui"
 msgid "Report abuse"
 msgstr "Denunciar abuso"
 
-#: templates/web/base/report/form/user.html:32
-#: templates/web/base/report/form/user.html:39
-#, fuzzy
+#: templates/web/base/report/form/user.html:32 templates/web/base/report/form/user.html:39
 msgid "Report anonymously"
-msgstr "Denunciado anonimamente às %s"
+msgstr "Denunciado anonimamente"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
-#: templates/web/base/navigation/_report.html:2
+#: 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 "Denunciar outro problema aqui"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 msgid "Report as"
-msgstr "Denunciar como: "
+msgstr "Denunciar como"
 
 #: templates/web/base/report/new/form_public_councils_text.html:3
-#, fuzzy
 msgid "Report details"
-msgstr "Denunciar como: "
+msgstr "Detalhes da denúncia"
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:306
 msgid "Report on %s"
-msgstr ""
+msgstr "Denúncia em %s"
 
 #: templates/web/base/dashboard/index.html:63
 msgid "Report state:"
-msgstr ""
+msgstr "Estado da denúncia:"
 
 #: templates/web/base/report/new/form_heading.html:1
 msgid "Report your problem"
@@ -3594,31 +3271,26 @@ msgstr "Denuncie seu problema"
 
 #: templates/web/base/header_opengraph.html:4
 msgid "Report, view, and discuss local street-related problems."
-msgstr "Denuncie, veja e discuta problemas locais"
+msgstr "Denuncie, veja e discuta problemas locais."
 
-#: templates/web/base/around/intro.html:1
-#: templates/web/zurich/around/intro.html:1
+#: templates/web/base/around/intro.html:1 templates/web/zurich/around/intro.html:1
 msgid "Report, view, or discuss local problems"
 msgstr "Denuncie, veja ou discuta problemas locais"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
-#: templates/web/base/contact/index.html:64
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652 templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Denunciado anonimamente às %s"
 
-#: templates/web/base/admin/stats/questionnaire.html:5
-#: templates/web/base/questionnaire/creator_fixed.html:14
+#: templates/web/base/admin/stats/questionnaire.html:5 templates/web/base/questionnaire/creator_fixed.html:14
 #: templates/web/base/questionnaire/index.html:66
 msgid "Reported before"
 msgstr "Denunciado antes"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
-#: templates/web/base/contact/index.html:66
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676 templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Denunciado por %s às %s"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:48
-#: templates/web/zurich/admin/reports/edit.html:76
+#: templates/web/zurich/admin/report_edit-sdm.html:48 templates/web/zurich/admin/reports/edit.html:76
 msgid "Reported by:"
 msgstr "Denunciado por:"
 
@@ -3644,47 +3316,38 @@ msgstr "Denunciado por %s às %s via %s"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:643
 msgid "Reported via %s in the %s category anonymously at %s"
-msgstr ""
+msgstr "Denúnciado anonimamente as %s via %s na categoria %s"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:665
 msgid "Reported via %s in the %s category by %s at %s"
-msgstr ""
+msgstr "Denunciado via %s na categoria %s por %s as %s"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:38
-#: templates/web/zurich/admin/reports/edit.html:57
+#: templates/web/zurich/admin/report_edit-sdm.html:38 templates/web/zurich/admin/reports/edit.html:57
 msgid "Reported:"
 msgstr "Denunciado:"
 
 #. ("JS")
-#: templates/web/base/around/index.html:3
-#: templates/web/base/around/lookup_by_ref.html:3
-#: templates/web/base/js/translation_strings.html:61
-#: templates/web/base/report/new/fill_in_details.html:0
-#: templates/web/base/report/new/fill_in_details.html:10
-#: templates/web/zurich/report/new/fill_in_details_form.html:4
+#: templates/web/base/around/index.html:3 templates/web/base/around/lookup_by_ref.html:3
+#: templates/web/base/js/translation_strings.html:61 templates/web/base/report/new/fill_in_details.html:0
+#: templates/web/base/report/new/fill_in_details.html:10 templates/web/zurich/report/new/fill_in_details_form.html:4
 msgid "Reporting a problem"
 msgstr "Denunciando um problema"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
-#: templates/web/base/around/tabbed_lists.html:3
-#: templates/web/base/dashboard/index.html:108
+#: perllib/FixMyStreet/Cobrand/Default.pm:698 perllib/FixMyStreet/Cobrand/Default.pm:712 perllib/FixMyStreet/Cobrand/KiitC.pm:330
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 templates/web/base/around/tabbed_lists.html:3 templates/web/base/dashboard/index.html:108
 #: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Denúncias"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
-#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
-msgstr ""
+msgstr "Denúncias são limitados a %s caracteres. Por favor, seja mais breve"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:15
 msgid "Reports are limited to {0} characters in length. Please shorten your report"
-msgstr ""
+msgstr "Denúncias são limitados a {0} caracteres. Por favor, seja mais breve"
 
 #: templates/web/zurich/admin/index-sdm.html:7
 msgid "Reports awaiting approval"
@@ -3696,7 +3359,7 @@ msgstr "Denúncias por destino"
 
 #: templates/web/base/alert/_list.html:15
 msgid "Reports near %s are sent to different councils, depending on the type of problem."
-msgstr ""
+msgstr "Denúncias próximas à %s são enviadas para órgãos diferentes, dependendo do tipo do problema."
 
 #: templates/web/zurich/admin/index-sdm.html:10
 msgid "Reports published"
@@ -3705,7 +3368,7 @@ msgstr "Denúncias publicadas"
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:101
 msgid "Reports saved offline."
-msgstr ""
+msgstr "Denúncias salvas offline."
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
 msgid "Reports sent to %s"
@@ -3713,7 +3376,7 @@ msgstr "Denúncias enviadas para %s"
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
 msgid "Reports sent to %s, within %s ward"
-msgstr ""
+msgstr "Denúncia enviada à %s, no sinalizador %s"
 
 #: templates/web/base/admin/index.html:62
 msgid "Reports waiting to be sent"
@@ -3722,7 +3385,7 @@ msgstr "Denúncias aguardando para serem enviadas"
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:42
 msgid "Reposition if needed, then hit Continue"
-msgstr ""
+msgstr "Reposicione se necessário e clique em Continuar"
 
 #: templates/web/base/admin/extra-metadata-item.html:93
 msgid "Required"
@@ -3734,7 +3397,7 @@ msgstr "Reenviar denúncia"
 
 #: templates/web/base/auth/create.html:72
 msgid "Reset"
-msgstr ""
+msgstr "Redefinir"
 
 #: templates/web/base/admin/responsepriorities/index.html:1
 msgid "Response Priorities"
@@ -3746,19 +3409,17 @@ msgstr "Prioridade de Resposta para %s"
 
 #: templates/web/base/admin/templates/edit.html:1
 msgid "Response Template for %s"
-msgstr ""
+msgstr "Modelo de Reposta para %s"
 
 #: templates/web/base/admin/templates/index.html:1
 msgid "Response Templates"
-msgstr ""
+msgstr "Modelos de Repostas"
 
-#: templates/web/base/admin/templates/view.html:1
-#: templates/web/zurich/admin/templates/edit.html:1
-#: templates/web/zurich/admin/templates/edit.html:4
-#: templates/web/zurich/admin/templates/view.html:1
+#: templates/web/base/admin/templates/view.html:1 templates/web/zurich/admin/templates/edit.html:1
+#: templates/web/zurich/admin/templates/edit.html:4 templates/web/zurich/admin/templates/view.html:1
 #: templates/web/zurich/admin/templates/view.html:3
 msgid "Response Templates for %s"
-msgstr ""
+msgstr "Modelos de Repostas para %s"
 
 #: templates/web/base/report/update.html:44
 msgid "Revert to original"
@@ -3779,70 +3440,54 @@ msgstr "Lugar certo?"
 
 #: perllib/FixMyStreet/Geocode/OSM.pm:161
 msgid "Road operator for this named road (derived from road reference number and type): %s"
-msgstr ""
+msgstr "Operador da estrada para esta estrada nomeada (derivado do número e tipo de referência da estrada): %s"
 
 #: perllib/FixMyStreet/Geocode/OSM.pm:158
 msgid "Road operator for this named road (from OpenStreetMap): %s"
-msgstr ""
+msgstr "Operador rodoviário para esta estrada nomeada (a partir do OpenStreetMap): %s"
 
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
-msgstr ""
+msgstr "Função"
 
-#: templates/web/base/admin/users/form.html:143
-#: templates/web/base/admin/users/index.html:29
+#: templates/web/base/admin/users/form.html:143 templates/web/base/admin/users/index.html:29
 msgid "Role:"
-msgstr ""
+msgstr "Função:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
-#: templates/web/base/admin/roles/form.html:1
-#: templates/web/base/admin/roles/index.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:714 templates/web/base/admin/roles/form.html:1 templates/web/base/admin/roles/index.html:1
 msgid "Roles"
-msgstr ""
+msgstr "Funções"
 
-#: 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
+#: 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 "Girar Para a Esquerda"
 
-#: 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
+#: 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 "Girar Para a Direita"
 
 #: templates/web/zurich/admin/reports/edit.html:98
 msgid "Rotating this photo will discard unsaved changes to the report."
-msgstr ""
+msgstr "Rotacionar esta foto fará com que você perca mudanças não salvas na denúncia."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:66
-#: templates/web/base/maps/google-ol.html:2
+#: templates/web/base/js/translation_strings.html:66 templates/web/base/maps/google-ol.html:2
 msgid "Satellite"
 msgstr "Satélite"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:69 templates/web/base/report/_inspect.html:78
 msgid "Save + close as duplicate"
 msgstr "Salvar + fechar como duplicado"
 
-#: 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
+#: 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 "Salvar mudanças"
 
@@ -3852,40 +3497,35 @@ msgstr "Salvar novos campos"
 
 #: templates/web/base/report/inspect/public_update.html:7
 msgid "Save with a public update"
-msgstr ""
+msgstr "Salvar como uma atualização pública"
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
 #: templates/web/base/js/translation_strings.html:102
 msgid "Saving reports offline"
-msgstr ""
+msgstr "Salvar denúncias offline"
 
-#: templates/web/base/admin/index.html:26
-#: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
+#: templates/web/base/admin/index.html:26 templates/web/base/admin/reports/index.html:1 templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Buscar Denúncias"
 
-#: templates/web/base/admin/index.html:34
-#: templates/web/base/admin/users/index.html:1
+#: templates/web/base/admin/index.html:34 templates/web/base/admin/users/index.html:1
 msgid "Search Users"
 msgstr "Buscar Usuários"
 
 #: templates/web/base/alert/index.html:10
 msgid "Search for location of email alert or RSS feed"
-msgstr ""
+msgstr "Pesquise a localização de alerta de e-mail ou feed RSS"
 
 #: templates/web/zurich/header.html:70
 msgid "Search reports"
 msgstr "Buscar denúncias"
 
-#: templates/web/base/admin/reports/index.html:5
-#: templates/web/base/admin/users/index.html:26
+#: templates/web/base/admin/reports/index.html:5 templates/web/base/admin/users/index.html:26
 #: templates/web/zurich/admin/reports/index.html:5
 msgid "Search:"
 msgstr "Buscar:"
 
-#: templates/web/base/admin/reports/index.html:27
-#: templates/web/base/around/lookup_by_ref.html:18
+#: templates/web/base/admin/reports/index.html:27 templates/web/base/around/lookup_by_ref.html:18
 msgid "Searching found no reports."
 msgstr "A busca não encontrou nenhuma denúncia."
 
@@ -3893,91 +3533,80 @@ msgstr "A busca não encontrou nenhuma denúncia."
 msgid "Searching found no users."
 msgstr "A busca não encontrou nenhum usuário."
 
-#: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
-#: templates/web/base/my/my.html:75
+#: templates/web/base/auth/generate_token.html:2 templates/web/base/auth/generate_token.html:45 templates/web/base/my/my.html:75
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/web/base/report/form/private_details.html:14
-#: templates/web/base/report/new/councils_text_private.html:8
+#: templates/web/base/report/form/private_details.html:14 templates/web/base/report/new/councils_text_private.html:8
 msgid "See our privacy policy"
 msgstr "Veja nossa poítica de privacidade"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:768 perllib/FixMyStreet/Cobrand/KiitC.pm:202
 msgid "See user detail for reports created as the council"
-msgstr ""
+msgstr "Veja detalhes do usuário para dennúncias criadas como: órgão"
 
-#: templates/web/base/admin/bodies/form.html:41
-#: templates/web/zurich/admin/bodies/form.html:16
+#: templates/web/base/admin/bodies/form.html:41 templates/web/zurich/admin/bodies/form.html:16
 msgid "Select a body"
-msgstr "Selecionar um orgão"
+msgstr "Selecionar um órgão"
 
-#: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/bodies/form.html:78 templates/web/base/admin/users/form.html:87
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Selecionar uma área"
 
 #: templates/web/base/admin/responsepriorities/edit.html:19
 msgid "Select if this is the default priority"
-msgstr ""
+msgstr "Selecione se esta é a prioridade padrão"
 
 #: templates/web/base/reports/_ward-list.html:7
 msgid "Select multiple wards to view only reports within those wards."
-msgstr ""
+msgstr "Selecionar múltiplos sinalizadores para ver apenas denúncias destes sinalizadores."
 
 #: templates/web/base/reports/_ward-list.html:8
 msgid "Select multiple wards?"
-msgstr ""
+msgstr "Selecionar múltiplos sinalizadores?"
 
 #: templates/web/base/admin/category-checkboxes.html:4
 msgid "Select:"
 msgstr "Selecionar:"
 
-#: templates/web/base/contact/enquiry/index.html:75
-#: templates/web/base/contact/index.html:120
+#: templates/web/base/contact/enquiry/index.html:75 templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr "Enviar"
 
 #: templates/web/base/admin/reports/edit.html:91
 msgid "Send Fail Count:"
-msgstr ""
+msgstr "Enviar contagem de falhas:"
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:121
 msgid "Send extended Open311 statuses with service request updates"
-msgstr ""
+msgstr "Envie status estendidos do Open311 com atualizações de solicitação de serviço"
 
 #: templates/web/base/admin/users/form.html:25
 msgid "Send login email"
-msgstr "Enviar email de login"
+msgstr "Enviar e-mail de login"
 
-#: templates/web/base/auth/_username_error.html:1
-#: templates/web/base/auth/_username_error.html:5
+#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:5
 msgid "Sending a confirmation text failed: \"%s\""
-msgstr ""
+msgstr "O envio de um texto de confirmação falhou: \"%s\""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:904
 msgid "Sent report back"
-msgstr ""
+msgstr "Enviado denúncia de volta"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:819
 msgid "Sent to %s %s later"
-msgstr ""
+msgstr "Enviar para %s %s depois"
 
 #: templates/web/base/admin/reports/edit.html:80
 msgid "Sent:"
 msgstr "Enviado:"
 
-#: templates/web/base/admin/reports/edit.html:97
-#: templates/web/zurich/admin/stats/index.html:66
+#: templates/web/base/admin/reports/edit.html:97 templates/web/zurich/admin/stats/index.html:66
 msgid "Service:"
 msgstr "Serviço:"
 
-#: templates/web/base/auth/change_password.html:2
-#: templates/web/base/auth/change_password.html:4
-#: templates/web/base/my/my.html:70
+#: templates/web/base/auth/change_password.html:2 templates/web/base/auth/change_password.html:4 templates/web/base/my/my.html:70
 msgid "Set password"
 msgstr "Definir senha"
 
@@ -3991,30 +3620,25 @@ msgstr "Compartilhar"
 
 #: templates/web/base/admin/manifesttheme/index.html:8
 msgid "Short Name"
-msgstr ""
+msgstr "Abreviação"
 
-#: 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/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 ""
+msgstr "Lista de atalhos"
 
 #: templates/web/base/reports/body.html:39
 msgid "Shortlist all visible"
-msgstr ""
+msgstr "Lista toda visível"
 
-#: templates/web/base/report/_main.html:147
-#: templates/web/base/report/_main.html:26
-#: templates/web/base/report/_main.html:31
+#: templates/web/base/report/_main.html:147 templates/web/base/report/_main.html:26 templates/web/base/report/_main.html:31
 #: templates/web/base/reports/_list-filter-status.html:24
 msgid "Shortlisted"
-msgstr ""
+msgstr "Favoritado"
 
-#: templates/web/base/report/_item.html:15
-#: templates/web/base/report/_main.html:157
+#: templates/web/base/report/_item.html:15 templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
-msgstr ""
+msgstr "Listado por %s"
 
 #: templates/web/base/report/update.html:23
 msgid "Show Photo?"
@@ -4036,8 +3660,7 @@ msgstr "Mostrar nome publicamente?"
 msgid "Show older"
 msgstr "Mostrar antigo"
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:43 templates/web/base/reports/_list-filters.html:47
 msgid "Show older reports"
 msgstr "Mostrar denúncias antigas"
 
@@ -4046,229 +3669,198 @@ msgid "Show photo"
 msgstr "Mostrar foto"
 
 #. ("JS")
-#: templates/web/base/around/display_location.html:63
-#: templates/web/base/around/display_location.html:71
+#: templates/web/base/around/display_location.html:63 templates/web/base/around/display_location.html:71
 #: templates/web/base/js/translation_strings.html:73
 msgid "Show pins"
-msgstr ""
+msgstr "Mostrar marcadores"
 
 #: templates/web/base/report/_main.html:72
 msgid "Show reporter&rsquo;s name"
-msgstr ""
+msgstr "Mostrar nome de de quem denunciou"
 
 #: templates/web/base/reports/index.html:64
 msgid "Show reports in your area"
 msgstr "Mostrar denúncias em sua área"
 
-#: 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
+#: 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 "Entrar"
 
 #: templates/web/base/auth/create.html:26
 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated."
-msgstr ""
+msgstr "Entre por email alternativamente, criando uma nova senha. Ao clicar no link em seu e-mail, sua senha será atualizada."
 
 #: templates/web/base/auth/create.html:24
-msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated."
+msgid ""
+"Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your "
+"password will be updated."
 msgstr ""
+"Faça login por e-mail ou sms, fornecendo uma nova senha. Quando você clicar no link em seu e-mail ou digitar o código de autenticação "
+"do SMS, sua senha será atualizada."
 
-#: templates/web/base/auth/general.html:1
-#: templates/web/zurich/auth/general.html:1
+#: templates/web/base/auth/general.html:1 templates/web/zurich/auth/general.html:1
 msgid "Sign in or create an account"
 msgstr "Entrar ou criar uma conta"
 
 #: templates/web/base/auth/general.html:87
 msgid "Sign in with a password"
-msgstr ""
+msgstr "Entrar com uma senha"
 
-#: templates/web/base/auth/create.html:31
-#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:77
+#: templates/web/base/auth/create.html:31 templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:77
 #: templates/web/zurich/auth/sign_out.html:1
 msgid "Sign out"
 msgstr "Sair"
 
 #: templates/web/base/report/new/fill_in_details_text.html:2
 msgid "Some categories may require additional information."
-msgstr "Algumas categorias podem requerer informação adicional"
+msgstr "Algumas categorias podem requerer informação adicional."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:40
-#: templates/web/base/admin/bodies/open311-form-fields.html:41
+#: templates/web/base/admin/bodies/open311-form-fields.html:40 templates/web/base/admin/bodies/open311-form-fields.html:41
 msgid ""
 "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n"
 "          sent from your FixMyStreet installation."
 msgstr ""
+"Alguns caminhos exigem <strong>API key</strong> para indicar que a denúncia está sendo\n"
+"          enviada da instalação do AjeitaMinhaRua."
 
 #: templates/web/base/alert/index.html:22
 msgid "Some photos of recent reports"
-msgstr ""
+msgstr "Fotos de denúncias recentes"
 
 #. ('Optional comment for translator')
 #: perllib/FixMyStreet/Template.pm:62
 msgid "Some text to localize"
-msgstr ""
+msgstr "Algum texto para localizar"
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:142
 msgid "Someone has moderated this report since you started."
-msgstr ""
+msgstr "Alguém moderou esta denúncia desde que você começou."
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:76
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
-msgstr ""
+msgstr "Ops! Você alcançou o limite de imagens que podem ser adicionadas em uma denúncia."
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: 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 ""
+msgstr "Desculpe, parece ser um código postal ou uma cidade que ainda não cobrimos."
 
 #: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8
 msgid "Sorry, that wasn&rsquo;t a valid link"
-msgstr ""
+msgstr "Ops! Este não é um link válido"
 
-#: templates/web/base/auth/2fa/form-add.html:7
-#: templates/web/base/auth/2fa/form.html:5
-#: templates/web/base/auth/smsform.html:16
+#: templates/web/base/auth/2fa/form-add.html:7 templates/web/base/auth/2fa/form.html:5 templates/web/base/auth/smsform.html:16
 msgid "Sorry, that wasn&rsquo;t the correct code"
-msgstr ""
+msgstr "Ops! Este não é o código correto"
 
 #: templates/web/base/tokens/abuse.html:5
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Desculpe, houve um erro ao confirmar seu problema."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
+#: 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 "Desculpe, nós não conseguimos encontrar esta localização."
 
-#: templates/web/base/auth/general.html:16
-#: templates/web/base/report/display.html:29
+#: templates/web/base/auth/general.html:16 templates/web/base/report/display.html:29
 #: templates/web/base/report/new/fill_in_details_form.html:26
 msgid "Sorry, we could not log you in. Please fill in the form below."
-msgstr ""
+msgstr "Desculpe, não conseguimod fazer seu login. Preencha o formulário abaixo."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
-#: perllib/FixMyStreet/Geocode/Google.pm:56
-#: perllib/FixMyStreet/Geocode/Zurich.pm:119
+#: perllib/FixMyStreet/Geocode/Bing.pm:44 perllib/FixMyStreet/Geocode/Google.pm:56 perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
-msgstr ""
+msgstr "Desculpe, não foi possível encontrar esta localização. Por favor tente novamente."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
-#: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108 perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
-#, fuzzy
 msgid "Sorry, we couldn't save your file(s), please try again."
-msgstr "Desculpe, não conseguimos salvar sua(s) imagem(ns), por favor tente novamente."
+msgstr "Desculpe, não conseguimos salvar seus arquivos, por favor tente novamente."
 
 #: templates/web/base/offline/fallback.html:6
 msgid "Sorry, we don’t have a good enough connection to fetch that page."
-msgstr ""
+msgstr "Desculpe, não conseguimos abrir a página por problema de conexão."
 
 #: perllib/FixMyStreet/App/Controller/Root.pm:129
 msgid "Sorry, you don't have permission to do that."
 msgstr "Desculpe, você não tem permissão para fazer isto."
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:176
-msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
+msgid ""
+"Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> "
+"to view this report."
 msgstr ""
+"Ops! Você não tem permissão para fazer isso. Se você denunciou o problema, ou é um membro da equipe, por favor clique em <a href=\"%s"
+"\">Entrar</a> para ver esta denúncia."
 
-#: templates/web/base/admin/triage/_list-filters.html:28
-#: templates/web/base/reports/_list-filters-sort.html:2
+#: templates/web/base/admin/triage/_list-filters.html:28 templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Ordenar por"
 
 #: templates/web/base/admin/bodies/contact-form.html:45
 msgid "Staff only"
-msgstr ""
+msgstr "Apenas a equipe"
 
 #: templates/web/base/admin/users/form.html:65
 msgid "Staff users have permission to log in to the admin."
-msgstr ""
+msgstr "Os usuários da equipe têm permissão para fazer login no painel de administração."
 
 #: templates/web/base/admin/users/form.html:69
 msgid "Staff:"
-msgstr ""
+msgstr "Equipe:"
 
 #: templates/web/base/debug_header.html:3
 msgid "Staging site"
-msgstr ""
+msgstr "Área de teste"
 
 #: templates/web/base/dashboard/index.html:75
 msgid "Start Date"
 msgstr "Data Início"
 
-#: templates/web/base/admin/bodies/body.html:74
-#: templates/web/base/admin/bodies/category.html:30
-#: templates/web/base/admin/bodies/contact-form.html:22
-#: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:70
-#: templates/web/base/admin/list_updates.html:11
-#: templates/web/base/admin/reports/index.html:16
-#: templates/web/base/admin/templates/edit.html:50
-#: templates/web/base/admin/templates/view.html:8
-#: templates/web/base/admin/users/alerts.html:11
-#: templates/web/base/dashboard/index.html:102
-#: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/admin/bodies/body.html:74 templates/web/base/admin/bodies/category.html:30
+#: templates/web/base/admin/bodies/contact-form.html:22 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:70
+#: templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports/index.html:16
+#: templates/web/base/admin/templates/edit.html:50 templates/web/base/admin/templates/view.html:8
+#: templates/web/base/admin/users/alerts.html:11 templates/web/base/dashboard/index.html:102 templates/web/base/report/_inspect.html:34
+#: templates/web/base/report/_item.html:78 templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107 perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
 msgid "State and external status code cannot be used simultaneously."
-msgstr ""
+msgstr "O estado e o código de status externo não podem ser usados ​​simultaneamente."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
-#: templates/web/base/report/_update_state.html:7
-#: templates/web/base/report/updates.html:21
+#: perllib/FixMyStreet/Script/Alerts.pm:106 templates/web/base/report/_update_state.html:7 templates/web/base/report/updates.html:21
 msgid "State changed to:"
-msgstr ""
+msgstr "Estado modificado para:"
 
-#: templates/web/base/admin/reports/edit.html:128
-#: templates/web/base/admin/update_edit.html:28
-#: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
-#: templates/web/zurich/admin/reports/edit.html:91
-#: templates/web/zurich/admin/update_edit.html:17
+#: templates/web/base/admin/reports/edit.html:128 templates/web/base/admin/update_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:63 templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:91 templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Estado:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:686 perllib/FixMyStreet/Cobrand/KiitC.pm:320 perllib/FixMyStreet/Cobrand/Zurich.pm:431
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr "Estados"
 
-#: 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
+#: 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 ""
+msgstr "Estatísticas"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-sdm.html:21
 #: templates/web/zurich/admin/reports/index.html:13
 msgid "Status"
 msgstr "Status"
 
-#: templates/web/base/report/_update_state.html:22
-#: templates/web/base/report/updates.html:25
+#: templates/web/base/report/_update_state.html:22 templates/web/base/report/updates.html:25
 msgid "Still open, via questionnaire"
-msgstr ""
+msgstr "Ainda aberto, via questionário"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:27
-#: templates/web/zurich/admin/reports/edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/reports/edit.html:28
 msgid "Street View"
 msgstr "Visão da Rua"
 
@@ -4278,40 +3870,29 @@ msgstr "Subcategoria"
 
 #: templates/web/zurich/admin/index-dm.html:29
 msgid "Subdivision/Body"
-msgstr ""
+msgstr "Subdivisão/Órgão"
 
-#: templates/web/base/contact/enquiry/index.html:30
-#: templates/web/base/contact/index.html:103
+#: templates/web/base/contact/enquiry/index.html:30 templates/web/base/contact/index.html:103
 msgid "Subject"
 msgstr "Assunto"
 
-#: templates/web/base/admin/reports/edit.html:122
-#: templates/web/base/report/update/moderation_diff.html:2
+#: templates/web/base/admin/reports/edit.html:122 templates/web/base/report/update/moderation_diff.html:2
 #: templates/web/zurich/admin/reports/edit.html:41
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: 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/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 "Enviar"
 
-#: templates/web/base/admin/reports/edit.html:185
-#: templates/web/base/admin/reports/edit.html:25
-#: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/reports/edit.html:185 templates/web/base/admin/reports/edit.html:25
+#: templates/web/base/admin/update_edit.html:82 templates/web/base/admin/users/form.html:189
+#: templates/web/zurich/admin/report_edit-sdm.html:111 templates/web/zurich/admin/reports/edit.html:253
 #: templates/web/zurich/admin/update_edit.html:38
 msgid "Submit changes"
 msgstr "Enviar mudanças"
@@ -4320,77 +3901,60 @@ msgstr "Enviar mudanças"
 msgid "Submit questionnaire"
 msgstr "Enviar questionário"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-dm.html:8 templates/web/zurich/admin/index-sdm.html:21
 #: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Enviado"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:72 templates/web/base/alert/_list.html:75 templates/web/base/alert/updates.html:24
+#: templates/web/base/alert/updates.html:27 templates/web/base/alert/updates.html:34 templates/web/base/report/display_tools.html:53
+#: templates/web/base/report/display_tools.html:56 templates/web/base/report/display_tools.html:62
 msgid "Subscribe"
-msgstr ""
+msgstr "Se inscreva"
 
 #: templates/web/base/alert/_list.html:67
 msgid "Subscribe by email"
-msgstr ""
+msgstr "Se inscreva por e-mail"
 
 #: templates/web/base/admin/users/alerts.html:22
 msgid "Subscribed:"
-msgstr ""
+msgstr "Inscrito:"
 
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:34
-#, fuzzy
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
-msgstr "Os nomes são limitados a %dcaracteres de comprimento."
+msgstr "Resumos são limitados a %d caracteres. Por favor, seja mais breve"
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
-#: perllib/FixMyStreet/Cobrand/Rutland.pm:16
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138 perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
-msgstr ""
+msgstr "Resumos são limitados a %s caracteres. Por favor, seja mais breve"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:10
 msgid "Summaries are limited to {0} characters in length. Please shorten your summary"
-msgstr ""
+msgstr "Resumos são limitados a {0} caracteres. Por favor, seja mais breve"
 
 #: templates/web/base/report/new/form_title.html:1
 msgid "Summarise the problem"
-msgstr ""
+msgstr "Resumir o problema"
 
 #: templates/web/base/admin/bodies/contact-form.html:123
 msgid "Summarise your changes"
-msgstr ""
+msgstr "Resumir suas mudanças"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
-#: templates/web/base/admin/bodies/index.html:29
-#: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
-#: templates/web/base/status/index.html:3
-#: templates/web/zurich/admin/index-dm.html:1
-#: templates/web/zurich/admin/index-sdm.html:1
-#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: perllib/FixMyStreet/Cobrand/Default.pm:678 perllib/FixMyStreet/Cobrand/KiitC.pm:314 perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: templates/web/base/admin/bodies/index.html:29 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
+#: templates/web/base/status/index.html:3 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1
+#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:45
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
-#: templates/web/zurich/reports/index.html:0
-#: templates/web/zurich/reports/index.html:6
+#: templates/web/zurich/reports/index.html:0 templates/web/zurich/reports/index.html:6
 msgid "Summary reports"
-msgstr ""
+msgstr "Resumo de denúncias"
 
-#: templates/web/base/admin/stats/index.html:15
-#: 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 ""
+msgstr "Resumo de estatísticas"
 
 #: templates/web/base/admin/users/form.html:130
 msgid "Superuser:"
@@ -4398,46 +3962,39 @@ msgstr "Superusuário:"
 
 #: templates/web/base/admin/users/form.html:126
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
-msgstr ""
+msgstr "Superusuários tem permissão para executar <strong>qualquer ação</strong> dentro da administração."
 
-#: templates/web/base/admin/stats/index.html:12
-#: 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 "Resultados da Pesquisa"
 
-#: templates/web/base/report/form/private_details.html:2
-#: templates/web/base/report/form/user.html:5
+#: templates/web/base/report/form/private_details.html:2 templates/web/base/report/form/user.html:5
 msgid "Tell us about you"
 msgstr "Nos conte sobre você"
 
 #: templates/web/zurich/admin/templates/edit.html:7
 msgid "Template &laquo;%s&raquo;"
-msgstr ""
+msgstr "Modelo &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
-#: templates/web/base/develop/email_list.html:3
+#: perllib/FixMyStreet/Cobrand/Default.pm:704 perllib/FixMyStreet/Cobrand/Zurich.pm:420 templates/web/base/develop/email_list.html:3
 #: templates/web/zurich/header.html:65
 msgid "Templates"
-msgstr ""
+msgstr "Modelos"
 
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Texto"
 
 #: templates/web/base/admin/extra-metadata-item.html:69
-#, fuzzy
 msgid "Text field"
-msgstr "Campos externos:"
+msgstr "Campo de texto"
 
 #: templates/web/base/admin/bodies/body.html:33
 msgid "Text only version"
 msgstr "Versão de texto"
 
-#: templates/web/base/admin/templates/edit.html:35
-#: templates/web/base/admin/update_edit.html:20
-#: templates/web/base/admin/update_edit.html:94
-#: templates/web/zurich/admin/templates/edit.html:27
+#: templates/web/base/admin/templates/edit.html:35 templates/web/base/admin/update_edit.html:20
+#: templates/web/base/admin/update_edit.html:94 templates/web/zurich/admin/templates/edit.html:27
 #: templates/web/zurich/admin/update_edit.html:12
 msgid "Text:"
 msgstr "Texto:"
@@ -4447,8 +4004,12 @@ msgid "Thank you for reporting this issue!"
 msgstr "Obrigado por denunciar este problema!"
 
 #: templates/web/base/tokens/error.html:6
-msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
+msgid ""
+"Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us "
+"know what went on</a> and we'll look into it."
 msgstr ""
+"Obrigado por tentar confirmar sua atualização ou problema. Parece que aconteceu algum erro, então <a href=\"%s\">por favor, deixe-"
+"nossaber o que aconteceu</a> e nós iremos dar uma olhada."
 
 #: templates/web/base/tokens/confirm_update.html:16
 msgid "Thank you for updating this issue!"
@@ -4460,20 +4021,23 @@ msgstr "Obrigado por sua pergunta"
 
 #: templates/web/base/questionnaire/completed.html:5
 msgid "Thank you for your feedback"
-msgstr "Obrigado pelo seu feedback."
+msgstr "Obrigado por sua opinião"
 
 #: templates/web/base/around/_error_multiple.html:26
-msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:"
+msgid ""
+"Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box "
+"above&nbsp;:"
 msgstr ""
+"Obrigado por enviar sua foto. Agora precisamos localizar o seu problema, então insira o nome de uma rua próxima ou cep na caixaacima:"
 
 #: templates/web/base/questionnaire/creator_fixed.html:9
 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 "Obrigado, ficamos felizes em saber que foi corrigido! Poderíamos apenas perguntar se você já relatou um problema para um conselho antes?"
+msgstr ""
+"Obrigado, ficamos felizes em saber que foi corrigido! Podería apenas nos dizer se você já denunciou um problema para um órgão antes?"
 
-#: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/2fa/intro.html:11 templates/web/base/auth/generate_token.html:30
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
-msgstr ""
+msgstr "Obrigado, você habilitou com sucesso a autenticação em duas etapas para sua conta."
 
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
@@ -4482,16 +4046,15 @@ msgstr "Esta imagem parece não ter sido enviada corretamente (%s), por favor te
 #: perllib/FixMyStreet/App/Controller/Council.pm:105
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
+"Esta localização não parece ser coberta por um órgão; talvez seja fora da área que o AjeitaMinhaRua cobre, ou fora do país. Por "
+"favor, tente novamente."
 
 #: perllib/FixMyStreet/App/Controller/Location.pm:161
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Esse local não parece ser no Brasil; Por favor, tente novamente."
 
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
-#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/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 "O CEP não foi encontrado, desculpe."
 
@@ -4505,7 +4068,7 @@ msgstr "Este problema será reenviado."
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:156
 msgid "That report has been removed from FixMyStreet."
-msgstr ""
+msgstr "A denúncia foi removida do AjeitaMinhaRua."
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:581
 msgid "That user has been logged out."
@@ -4513,139 +4076,180 @@ msgstr "Este usuário deslogou."
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:588
 msgid "That user has been made anonymous on all reports and updates."
-msgstr ""
+msgstr "Esse usuário foi tornado anônimo em todas as denúncias e atualizações."
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:637
 msgid "That user’s personal details have been removed."
-msgstr ""
+msgstr "Os detalhes pessoais deste usuário foram removidos."
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:602
 msgid "That user’s reports and updates have been hidden."
-msgstr ""
+msgstr "As denúncias e atualizações desse usuário foram escondidos."
 
 #: templates/web/base/admin/manifesttheme/form.html:20
-msgid "The <strong>background colour</strong> defines a placeholder background colour for the application splash screen before it has loaded.  Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</code></strong>."
+msgid ""
+"The <strong>background colour</strong> defines a placeholder background colour for the application splash screen before it has "
+"loaded.  Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</"
+"code></strong> or a named colour like <strong><code>fuchsia</code></strong>."
 msgstr ""
+"A <strong>cor de fundo</strong> define uma cor de fundo do espaço reservado para a tela de carregamento do aplicativo antes de ser "
+"carregada.  As cores devem ser especificadas com sintaxe CSS, por exemplo <strong><code>#ff00ff</code></strong>, ou "
+"<strong><code>rgb(255, 0, 255)</code></strong> uma cor nomeada como <strong><code>fuchsia</code></strong> ."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:14
-#: templates/web/base/admin/bodies/open311-form-fields.html:15
+#: templates/web/base/admin/bodies/open311-form-fields.html:14 templates/web/base/admin/bodies/open311-form-fields.html:15
 msgid ""
 "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n"
 "            when sending reports to this body."
 msgstr ""
+"O <strong>endereço</strong> é o caminho do serviço no qual o AjeitaMinhaRua vai se conectar\n"
+"            para enviar denúncias a este órgão."
 
 #: templates/web/base/admin/manifesttheme/form.html:49
-msgid "The <strong>icons</strong> are used when the application is installed to the user's home screen. Icons must be <strong>square</strong>, with <strong>512x512</strong>px and <strong>192x192</strong>px being the most common sizes."
+msgid ""
+"The <strong>icons</strong> are used when the application is installed to the user's home screen. Icons must be <strong>square</"
+"strong>, with <strong>512x512</strong>px and <strong>192x192</strong>px being the most common sizes."
 msgstr ""
+"Os <strong>ícones</strong> são usados quando a aplicação é instalada na tela inicial do usuário. Os ícones precisam ser "
+"<strong>quadrados</strong>, e medirem <strong>512x512</strong>px e <strong>192x192</strong>px."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:27
-#: templates/web/base/admin/bodies/open311-form-fields.html:28
+#: templates/web/base/admin/bodies/open311-form-fields.html:27 templates/web/base/admin/bodies/open311-form-fields.html:28
 msgid ""
 "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n"
 "          than one. If the body is running its own endpoint, you can usually leave this blank."
 msgstr ""
+"A <strong>jurisdição</strong> só é necessária se este caminho está servindo mais\n"
+"          de um. Se o órgão têm seu próprio caminho, você pode deixar isto em branco."
 
 #: templates/web/base/admin/manifesttheme/form.html:5
-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)."
+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 ""
+"O <strong>name</strong> é uma cadeia de caracteres que representa o nome da aplicação  web como é mostrada para o usuário (ex., numa "
+"lista de  aplicativos, ou como um rótulo para um ícone)."
 
-#: 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
+#: 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>."
 msgstr ""
+"O <strong>método de envio</strong> determina como os problemas denunciados serão enviados ao órgão.\n"
+"           Se você deixar este campo em branco, <strong>o método padrão de envio será email</strong>."
 
 #: templates/web/base/admin/manifesttheme/form.html:10
-msgid "The <strong>short name</strong> is a string that represents the name of the web application displayed to the user if there is not enough space to display name (e.g., as a label for an icon on the phone home screen)."
+msgid ""
+"The <strong>short name</strong> is a string that represents the name of the web application displayed to the user if there is not "
+"enough space to display name (e.g., as a label for an icon on the phone home screen)."
 msgstr ""
+"O <strong>nome curto</strong> é uma string que representa o nome do aplicativo web exibido ao usuário se não houver espaço suficiente "
+"para exibir o nome (por exemplo, como um nome para um ícone na tela inicial do telefone)."
 
 #: templates/web/base/admin/manifesttheme/form.html:15
-msgid "The <strong>theme colour</strong> defines the default theme colour for the application. This sometimes affects how the OS displays the site (e.g., on Android's task switcher, the theme colour surrounds the site). Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</code></strong>."
+msgid ""
+"The <strong>theme colour</strong> defines the default theme colour for the application. This sometimes affects how the OS displays "
+"the site (e.g., on Android's task switcher, the theme colour surrounds the site). Colours should be specified with CSS syntax, e.g. "
+"<strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</"
+"code></strong>."
 msgstr ""
+"A <strong>cor do tema</strong> define a cor do tema padrão para a aplicação. Isso às vezes afeta a forma como o SISTEMA OPERACIONAL "
+"exibe o site (por exemplo, no gerenciador de tarefas do Android, a cor do tema envolve o site). As cores devem ser especificadas com "
+"sintaxe CSS, por exemplo<strong><code>#ff00ff</code></strong> , ou <strong><code>rgb(255, 0, 255)</code></strong> uma cor nomeada "
+"como <strong><code>fuchsia</code></strong> ."
 
 #: templates/web/base/open311/index.html:82
-msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification."
+msgid ""
+"The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite "
+"the way the attribute is defined in the Open311 v2 specification."
 msgstr ""
+"O atributo Open311 v2 agency_responsible é usado para listar as administrações que receberam a denúncia do problema, que não é bem a "
+"maneira como o atributo é definido na especificação Open311 v2."
 
-#: templates/web/base/admin/bodies/form.html:17
-#: templates/web/base/admin/bodies/form.html:18
+#: templates/web/base/admin/bodies/form.html:17 templates/web/base/admin/bodies/form.html:18
 msgid ""
 "The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n"
 "          and may be displayed publically."
 msgstr ""
+"O <strong>nome</strong> do órgão identifica ele (por exemplo, <em>Secretaria Municipal de Segurança Pública de Juazeiro do Norte</"
+"em>)\n"
+"           e podem ser exibidos publicamente."
 
 #: templates/web/base/admin/extra-metadata-item.html:30
 msgid "The code used to store this field value in the database."
-msgstr ""
+msgstr "O código usado para armazenar o valor deste campo no banco de dados."
 
 #: templates/web/base/admin/bodies/contact-form.html:31
-#, fuzzy
 msgid "The contact has been confirmed as correct."
-msgstr "O problema foi marcado como enviado."
+msgstr "O contato foi confirmado como correto."
 
-#: templates/web/base/report/new/fill_in_details_text.html:2
-#: templates/web/base/report/new/fill_in_details_text.html:3
-msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
+#: templates/web/base/report/new/fill_in_details_text.html:2 templates/web/base/report/new/fill_in_details_text.html:3
+msgid ""
+"The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem "
+"(e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
 msgstr ""
+"O órgão não será capaz de ajudar a menos que você especifique o máximo de detalhes que puder. Por favor, descreva a localização exata "
+"do problema (ex.: em uma parede, perto do poste), o que é, quanto tempo está lá, uma descrição (e uma foto do problema se você tiver "
+"uma), etc."
 
-#: templates/web/base/admin/bodies/edit-league.html:3
-#: templates/web/base/admin/bodies/edit-league.html:4
+#: templates/web/base/admin/bodies/edit-league.html:3 templates/web/base/admin/bodies/edit-league.html:4
 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
-msgstr ""
+msgstr "A tabela da liga do prêmio de diligência mostra a atividade dos editores (quem tem editado a maioria dos registros)."
 
-#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45
-#: perllib/FixMyStreet/App/Controller/Reports.pm:58
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 perllib/FixMyStreet/App/Controller/Reports.pm:58
 msgid "The error was: %s"
 msgstr "O erro foi: %s"
 
 #: templates/web/base/open311/index.html:78
-msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
+msgid ""
+"The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, "
+"requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
+"Os seguintes atributos v2 Open311 são retornados em cada requisição:  service_request_id, description, lat, long, media_url, status, "
+"requested_datetime, updated_datetime, service_code and service_name."
 
 #: perllib/FixMyStreet/Geocode/OSM.pm:153
-msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
+msgid ""
+"The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close "
+"to a road without a name registered in OpenStreetMap."
 msgstr ""
+"As seguintes informações sobre a estrada mais próxima podem ser imprecisas ou irrelevantes, em caso do problema se encontrar perto de "
+"várias estradas ou perto de uma estrada sem um nome registrado no OpenStreetMap."
 
-#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27
-#: db/alert_types.pl:31
+#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27 db/alert_types.pl:31
 msgid "The latest local problems reported by users"
 msgstr "Os últimos problemas locais denunciados pelos usuários"
 
 #: db/alert_types.pl:35
 msgid "The latest problems for {{COUNCIL}} reported by users"
-msgstr ""
+msgstr "Os últimos problemas para {{COUNCIL}} denúnciado por usuários"
 
 #: db/alert_types.pl:39
 msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users"
-msgstr ""
+msgstr "Os últimos problemas denúnciado por usuários do {{COUNCIL}} no sinalizador {{WARD}}"
 
 #: db/alert_types.pl:11
 msgid "The latest problems reported by users"
-msgstr "Os últimos problemas denunciados pelos usuários."
+msgstr "Últimos problemas denunciados pelos usuários"
 
 #: db/alert_types.pl:15
 msgid "The latest problems reported fixed by users"
-msgstr ""
+msgstr "Os problemas solucionados mais recentes, denúnciados pelos usuários"
 
 #: db/alert_types.pl:43
 msgid "The latest problems within {{NAME}}'s boundary reported by users"
-msgstr ""
+msgstr "Os problemas mais recentes dentro do limite de {{NAME}} relatados pelos usuários"
 
 #: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9
 msgid "The link might have expired, or maybe you didn&rsquo;t quite copy and paste it correctly."
-msgstr ""
+msgstr "O link pode ter expirado, ou talvez você não tenha copiado e colado corretamente."
 
 #: templates/web/base/admin/bodies/form.html:66
 msgid "The list of available areas is being provided by the MapIt service at %s."
-msgstr ""
+msgstr "A lista de áreas disponíveis está sendo fornecida pelo serviço MapIt em %s."
 
-#: templates/web/base/auth/change_password.html:26
-#: templates/web/base/auth/change_password.html:30
+#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:30
 msgid "The passwords do not match"
-msgstr "As senhas não são iguais."
+msgstr "As senhas não são iguais"
 
 #: templates/web/base/errors/page_error_404_not_found.html:9
 msgid "The requested URL '%s' was not found on this server"
@@ -4654,75 +4258,76 @@ msgstr "O endereço '%s' não foi encontrado neste servidor"
 #: templates/web/base/admin/roles/form.html:5
 msgid "The role's <strong>name</strong> is used to refer to this group of permissions elsewhere in the admin."
 msgstr ""
+"O <strong>nome</strong> da função name é usado para se referir a este grupo de permissões, em qualquer lugar do painel administrativo."
 
 #: templates/web/base/admin/users/import.html:68
 msgid "The uploaded CSV file must contain a header row, and records can have the following fields:"
-msgstr ""
+msgstr "O arquivo CSV carregado deve conter uma linha de cabeçalho e os registros podem ter os seguintes campos:"
 
 #: 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 ""
+msgstr "O usuário não conseguiu localizar o problema no mapa, apenas a área ao redor  da localização que ele especificou"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:627
 msgid "The user has been sent a login email"
-msgstr ""
+msgstr "O usuário recebeu um e-mail de login"
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/form.html:13 templates/web/base/admin/users/form.html:14
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
 msgstr ""
+"O <strong>nome</strong> do usuário é mostrado publicamente em denúncias que não foram marcadass <em>anônimas</em>.\n"
+"                Nomes não são necessariamente únicos."
 
 #: templates/web/base/admin/manifesttheme/form.html:1
 msgid "Theme"
-msgstr ""
+msgstr "Tema"
 
 #: templates/web/base/admin/manifesttheme/index.html:10
 msgid "Theme Colour"
-msgstr ""
+msgstr "Cor do Tema"
 
 #: templates/web/base/admin/manifesttheme/index.html:1
 msgid "Themes"
-msgstr ""
+msgstr "Temas"
 
-#: templates/web/base/around/_on_map_empty.html:1
-#: templates/web/base/dashboard/heatmap-list.html:21
-#: templates/web/base/my/_problem-list.html:8
-#: templates/web/base/reports/_problem-list.html:13
+#: templates/web/base/around/_on_map_empty.html:1 templates/web/base/dashboard/heatmap-list.html:21
+#: templates/web/base/my/_problem-list.html:8 templates/web/base/reports/_problem-list.html:13
 msgid "There are no reports to show."
 msgstr "Não há denúncias para mostrar."
 
 #: templates/web/base/report/new/duplicate_suggestions.html:10
 msgid "There are similar problems nearby that we’re already aware of, is one of them yours?"
-msgstr ""
+msgstr "Existem problemas semelhantes nas proximidades, e já estamos cientes, algum deles é seu?"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:98
 msgid "There is already a template with that title."
-msgstr ""
+msgstr "Já existe um modelo com esse título."
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
 msgid "There is already an auto-response template for this category/state."
-msgstr ""
+msgstr "Já existe um modelo de resposta automática para esta categoria/estado."
 
 #: perllib/FixMyStreet/App/Controller/Reports.pm:55
 msgid "There was a problem showing the All Reports page. Please try again later."
 msgstr "Houve um problema ao tentar mostrar a página de Todos as Denúncias. Por favor tente novamente mais tarde."
 
-#: perllib/FixMyStreet/App/Controller/Contact.pm:170
-#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44
+#: perllib/FixMyStreet/App/Controller/Contact.pm:170 perllib/FixMyStreet/App/Controller/Dashboard.pm:44
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Houve um problema ao tentar mostrar esta página. Por favor tente novamente mais tarde."
 
-#: templates/web/base/auth/_username_error.html:0
-#: templates/web/base/auth/_username_error.html:14
+#: templates/web/base/auth/_username_error.html:0 templates/web/base/auth/_username_error.html:14
 msgid "There was a problem with your login information."
 msgstr "Houve um problema com sua informação de login."
 
-#: 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."
+#: 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 ""
+"Houve um problema com suas informações de login. Se você não se lembrar de sua senha ou não tiver uma, preencha a seção 'Não' do "
+"formulário."
 
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
 msgid "There was a problem with your update. Please try again."
@@ -4738,19 +4343,17 @@ msgstr "Houveram problemas com o sua atualização. Por favor veja abaixo."
 
 #: templates/web/base/admin/category-checkboxes.html:33
 msgid "These categories appear in more than one group:"
-msgstr ""
+msgstr "Essas categorias aparecem em mais de um grupo:"
 
-#: templates/web/base/report/form/private_details.html:13
-#: templates/web/base/report/new/councils_text_private.html:6
+#: templates/web/base/report/form/private_details.html:13 templates/web/base/report/new/councils_text_private.html:6
 msgid "These details will be sent to the council, but will never be shown online without your permission."
-msgstr "Estes detalhes serão enviados ao conselho, mas nunca serão mostrados online sem sua permissão."
+msgstr "Estes detalhes serão enviados ao órgão responsável, mas nunca serão mostrados online sem sua permissão."
 
 #: templates/web/base/report/new/councils_text_private.html:4
 msgid "These details will never be shown online without your permission."
 msgstr "Estes detalhes nunca serão mostrados online sem sua permissão."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:3
-#: templates/web/base/admin/bodies/open311-form-fields.html:4
+#: templates/web/base/admin/bodies/open311-form-fields.html:3 templates/web/base/admin/bodies/open311-form-fields.html:4
 msgid ""
 "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n"
 "           <strong>You don't need to set them if the Send Method is email.</strong>.\n"
@@ -4758,29 +4361,36 @@ msgid ""
 "           <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n"
 "           "
 msgstr ""
+"Essas configurações são para órgãos que usam o Open311 (ou outra integração back-end) para receber denúncias de problemas.<br>\n"
+"           <strong>Você não precisa defini-los se o Método de Envio é e-mail.</strong>. .\n"
+"           Para obter mais informações sobre o Open311, consulte \n"
+"           <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>este artigo</a>.\n"
+"            "
 
 #: templates/web/base/admin/users/import.html:43
 msgid "These users weren't updated."
 msgstr "Estes usuários não foram atualizados."
 
-#: templates/web/base/report/new/councils_text.html:4
-#: templates/web/base/report/new/councils_text.html:5
+#: templates/web/base/report/new/councils_text.html:4 templates/web/base/report/new/councils_text.html:5
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Estas informações serão publicadas online para que outros vejam, de acordo com nossa <a href=\"%s\">política de privacidade</a>."
+msgstr ""
+"Estas informações serão publicadas online para que outros vejam, de acordo com nossa <a href=\"%s\">política de privacidade</a>."
 
-#: templates/web/base/report/new/councils_text_all.html:6
-#: templates/web/base/report/new/councils_text_all.html:9
-msgid "These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Estas informações serão enviadas à <strong>%s</strong> e também serão publicadas online para que outros vejam, de acordo com nossa <a href=\"%s\">política de privacidade</a>."
+#: templates/web/base/report/new/councils_text_all.html:6 templates/web/base/report/new/councils_text_all.html:9
+msgid ""
+"These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href=\"%s\">privacy "
+"policy</a>."
+msgstr ""
+"Estas informações serão enviadas à <strong>%s</strong> e também serão publicadas online para que outros vejam, de acordo com nossa <a "
+"href=\"%s\">política de privacidade</a>."
 
-#: templates/web/base/report/new/councils_text_all.html:16
-#: templates/web/base/report/new/councils_text_all.html:6
+#: templates/web/base/report/new/councils_text_all.html:16 templates/web/base/report/new/councils_text_all.html:6
 msgid "These will be sent to <strong>%s</strong> but not published online."
-msgstr ""
+msgstr "Estas informações serão enviadas à <strong>%s</strong> mas não serão publicadas online."
 
 #: templates/web/base/open311/index.html:69
 msgid "This API implementation is work in progress and not yet stabilized.  It will change without warnings in the future."
-msgstr ""
+msgstr "A implementação da API está em andamento e ainda não se encontra estável. Mas logo disponibilizaremos para você."
 
 #: templates/web/base/admin/bodies/body.html:49
 msgid ""
@@ -4788,36 +4398,53 @@ msgid ""
 "            Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n"
 "            Currently, users <strong>cannot report problems to this body</strong>."
 msgstr ""
+"Este corpo Não cobre nenhuma área. Isto significa que problemas reportados <em>nesta localização</em> não possuem jurisdição.\n"
+"            Consequentemente, nenhuma destas categorias aparecerão no menu suspenso de categoria quando usuários denunciarem "
+"problemas.\n"
+"            Atualmente, usuários <strong>não podem denunciar problemas para este órgão</strong>."
 
 #: templates/web/base/admin/bodies/body.html:59
 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>."
-msgstr "Este orgão não possui informações de contato. Isto significa que os problemas denúnciados para este orgão <strong>não serão enviados</strong>."
+msgstr ""
+"Este órgão não possui informações de contato. Isto significa que os problemas denúnciados para este órgão <strong>não serão enviados</"
+"strong>."
 
-#: templates/web/base/admin/bodies/form.html:60
-#: templates/web/base/admin/bodies/form.html:61
+#: templates/web/base/admin/bodies/form.html:60 templates/web/base/admin/bodies/form.html:61
 msgid ""
 "This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n"
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
+"Este órgão somente receberá denúncias de problemas que estejam localizados na <strong>área de abrangência</strong>.\n"
+"           Um órgão não receberá nenhuma denúncia a menos que cubra pelo menos uma área."
 
 #: 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."
+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 ""
+"Este e-mail foi enviado aos dois órgãos que cobrem a localização do problema, pois o usuário não o categorizou; por favor ignore isto "
+"se você não for o órgão correto para lidar com o problema, ou diga-nos qual é a categoria do problema para que possamos adicioná-lo "
+"ao nosso sistema."
 
 #: 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 "Este email foi enviado para diversos conselhos que cobrem a área do problema, de acordo com a categoria selecionada e fornecida por todos eles; por favor ignore este email se você não é o conselho correto para lidar com este problema."
+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 ""
+"Este e-mail foi enviado para diversos orgãos que cobrem a área do problema, de acordo com a categoria selecionada e fornecida por "
+"todos eles; por favor ignore este email se você não é o órgão correto para lidar com este problema."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm: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 "Esta informação é necessária"
 
 #: templates/web/base/admin/templates/edit.html:21
 msgid "This is a <strong>private</strong> name for this template so you can identify it when updating reports or editing in the admin."
 msgstr ""
+"Este é um nome <strong>privado</strong> para este modelo, assim você poderá identificá-lo ao atualizar denúncias ou editar, dentro da "
+"administração."
 
 #: templates/web/base/admin/templates/edit.html:31
 msgid "This is the <strong>public</strong> text that will be shown on the site."
@@ -4826,7 +4453,7 @@ msgstr "Este é o texto <strong>público</strong> que será mostrado no site."
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:50
 msgid "This is the problem"
-msgstr ""
+msgstr "Este é o problema"
 
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
@@ -4847,15 +4474,13 @@ msgstr "Esse problema ainda está em andamento"
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:49
 msgid "This report"
-msgstr ""
+msgstr "Esta denúncia"
 
 #: templates/web/base/report/duplicate-no-updates.html:5
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr "Esta denúncia está duplicada. Por favor, deixe atualizações na denúncia original:"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
-#: templates/web/zurich/report/_main.html:14
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 perllib/FixMyStreet/Cobrand/Zurich.pm:143 templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Esta denúncia está aguardando moderação."
 
@@ -4871,27 +4496,21 @@ msgstr "Esta denúncia está atualmente marcada como resolvida."
 msgid "This report is currently marked as open."
 msgstr "Esta denúncia está atualmente marcada como aberta."
 
-#: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/_updates_disallowed_message.html:1 templates/web/base/report/display.html:58
 msgid "This report is now closed to updates."
 msgstr "Esta denúncia está fechada para atualizações."
 
 #: perllib/FixMyStreet/Queue/Item/Report.pm:108
 msgid "This web page also contains a photo of the problem, provided by the user."
-msgstr ""
+msgstr "Esta página da web também contém uma foto do problema, fornecida pelo usuário."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
-#: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
-#: templates/web/zurich/admin/reports/edit.html:94
+#: templates/web/zurich/admin/report_edit-sdm.html:106 templates/web/zurich/admin/report_edit-sdm.html:66
+#: templates/web/zurich/admin/reports/edit.html:132 templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Tempo gasto (em minutos):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
-#: templates/web/base/admin/timeline.html:1
-#: templates/web/base/admin/users/index.html:68
-#: templates/web/base/admin/users/log.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:679 perllib/FixMyStreet/Cobrand/KiitC.pm:315 templates/web/base/admin/timeline.html:1
+#: templates/web/base/admin/users/index.html:68 templates/web/base/admin/users/log.html:1
 msgid "Timeline"
 msgstr "Linha do tempo"
 
@@ -4899,16 +4518,12 @@ msgstr "Linha do tempo"
 msgid "Tips for perfect photos"
 msgstr "Dicas para fotos perfeitas"
 
-#: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:67
-#: templates/web/base/admin/reports/index.html:13
-#: templates/web/base/admin/templates/view.html:6
-#: templates/web/zurich/admin/templates/view.html:8
+#: templates/web/base/admin/flagged.html:15 templates/web/base/admin/index.html:67 templates/web/base/admin/reports/index.html:13
+#: templates/web/base/admin/templates/view.html:6 templates/web/zurich/admin/templates/view.html:8
 msgid "Title"
 msgstr "Título"
 
-#: templates/web/base/admin/templates/edit.html:25
-#: templates/web/zurich/admin/templates/edit.html:23
+#: templates/web/base/admin/templates/edit.html:25 templates/web/zurich/admin/templates/edit.html:23
 msgid "Title:"
 msgstr "Título:"
 
@@ -4922,80 +4537,68 @@ msgstr "Para encontrar quais alertas locais nós temos para você, por favor dig
 
 #: templates/web/base/admin/reportextrafields/edit.html:19
 msgid "To limit this collection of fields to a single cobrand, select it here."
-msgstr ""
+msgstr "Para limitar esta coleção de campos a uma única marca, selecione-a aqui."
 
 #: templates/web/base/admin/reportextrafields/edit.html:40
 msgid "To limit this collection of fields to a single language, select it here."
-msgstr ""
+msgstr "Para limitar esta coleção de campos a um único idioma, selecione aqui."
 
 #: templates/web/base/report/update-form-wrapper.html:4
-#, fuzzy
 msgid "To provide an update, please <a href=\"%s\">sign in</a>."
-msgstr "ou <a href=\"%s\">entrar</a>"
+msgstr "Para fornecer uma atualização, por favor <a href=\"%s\">entre</a>."
 
 #: perllib/FixMyStreet/Queue/Item/Report.pm:116
 msgid "To view a map of the precise location of this issue"
-msgstr ""
+msgstr "Para ver uma localização precisa deste problema no mapa"
 
-#: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
-#, fuzzy
+#: templates/web/base/auth/generate_token.html:11 templates/web/base/auth/generate_token.html:66
 msgid "Token"
-msgstr "Código de acesso:"
+msgstr "Código de acesso"
 
 #: templates/web/base/reports/index.html:126
 msgid "Top 5 most used categories"
-msgstr "Top 5 categorias mais utilizadas "
+msgstr "Top 5 categorias mais utilizadas"
 
 #: templates/web/base/reports/index.html:111
 msgid "Top 5 responsive councils"
-msgstr ""
+msgstr "Top 5 orgãos que mais respondem"
 
 #: templates/web/base/reports/index.html:98
 msgid "Top 5 wards"
-msgstr ""
+msgstr "Top 5 sinalizadores"
 
-#: templates/web/base/admin/stats/fix_rate.html:4
-#: templates/web/base/admin/stats/questionnaire.html:24
-#: templates/web/base/dashboard/index.html:120
-#: templates/web/base/dashboard/index.html:125
-#: templates/web/base/dashboard/index.html:149
+#: templates/web/base/admin/stats/fix_rate.html:4 templates/web/base/admin/stats/questionnaire.html:24
+#: templates/web/base/dashboard/index.html:120 templates/web/base/dashboard/index.html:125 templates/web/base/dashboard/index.html:149
 #: templates/web/zurich/admin/stats/index.html:51
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
+#: templates/web/base/report/_item.html:86 templates/web/base/report/inspect/extra_details.html:13
 msgid "Traffic management required?"
-msgstr ""
+msgstr "É necessário gerenciamento de tráfego?"
 
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
-msgstr ""
+msgstr "Tradução"
 
 #: templates/web/base/admin/bodies/_translations.html:2
 msgid "Translations"
-msgstr ""
+msgstr "Traduções"
 
 #. ("JS")
-#: templates/web/base/auth/2fa/form-add.html:8
-#: templates/web/base/auth/2fa/form.html:6
-#: templates/web/base/auth/smsform.html:17
+#: templates/web/base/auth/2fa/form-add.html:8 templates/web/base/auth/2fa/form.html:6 templates/web/base/auth/smsform.html:17
 #: templates/web/base/js/translation_strings.html:43
 msgid "Try again"
 msgstr "Tente novamente"
 
 #: templates/web/base/contact/submit.html:14
 msgid "Try emailing us directly:"
-msgstr "Experimente enviar um email direto para nós:"
+msgstr "Experimente enviar um e-mail direto para nós:"
 
-#: templates/web/base/auth/2fa/intro.html:2
-#: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
+#: templates/web/base/auth/2fa/intro.html:2 templates/web/base/auth/2fa/intro.html:6 templates/web/base/auth/generate_token.html:36
 #: templates/web/base/auth/generate_token.html:49
-#, fuzzy
 msgid "Two-factor authentication"
-msgstr "Ativar autenticação de duas etapas"
+msgstr "Autenticação de duas etapas"
 
 #: templates/web/base/auth/generate_token.html:29
 msgid "Two-factor authentication has been activated"
@@ -5005,8 +4608,7 @@ msgstr "A autenticação de duas etapas foi ativada"
 msgid "Two-factor authentication has been deactivated"
 msgstr "A autenticação de duas etapas foi desativada"
 
-#: templates/web/base/admin/states/index.html:10
-#: templates/web/base/admin/states/index.html:100
+#: templates/web/base/admin/states/index.html:10 templates/web/base/admin/states/index.html:100
 #: templates/web/base/admin/users/alerts.html:9
 msgid "Type"
 msgstr "Tipo"
@@ -5015,12 +4617,9 @@ msgstr "Tipo"
 msgid "Unban"
 msgstr "Desbanir"
 
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:64
-#: templates/web/base/admin/bodies/contact-form.html:25
-#: templates/web/base/admin/update_edit.html:30
-#: templates/web/zurich/admin/report_edit-sdm.html:54
-#: templates/web/zurich/admin/reports/edit.html:82
-#: templates/web/zurich/admin/update_edit.html:18
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 templates/web/base/admin/bodies/contact-form.html:25
+#: templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:54
+#: templates/web/zurich/admin/reports/edit.html:82 templates/web/zurich/admin/update_edit.html:18
 msgid "Unconfirmed"
 msgstr "Não confirmado"
 
@@ -5033,88 +4632,79 @@ msgid "Unknown alert type"
 msgstr "Tipo de alerta desconhecido"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Photo.pm:136
-#: perllib/FixMyStreet/App/Controller/Root.pm:147
+#: perllib/FixMyStreet/App/Controller/Photo.pm:136 perllib/FixMyStreet/App/Controller/Root.pm:147
 #: templates/web/base/js/translation_strings.html:57
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: perllib/FixMyStreet/App/Controller/Develop.pm:188
-#: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/Develop.pm:188 perllib/FixMyStreet/App/Controller/Develop.pm:207
+#: perllib/FixMyStreet/App/Controller/My.pm:229 perllib/FixMyStreet/App/Controller/Report.pm:141
+#: perllib/FixMyStreet/App/Controller/Report.pm:147 perllib/FixMyStreet/App/Controller/Report.pm:150
 msgid "Unknown problem ID"
-msgstr ""
+msgstr "ID de problema não encontrado"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:106
 msgid "Unknown update ID"
-msgstr ""
+msgstr "ID de atualização não encontrado"
 
 #: templates/web/base/reports/_list-filter-status.html:25
 msgid "Unshortlisted"
-msgstr ""
+msgstr "Desfavoritado"
 
 #: templates/web/base/report/_item.html:26
 msgid "Up one"
-msgstr ""
+msgstr "Subir um"
 
-#: templates/web/base/admin/states/index.html:76
-#: templates/web/base/admin/users/alerts.html:58
+#: templates/web/base/admin/states/index.html:76 templates/web/base/admin/users/alerts.html:58
 #: templates/web/base/report/update/form_update.html:31
 msgid "Update"
 msgstr "Atualização"
 
 #: templates/web/base/admin/users/log.html:51
-#, fuzzy
 msgid "Update %s created for problem %d"
-msgstr "Taxa de correção para categoria de problemas > 4 semanas "
+msgstr "Atualização %s criada para o problema %d"
 
 #: templates/web/base/admin/timeline.html:33
 msgid "Update %s created for problem %d; by %s"
-msgstr ""
+msgstr "Atualização %s criada para o problema %d; por %s"
 
 #: templates/web/base/contact/index.html:37
 msgid "Update below added anonymously at %s"
-msgstr ""
+msgstr "A atualização abaixo foi adicionada anonimamente as %s"
 
 #: templates/web/base/contact/index.html:39
 msgid "Update below added by %s at %s"
-msgstr ""
+msgstr "Atualização abaixo adicionada por %s as %s"
 
-#: templates/web/base/admin/bodies/form.html:139
-#: templates/web/zurich/admin/bodies/form.html:63
+#: templates/web/base/admin/bodies/form.html:139 templates/web/zurich/admin/bodies/form.html:63
 msgid "Update body"
-msgstr ""
+msgstr "Atualizar órgão"
 
 #: templates/web/base/admin/stats/state.html:21
 msgid "Update breakdown by state"
-msgstr ""
+msgstr "Atualizações separados por estado"
 
 #: db/alert_types.pl:7
 msgid "Update by {{name}}"
 msgstr "Atualizado por {{name}}"
 
-#: templates/web/base/admin/update_edit.html:46
-#: templates/web/zurich/admin/update_edit.html:25
+#: templates/web/base/admin/update_edit.html:46 templates/web/zurich/admin/update_edit.html:25
 msgid "Update changed problem state to %s"
-msgstr ""
+msgstr "Atualizar estado de problema modificado para %s"
 
 #: templates/web/base/admin/update_edit.html:48
 msgid "Update marked problem as fixed"
-msgstr ""
+msgstr "Atualizar problema marcado como resolvido"
 
 #: templates/web/base/admin/update_edit.html:50
 msgid "Update reopened problem"
-msgstr ""
+msgstr "Atualizar problema reaberto"
 
 #: templates/web/base/admin/bodies/body.html:130
 msgid "Update statuses"
-msgstr ""
+msgstr "Status de atualização"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-sdm.html:21
 #: templates/web/zurich/admin/reports/index.html:13
 msgid "Updated"
 msgstr "Atualizado"
@@ -5127,38 +4717,30 @@ msgstr "Atualizado por <strong>%s</strong> (%s) em %s"
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr "Atualizado por <strong>%s</strong> em %s"
 
-#: 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
+#: 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 "Atualizado!"
 
-#: templates/web/base/admin/list_updates.html:2
-#: templates/web/base/dashboard/index.html:109
-#: templates/web/base/report/update.html:4
+#: templates/web/base/admin/list_updates.html:2 templates/web/base/dashboard/index.html:109 templates/web/base/report/update.html:4
 #: templates/web/zurich/report/updates.html:2
 msgid "Updates"
 msgstr "Atualizados"
 
 #: perllib/FixMyStreet/DB/Result/Comment.pm:149
 msgid "Updates are limited to %s characters in length. Please shorten your update"
-msgstr ""
+msgstr "Atualizações são limitadas a %s caracteres. Por favor, seja mais breve"
 
 #: db/alert_types.pl:5 db/alert_types.pl:6
 msgid "Updates on {{title}}"
-msgstr ""
+msgstr "Atualizações em {{title}}"
 
 #. ("%s is the site name")
-#: templates/web/base/report/display.html:0
-#: templates/web/base/report/display.html:9
+#: templates/web/base/report/display.html:0 templates/web/base/report/display.html:9
 msgid "Updates to this problem, %s"
-msgstr ""
+msgstr "Atualizações para este problema, %s"
 
 #: templates/web/base/admin/users/import.html:64
 msgid "Usage notes"
@@ -5166,91 +4748,88 @@ msgstr "Notas de uso"
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:137
 msgid "Use Open311 problem fetching"
-msgstr ""
+msgstr "Use o buscador de problemas Open311"
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:76
 msgid "Use Open311 update-sending extension"
-msgstr ""
+msgstr "Use a extensão de envio de atualizações do Open311"
 
 #: templates/web/base/admin/bodies/contact-form.html:53
-msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
+msgid ""
+"Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like "
+"requesting an extra rubbish bin at a specific address."
 msgstr ""
+"Use isso para problemas que você deseja permitir que os usuários denunciem, mas para os quais não há interesse público em exibir a "
+"denúncia, como solicitar uma lixeira extra em um endereço específico."
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
-msgstr ""
+msgstr "ID do usuário para atribuir comentários buscados a"
 
 #: templates/web/base/admin/users/import.html:1
 msgid "User Import"
-msgstr ""
+msgstr "Importar Usuário"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:665
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:676
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:665 perllib/FixMyStreet/App/Controller/Admin/Users.pm:676
 msgid "User added to abuse list"
-msgstr ""
+msgstr "Usuário adicionado à lista de abuso"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153 perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
 msgid "User already exists"
 msgstr "Usuário já existe"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:661
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:661 perllib/FixMyStreet/App/Controller/Admin/Users.pm:672
 msgid "User already in abuse list"
-msgstr ""
+msgstr "Usuário já se encontra na lista de abuso"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:758
 msgid "User flag removed"
-msgstr ""
+msgstr "Marcação removida do usuário"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:728
 msgid "User flagged"
-msgstr ""
+msgstr "Usuário marcado"
 
-#: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/report_blocks.html:18 templates/web/base/admin/users/form.html:37
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr "Usuário na tabela de abuso"
 
 #: templates/web/base/admin/users/index.html:20
 msgid "User search finds matches in users' names and email addresses."
-msgstr ""
+msgstr "A pesquisa do usuário encontra resultados de nomes de usuários e endereços de e-mail."
 
 #: templates/web/base/admin/users/alerts.html:2
 msgid "User's alerts"
-msgstr ""
+msgstr "Alerta de usuários"
 
-#: templates/web/base/admin/reports/edit.html:142
-#: templates/web/base/admin/update_edit.html:36
+#: templates/web/base/admin/reports/edit.html:142 templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr "Usuário:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: perllib/FixMyStreet/Cobrand/Default.pm:713 perllib/FixMyStreet/Cobrand/Default.pm:770 perllib/FixMyStreet/Cobrand/KiitC.pm:204
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:336 perllib/FixMyStreet/Cobrand/Zurich.pm:425 templates/web/base/admin/flagged.html:29
+#: templates/web/base/admin/roles/index.html:25 templates/web/zurich/header.html:57
 msgid "Users"
 msgstr "Usuários"
 
 #: templates/web/base/admin/users/form.html:140
-msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
+msgid ""
+"Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable "
+"manual permission selection."
 msgstr ""
+"Os usuários podem ser atribuídos uma ou mais funções, para dar-lhes todas as permissões dessas funções. Selecionar uma função ou "
+"funções desativará a seleção de permissões manuais."
 
 #: templates/web/base/admin/users/form.html:156
 msgid "Users can perform the following actions within their assigned body or area."
-msgstr ""
+msgstr "Os usuários podem executar as seguintes ações dentro de seu órgão ou área designada."
 
 #: templates/web/base/admin/roles/form.html:14
 msgid "Users with this role can perform the following actions within their assigned body or area."
-msgstr ""
+msgstr "Usuários com esta função podem executar as seguintes ações dentro de seu orgão ou área designada."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
+#: 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 "Valores atualizados"
@@ -5259,56 +4838,49 @@ msgstr "Valores atualizados"
 msgid "Verify"
 msgstr "Verificar"
 
-#: templates/web/base/auth/change_email.html:2
-#: templates/web/base/auth/change_email.html:5
+#: templates/web/base/auth/change_email.html:2 templates/web/base/auth/change_email.html:5
 msgid "Verify email address"
-msgstr "Verificar endereço de email"
+msgstr "Verificar endereço de e-mail"
 
-#: templates/web/base/auth/change_phone.html:2
-#: templates/web/base/auth/change_phone.html:5
+#: templates/web/base/auth/change_phone.html:2 templates/web/base/auth/change_phone.html:5
 msgid "Verify phone number"
 msgstr "Verificar número de telefone"
 
-#: templates/web/base/admin/reports/edit.html:36
-#: templates/web/base/admin/update_edit.html:18
-#: templates/web/zurich/admin/report_edit-sdm.html:23
-#: templates/web/zurich/admin/reports/edit.html:24
+#: templates/web/base/admin/reports/edit.html:36 templates/web/base/admin/update_edit.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:23 templates/web/zurich/admin/reports/edit.html:24
 #: templates/web/zurich/admin/update_edit.html:10
 msgid "View report on site"
 msgstr "Ver denúncia no site"
 
 #: templates/web/base/reports/body.html:21
 msgid "View reports by ward"
-msgstr ""
+msgstr "Ver denúncias por sinalizadores"
 
 #: templates/web/base/reports/_ward-list.html:24
 msgid "View wards"
-msgstr ""
+msgstr "Ver sinalizadores"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:759
 msgid "View/Mark private reports"
-msgstr ""
+msgstr "Ver/Marcar denúncias privadas"
 
-#: templates/web/base/around/display_location.html:0
-#: templates/web/base/around/display_location.html:38
+#: templates/web/base/around/display_location.html:0 templates/web/base/around/display_location.html:38
 msgid "Viewing a location"
-msgstr ""
+msgstr "Vendo uma localização"
 
-#: templates/web/base/report/display.html:0
-#: templates/web/base/report/display.html:6
+#: templates/web/base/report/display.html:0 templates/web/base/report/display.html:6
 msgid "Viewing a problem"
-msgstr ""
+msgstr "Vendo um problema"
 
 #: templates/web/base/dashboard/index.html:29
 msgid "Ward:"
-msgstr ""
+msgstr "Sinalizador:"
 
 #: templates/web/base/reports/body.html:23
 msgid "Wards of this council"
-msgstr ""
+msgstr "Sinalizadores deste órgão"
 
-#: templates/web/base/alert/choose.html:7
-#: templates/web/base/around/_error_multiple.html:6
+#: templates/web/base/alert/choose.html:7 templates/web/base/around/_error_multiple.html:6
 msgid "We found more than one match for that location."
 msgstr "Encontramos mais de uma correspondência para esse local."
 
@@ -5320,33 +4892,34 @@ msgstr "Encontramos mais de uma correspondência para o problema em questão:"
 msgid "We have sent a confirmation code to your phone. Please enter it below:"
 msgstr "Enviamos um código de confirmação para seu telefone. Por favor digite-o abaixo:"
 
-#: templates/web/base/auth/general.html:13
-#: templates/web/base/report/display.html:35
+#: templates/web/base/auth/general.html:13 templates/web/base/report/display.html:35
 #: templates/web/base/report/new/oauth_email_form.html:5
 msgid "We need your email address, please give it below."
-msgstr "Nós precisamos do seu endereço de email, por favor, especifique-o abaixo"
+msgstr "Nós precisamos do seu endereço de e-mail, por favor, especifique-o abaixo."
 
 #: 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."
+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 ""
+"Percebemos que esse problema pode ser responsabilidade de %s; no entanto, atualmente não temos quaisquer detalhes de contato deles. "
+"Se você souber de um endereço de contato apropriado, por favor, entre em contato conosco."
 
 #: templates/web/base/index-steps.html:11
 msgid "We send it to the council on your behalf"
-msgstr ""
+msgstr "Enviamos ao órgão em seu nome"
 
-#: templates/web/base/alert/choose.html:13
-#: templates/web/base/around/_error_multiple.html:20
+#: templates/web/base/alert/choose.html:13 templates/web/base/around/_error_multiple.html:20
 msgid "We show up to ten matches, please try a different search if yours is not here."
-msgstr ""
+msgstr "Mostramos até dez resultados, tente uma pesquisa diferente se a sua não estiver aqui."
 
-#: templates/web/base/report/new/notes.html:4
-#: templates/web/zurich/report/new/notes.html:4
+#: templates/web/base/report/new/notes.html:4 templates/web/zurich/report/new/notes.html:4
 msgid "We will only use your personal information in accordance with our <a href=\"%s\">privacy policy.</a>"
-msgstr ""
+msgstr "Nós só usaremos sua informação pessoal de acordo com nossa <a href=\"%s\">política de privacidade.</a>"
 
 #: templates/web/base/questionnaire/completed-open.html:2
 msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
-msgstr ""
+msgstr "Sentimos muito em saber que o problema não está resolvido. Por que você não tenta representantes locais?"
 
 #: templates/web/base/dashboard/index.html:123
 msgid "Website"
@@ -5354,20 +4927,19 @@ msgstr "Website"
 
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
-msgstr ""
+msgstr "Iremos retornar o mais rápido possível."
 
 #: templates/web/base/report/new/duplicate_suggestions.html:12
 msgid "We’ve already reported these nearby problems to the council. Is one of them yours?"
-msgstr ""
+msgstr "Nós já denúnciamos estes problemas nocais para o órgão responsável. Algum deles é seu?"
 
-#: templates/web/base/admin/bodies/category.html:28
-#: templates/web/zurich/admin/bodies/body.html:18
+#: templates/web/base/admin/bodies/category.html:28 templates/web/zurich/admin/bodies/body.html:18
 msgid "When edited"
-msgstr ""
+msgstr "Editado"
 
 #: templates/web/base/admin/problem_row.html:35
 msgid "When sent"
-msgstr ""
+msgstr "Quando enviado"
 
 #: templates/web/base/alert/_list.html:9
 msgid "Which problems do you want alerts about?"
@@ -5375,23 +4947,31 @@ msgstr "Quais problemas você gostaria de receber alertas?"
 
 #: templates/web/base/report/_inspect.html:40
 msgid "Which report is it a duplicate of?"
-msgstr ""
+msgstr "Esta é uma duplicata de qual denúncia?"
 
 #: templates/web/base/tokens/confirm_alert.html:7
 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free."
-msgstr ""
+msgstr "Por que parar por aqui? <a href=\"/alert\">Adicione mais alertas</a> gratuitamente."
 
 #: templates/web/base/open311/index.html:84
-msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration.  The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
+msgid ""
+"With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single "
+"administration.  The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
 msgstr ""
+"Com as buscas de solicitação, é possível usar agency_responsible para limitar as solicitações enviados a uma única administração.  O "
+"termo de pesquisa é o ID de administração fornecido pela <a href=\"%s\">MaPit.</a>."
 
 #: templates/web/base/dashboard/index.html:164
 msgid "Within the specified timeframe:"
-msgstr ""
+msgstr "Dentro do tempo especificado:"
 
 #: templates/web/base/front/footer-marketing.html:3
-msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
+msgid ""
+"Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet."
+"org</a>."
 msgstr ""
+"Você gostaria de contribuir com o AjeitaMinhaRua? Nosso código é aberto e <a href=\"https://fixmystreet.org\">disponível em "
+"fixmystreet.org</a>."
 
 #: templates/web/base/questionnaire/index.html:103
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
@@ -5399,39 +4979,30 @@ msgstr "Você gostaria de receber outro questionário em 4 semanas, te lembrando
 
 #: templates/web/base/report/new/duplicate_suggestions.html:23
 msgid "Would you like us to notify you when this problem is updated or fixed?"
-msgstr ""
+msgstr "Você gostaria de ser notificado quando o problema for resolvido ou atualizado?"
 
 #: templates/web/base/report/new/notes.html:7
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Escrever toda sua mensagem em maiúsculas dificulta a leitura, assim como a falta de pontuação."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
-#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
-#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
-#: templates/web/base/admin/bodies/category.html:6
-#: templates/web/base/admin/bodies/index.html:70
-#: templates/web/base/admin/flagged.html:47
-#: templates/web/base/admin/list_updates.html:33
-#: templates/web/base/admin/list_updates.html:35
-#: templates/web/base/admin/list_updates.html:36
-#: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
-#: templates/web/base/admin/update_edit.html:25
-#: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
-#: templates/web/base/questionnaire/index.html:39
+#: perllib/FixMyStreet/Cobrand/Default.pm:1261 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
+#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122 templates/web/base/admin/bodies/category.html:6
+#: templates/web/base/admin/bodies/index.html:70 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:33
+#: templates/web/base/admin/list_updates.html:35 templates/web/base/admin/list_updates.html:36
+#: templates/web/base/admin/problem_row.html:20 templates/web/base/admin/reports/edit.html:101
+#: templates/web/base/admin/reports/edit.html:137 templates/web/base/admin/update_edit.html:25
+#: templates/web/base/admin/users/alerts.html:21 templates/web/base/admin/users/index.html:65
+#: templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:39
 msgid "Yes"
 msgstr "Sim"
 
 #: templates/web/base/contact/index.html:54
 msgid "You are complaining that this problem report was unnecessarily moderated:"
-msgstr ""
+msgstr "Você informou que esta denúncia foi moderada de forma desnecessária:"
 
 #: templates/web/base/admin/bodies/contact-form.html:26
 msgid "You are not sure of the origin or validity of the contact."
-msgstr ""
+msgstr "Você não tem certeza da origem ou validade do contato."
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:103
@@ -5446,23 +5017,23 @@ msgstr "Você está denunciando este problema por ser abusivo, conter informaç
 msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
 msgstr "Você está denunciando esta atualização por ser abusiva, conter informação pessoal, ou algo similar:"
 
-#: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/_updates_disallowed_message.html:2 templates/web/base/report/display.html:59
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr "Você pode <a href=\"%s\">criar uma nova denúncia na mesma localização</a>."
 
-#: templates/web/zurich/tokens/confirm_problem.html:6
-#: templates/web/zurich/tokens/confirm_problem.html:8
+#: templates/web/zurich/tokens/confirm_problem.html:6 templates/web/zurich/tokens/confirm_problem.html:8
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Você pode <a href=\"%s%s\">ver o problema no site</a>."
 
 #: templates/web/base/admin/users/form.html:112
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
+"Você pode adicionar o e-mail de um usuário abusivo à lista de abusos, que oculta automaticamente (e nunca envia) as denúncias criados "
+"por ele."
 
 #: templates/web/base/alert/_list.html:18
 msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination."
-msgstr ""
+msgstr "Você pode escolher se inscrever em todos os problemas denunciados dentro de uma área, ou denúncias baseadas em seu destino."
 
 #: templates/web/base/contact/index.html:131
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
@@ -5474,68 +5045,87 @@ msgid ""
 "          For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n"
 "          reports in the past."
 msgstr ""
+"Você pode marcar uma denúncia ou usuário editando eles, e eles aparecerão nesta página.\n"
+"          Isto pode ser útil, por exemplo, se você precisar ficar de olho em um usuário que tem postado\n"
+"          denúncias inapropriadas no passado."
 
-#: templates/web/base/report/new/top_message_none.html:13
-#: templates/web/base/report/new/top_message_none.html:14
-#: templates/web/base/report/new/top_message_some.html:10
-#: templates/web/base/report/new/top_message_some.html:11
-msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
+#: templates/web/base/report/new/top_message_none.html:13 templates/web/base/report/new/top_message_none.html:14
+#: templates/web/base/report/new/top_message_some.html:10 templates/web/base/report/new/top_message_some.html:11
+msgid ""
+"You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
 msgstr ""
+"Você pode nos ajudar encontrando um endereço de e-mail de problemas locais para %s e nos enviar este endereço através do <a "
+"href='mailto:%s'>%s</a>."
 
 #: templates/web/base/admin/bodies/form.html:92
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
-msgstr ""
+msgstr "Você pode marcar um órgão como deletado se você não deseja mais vê-lo como ativo no site."
 
 #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
 msgid "You cannot rename a category to an existing category"
-msgstr ""
+msgstr "Você não pode renomear uma categoria para uma com um nome já existente"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:54
 msgid "You declined; please fill in the box above"
-msgstr "Você recusou; por favor preencha a caixa acima"
+msgstr "Você recusou; por favor preencha o campo acima"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:105
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
-msgstr ""
+msgstr "Você tem um <a id=\"oFN\" href=\"\"><span>%s</span> salvo para ser enviado</a>."
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:39
-msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
+msgid ""
+"You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your "
+"problem</a>.\n"
 msgstr ""
+"Você já respondeu este questionário. Se você ainda tem dúvidas, por favor  <a href='%s'>entre em contato</a>, ou <a href='%s'>veja "
+"seu problema</a>.\n"
 
 #: templates/web/base/contact/enquiry/index.html:58
-#, fuzzy
-msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
-msgstr "Você já anexou fotos para esta denúncia. Note que você pode anexar no máximo 3 para esta denúncia (se você tentar anexar mais, a mais antiga será removida)."
-
-#: templates/web/base/report/new/form_report.html:50
-#: templates/web/zurich/report/new/fill_in_details_form.html:30
-msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
-msgstr "Você já anexou fotos para esta denúncia. Note que você pode anexar no máximo 3 para esta denúncia (se você tentar anexar mais, a mais antiga será removida)."
-
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
-msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
-msgstr " Você já anexou fotos para esta atualização. Note que você pode anexar no máximo 3 para esta atualização (se você tentar anexar mais, a mais antiga será removida). "
-
-#: templates/web/base/auth/sign_out.html:4
-#: templates/web/zurich/auth/sign_out.html:3
+msgid ""
+"You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, "
+"the oldest will be removed)."
+msgstr ""
+"Você já anexou arquivos para esta denúncia. Note que você pode anexar no máximo 3 para à esta denúncia (se você tentar anexar mais, a "
+"mais antiga será removida)."
+
+#: templates/web/base/report/new/form_report.html:50 templates/web/zurich/report/new/fill_in_details_form.html:30
+msgid ""
+"You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, "
+"the oldest will be removed)."
+msgstr ""
+"Você já anexou fotos para esta denúncia. Note que você pode anexar no máximo 3 para esta denúncia (se você tentar anexar mais, a mais "
+"antiga será removida)."
+
+#: templates/web/base/questionnaire/index.html:89 templates/web/base/report/update/form_update.html:16
+msgid ""
+"You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, "
+"the oldest will be removed)."
+msgstr ""
+"Você já anexou fotos para esta atualização. Note que você pode anexar no máximo 3 fotos à esta atualização (se você tentar anexar "
+"mais, a mais antiga será removida)."
+
+#: templates/web/base/auth/sign_out.html:4 templates/web/zurich/auth/sign_out.html:3
 msgid "You have been signed out"
 msgstr "Você saiu"
 
 #: templates/web/zurich/report/new/sidebar.html:7
-msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. "
+msgid ""
+"You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on "
+"the map again. "
 msgstr ""
+"Você encontrou o problema no ponto marcado com o pino verde no mapa.  Se esta não é a localização correta, basta clicar no mapa "
+"novamente. "
 
 #: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:143
 msgid "You have successfully added your phone number."
 msgstr "Você adicionou seu número de telefone com sucesso."
 
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:159
-#: templates/web/zurich/tokens/confirm_problem.html:6
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:159 templates/web/zurich/tokens/confirm_problem.html:6
 msgid "You have successfully confirmed your email address."
-msgstr "Você confirmou seu endereço de email com sucesso."
+msgstr "Você confirmou seu endereço de e-mail com sucesso."
 
 #: templates/web/base/auth/change_phone.html:15
 msgid "You have successfully confirmed your phone number."
@@ -5545,10 +5135,9 @@ msgstr "Você confirmou seu número de telefone com sucesso."
 msgid "You have successfully removed your phone number."
 msgstr "Você removeu seu número de telefone com sucesso."
 
-#: templates/web/base/report/display.html:25
-#: templates/web/base/report/new/login_success_form.html:3
+#: templates/web/base/report/display.html:25 templates/web/base/report/new/login_success_form.html:3
 msgid "You have successfully signed in; please check and confirm your details are accurate:"
-msgstr ""
+msgstr "Você efetuou login com sucesso; por favor, verifique e confirme se suas informações estão corretas:"
 
 #: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:165
 msgid "You have successfully verified your phone number."
@@ -5556,15 +5145,16 @@ msgstr "Você verificou seu número de telefone com sucesso."
 
 #: templates/web/base/my/my.html:83
 msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a problem now.</a>"
-msgstr ""
+msgstr "Você ainda não criou nenhuma denúncia. <a href=\"%s\">Denunciar um problema agora.</a>"
 
 #: templates/web/base/my/planned.html:21
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr ""
+msgstr "Você ainda não selecionou nenhuma denúncia."
 
 #: templates/web/base/admin/index.html:19
 msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent."
 msgstr ""
+"Você precisa <a href=\"%s\">adicionar algum órgão</a> (como uma secretaria ou departamento) antes de qualquer denúncia ser enviada."
 
 #: templates/web/base/admin/bodies/index.html:11
 msgid ""
@@ -5572,53 +5162,45 @@ msgid ""
 "    the categories of problems they can handle (such as potholes or streetlights) and the\n"
 "    contacts (such as an email address) to which reports are sent."
 msgstr ""
+"Você precisa adicionar órgãos (como secretarias ou departamentos) para poder adicionar\n"
+"    as categorias de problemas com os quais eles podem interagir (como buracos ou postes de rua) e os\n"
+"    contatos (como um endereço de e-mail) para os quais as denúncias são enviadas."
 
 #: templates/web/base/my/my.html:0 templates/web/base/my/my.html:5
 msgid "Your Reports"
 msgstr "Suas Denúncias"
 
-#: 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
+#: 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 "Sua conta"
 
 #: templates/web/base/auth/2fa/intro.html:18
-#, fuzzy
 msgid "Your account requires two-factor authentication to be set up."
-msgstr "Desativar autenticação de duas etapas"
+msgstr "Sua conta requer autenticação em duas etapas para ser criada."
 
-#: templates/web/base/alert/updates.html:30
-#: templates/web/base/auth/create.html:50
-#: templates/web/base/auth/general.html:56
-#: templates/web/base/contact/enquiry/index.html:18
-#: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
-#: templates/web/base/report/new/duplicate_suggestions.html:42
-#: templates/web/zurich/report/new/fill_in_details_form.html:53
+#: templates/web/base/alert/updates.html:30 templates/web/base/auth/create.html:50 templates/web/base/auth/general.html:56
+#: templates/web/base/contact/enquiry/index.html:18 templates/web/base/contact/index.html:91
+#: templates/web/base/report/display_tools.html:59 templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/new/duplicate_suggestions.html:42 templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
-msgstr "Seu email"
+msgstr "Seu e-mail"
 
 #: templates/web/base/auth/change_email.html:15
 msgid "Your email address"
-msgstr "Seu endereço de email"
+msgstr "Seu endereço de e-mail"
 
-#: templates/web/base/auth/create.html:48
-#: templates/web/base/auth/general.html:54
+#: templates/web/base/auth/create.html:48 templates/web/base/auth/general.html:54
 #: templates/web/base/report/form/user_loggedout_email.html:3
 msgid "Your email or mobile"
-msgstr "Seu email ou telefone"
+msgstr "Seu e-mail ou telefone"
 
 #: templates/web/base/report/updates-sidebar-notes.html:3
 msgid "Your information will only be used in accordance with our <a href=\"%s\">privacy policy</a>"
-msgstr ""
+msgstr "Suas informações serão usadas apenas de acordo com a nossa <a href=\"%s\">política de privacidade</a>"
 
-#: templates/web/base/contact/enquiry/index.html:12
-#: templates/web/base/contact/index.html:85
+#: templates/web/base/contact/enquiry/index.html:12 templates/web/base/contact/index.html:85
 msgid "Your name"
 msgstr "Seu nome"
 
@@ -5632,37 +5214,32 @@ msgstr "Seu nome foi ocultado de todas as suas denúncias e atualizações."
 
 #: perllib/FixMyStreet/App/Controller/My.pm:297
 msgid "Your name has been hidden."
-msgstr "Seu nome foi ocultado"
+msgstr "Seu nome foi ocultado."
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:95
 msgid "Your offline reports"
 msgstr "Suas denúncias offline"
 
-#: templates/web/base/auth/create.html:64
-#: templates/web/base/auth/general.html:90
+#: templates/web/base/auth/create.html:64 templates/web/base/auth/general.html:90
 #: templates/web/base/report/form/user_loggedout_password.html:13
 msgid "Your password"
 msgstr "Sua senha"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:171
-#: templates/web/base/auth/change_password.html:12
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:171 templates/web/base/auth/change_password.html:12
 msgid "Your password has been changed"
 msgstr "Sua senha foi alterada"
 
 #: templates/web/base/auth/create.html:34
 msgid "Your password has expired, please create a new one below. When you click the link in your email, your password will be updated."
-msgstr ""
+msgstr "Sua senha expirou, por favor, crie uma nova abaixo. Quando você clicar no link do seu e-mail, sua senha será atualizada."
 
-#: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
-#: templates/web/zurich/auth/general.html:56
+#: templates/web/base/auth/create.html:67 templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:59 templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
-msgstr "Sua senha deve ter %d ou mais caracteres. "
+msgstr "Sua senha deve ter %d ou mais caracteres."
 
-#: templates/web/base/auth/change_phone.html:19
-#: templates/web/base/contact/enquiry/index.html:25
+#: templates/web/base/auth/change_phone.html:19 templates/web/base/contact/enquiry/index.html:25
 #: templates/web/base/contact/index.html:98
 msgid "Your phone number"
 msgstr "Seu número de telefone"
@@ -5675,10 +5252,9 @@ msgstr "Sua denúncia"
 msgid "Your reports"
 msgstr "Suas denúncias"
 
-#: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
-#: templates/web/base/my/planned.html:5
+#: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18 templates/web/base/my/planned.html:5
 msgid "Your shortlist"
-msgstr ""
+msgstr "Sua lista de atalhos"
 
 #: templates/web/base/auth/generate_token.html:8
 msgid "Your token has been generated"
@@ -5691,7 +5267,7 @@ msgstr "Sua atualização"
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:96
 msgid "Your update has been saved offline for submission when back online."
-msgstr ""
+msgstr "Sua atualização foi salva offline para envio quando você estiver online novamente."
 
 #: templates/web/base/my/my.html:103
 msgid "Your updates"
@@ -5701,79 +5277,72 @@ msgstr "Suas atualizações"
 msgid "Your verification code is %s"
 msgstr "Seu código de verificação é %s"
 
-#: templates/web/base/report/new/form_user_loggedin.html:20
-#: templates/web/base/report/update/form_user_loggedin.html:14
+#: templates/web/base/report/new/form_user_loggedin.html:20 templates/web/base/report/update/form_user_loggedin.html:14
 msgid "Yourself"
 msgstr "Você mesmo"
 
 #: templates/web/base/admin/users/import.html:72
 msgid "a colon-separated list of permissions to grant that user, e.g. <code>contribute_as_body:moderate:user_edit</code>."
 msgstr ""
+"uma lista de permissões separadas por dois pontos para conceder a esse usuário, por exemplo <code>contribut_as_body:moderate:"
+"user_edit</code>."
 
 #: templates/web/base/admin/users/import.html:73
 msgid "a colon-separated list of roles to assign to that user."
-msgstr ""
+msgstr "uma lista de funções separada por dois pontos para atribuir a esse usuário."
 
 #: templates/web/base/report/inspect/information.html:10
 msgid "admin"
 msgstr "administrador"
 
-#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
-#: templates/web/base/admin/category-checkboxes.html:5
+#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18 templates/web/base/admin/category-checkboxes.html:5
 #: templates/web/base/admin/users/form.html:167
 msgid "all"
 msgstr "tudo"
 
-#: 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
+#: 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 "um administrador"
 
 #: perllib/FixMyStreet/DB/Result/Comment.pm:261
 msgid "and a defect raised"
-msgstr ""
+msgstr "e um defeito gerado"
 
 #: templates/web/base/admin/timeline.html:4
 msgid "by %s"
-msgstr "por %s "
+msgstr "por %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:13 templates/web/base/reports/body.html:14
 msgid "council"
-msgstr "conselho"
+msgstr "órgão"
 
 #: templates/web/base/admin/reports/edit.html:53
 msgid "didn't use map"
-msgstr ""
+msgstr "não usou o mapa"
 
-#: templates/web/base/alert/index.html:12
-#: templates/web/base/around/_postcode_form_examples.html:1
+#: templates/web/base/alert/index.html:12 templates/web/base/around/_postcode_form_examples.html:1
 msgid "e.g. ‘%s’ or ‘%s’"
 msgstr "por exemplo  ‘%s’ or ‘%s’"
 
 #: templates/web/base/report/new/form_title.html:2
 msgid "e.g. ‘10 inch pothole on Example St, near post box’"
-msgstr ""
+msgstr "por exemplo: ‘Buraco de 10 centímetros nao Rua Manoel Vitorino, próximo ao telefone público’"
 
 #: templates/web/base/report/new/form_report.html:70
 msgid "e.g. ‘This pothole has been here for two months and…’"
-msgstr ""
+msgstr "por exemplo: ‘Este buraco está aqui há dois meses e ...’"
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:93
-#: templates/web/base/admin/flagged.html:51
+#: templates/web/base/admin/bodies/open311-form-fields.html:93 templates/web/base/admin/flagged.html:51
 msgid "edit user"
 msgstr "editar usuário"
 
-#: templates/web/base/status/stats.html:20
-#: templates/web/zurich/admin/index.html:5
+#: templates/web/base/status/stats.html:20 templates/web/zurich/admin/index.html:5
 msgid "from %s different users"
 msgstr "de %s usuários diferentes"
 
-#: templates/web/base/report/_item_small.html:22
-#: templates/web/zurich/report/_item.html:16
+#: templates/web/base/report/_item_small.html:22 templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
 msgstr "última atualização %s"
 
@@ -5781,31 +5350,25 @@ msgstr "última atualização %s"
 msgid "less than a minute"
 msgstr "menos de um minuto"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Stats.pm:54
-#: templates/web/base/admin/stats/questionnaire.html:15
+#: 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 "n/d"
 
-#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
-#: templates/web/base/admin/category-checkboxes.html:6
+#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19 templates/web/base/admin/category-checkboxes.html:6
 #: templates/web/base/admin/users/form.html:168
 msgid "none"
 msgstr "nada"
 
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:80
 msgid "not the council's responsibility"
-msgstr "não é responsabilidade do conselho"
+msgstr "não é responsabilidade do órgão"
 
-#: templates/web/base/contact/enquiry/index.html:26
-#: templates/web/base/contact/index.html:99
-#, fuzzy
+#: templates/web/base/contact/enquiry/index.html:26 templates/web/base/contact/index.html:99
 msgid "optional"
 msgstr "(opcional)"
 
-#: templates/web/base/report/form/user.html:31
-#: templates/web/base/report/form/user.html:41
-#, fuzzy
+#: templates/web/base/report/form/user.html:31 templates/web/base/report/form/user.html:41
 msgid "or"
 msgstr "ou"
 
@@ -5817,20 +5380,14 @@ msgstr "ou <a href=\"%s\">criar uma conta</a>"
 msgid "or <a href=\"%s\">sign in</a>"
 msgstr "ou <a href=\"%s\">entrar</a>"
 
-#: templates/web/base/alert/index.html:18
-#: templates/web/base/around/postcode_form.html:36
-#, fuzzy
+#: templates/web/base/alert/index.html:18 templates/web/base/around/postcode_form.html:36
 msgid "or use my location"
-msgstr "esta localização"
+msgstr "ou usar minha localização"
 
-#: templates/web/base/admin/reports/edit.html:50
-#: templates/web/base/admin/reports/edit.html:51
-#: templates/web/zurich/admin/report_edit-sdm.html:33
-#: templates/web/zurich/admin/report_edit-sdm.html:34
-#: templates/web/zurich/admin/reports/edit.html:35
-#: templates/web/zurich/admin/reports/edit.html:36
-#: templates/web/zurich/admin/reports/edit.html:51
-#: templates/web/zurich/admin/reports/edit.html:52
+#: templates/web/base/admin/reports/edit.html:50 templates/web/base/admin/reports/edit.html:51
+#: templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit-sdm.html:34
+#: templates/web/zurich/admin/reports/edit.html:35 templates/web/zurich/admin/reports/edit.html:36
+#: templates/web/zurich/admin/reports/edit.html:51 templates/web/zurich/admin/reports/edit.html:52
 msgid "originally entered: &ldquo;%s&rdquo;"
 msgstr "originalmente inseriu: &ldquo;%s&rdquo;"
 
@@ -5848,14 +5405,15 @@ msgstr "sair"
 
 #: templates/web/base/admin/users/import.html:71
 msgid "the database id of the body to associate that user with, e.g. <code>2217</code> for Buckinghamshire."
-msgstr "o ID do banco de dados do corpo para associar esse usuário, por exemplo, <code>2217</code> para Buckinghamshire"
+msgstr ""
+"o ID do banco de dados , referente ao corpo a ser associado a esse usuário, por exemplo, <code>2217</code> para Prefeitura Municipal "
+"do seu município."
 
 #: templates/web/base/report/new/form_public_councils_text.html:6
 msgid "the local council"
-msgstr "o conselho local"
+msgstr "o órgão local"
 
-#: templates/web/base/report/_report_meta_info.html:5
-#: templates/web/zurich/report/_main.html:7
+#: templates/web/base/report/_report_meta_info.html:5 templates/web/zurich/report/_main.html:7
 msgid "there is no pin shown as the user did not use the map"
 msgstr "não tem marcador mostrado como o usuário não usou o mapa"
 
@@ -5887,7 +5445,7 @@ msgstr "mapa usado"
 
 #: templates/web/base/admin/update_edit.html:39
 msgid "user is from same council as problem - %d"
-msgstr "usuário é do mesmo conselho que o problema - %d"
+msgstr "usuário é do mesmo órgão que o problema - %d"
 
 #: templates/web/base/admin/update_edit.html:42
 msgid "user is problem owner"
@@ -5901,10 +5459,9 @@ msgstr "usuário fora da lista de abuso"
 msgid "user removed from abuse list"
 msgstr "usuário removido da lista de abuso"
 
-#: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:0 templates/web/base/reports/body.html:10
 msgid "ward"
-msgstr ""
+msgstr "sinalizador"
 
 #: templates/web/base/admin/bodies/index.html:56
 #, perl-format
@@ -6036,21 +5593,21 @@ msgstr[1] "Denunciado %d dias atrás"
 #, perl-format
 msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
-msgstr[0] "Ainda <strong>não</strong> temos detalhes para o outro conselho que cobre este local."
+msgstr[0] "Ainda <strong>não</strong> temos detalhes de outro órgão que cobre este local."
 msgstr[1] "Ainda <strong>não</strong> temos detalhes para os outros conselhos que cobrem este local."
 
 #: templates/web/base/report/new/top_message_none.html:3
 #, perl-format
 msgid "We do not yet have details for the council that covers this location."
 msgid_plural "We do not yet have details for the councils that cover this location."
-msgstr[0] "Ainda não temos detalhes para o conselho que cobre este local."
+msgstr[0] "Ainda não temos detalhes para o órgão que cobre este local."
 msgstr[1] "Ainda não temos detalhes para os conselhos que cobrem este local."
 
 #: templates/web/base/report/_item_small.html:20
 #, perl-format
 msgid "last updated %d day ago"
 msgid_plural "last updated %d days ago"
-msgstr[0] "atualizado pela última vez %d dia atrás"
+msgstr[0] "atualizado pela última vez a %d dia atrás"
 msgstr[1] "atualizado pela última vez %d dias atŕas"
 
 #: templates/email/fixamingata/inactive-account.txt:8
-- 
cgit v1.2.3


From afc51a21f03bf7356f9db9f79248c8be8bc36d2e Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 15 Sep 2020 17:09:15 +0100
Subject: [TfL] Category rename.

---
 perllib/FixMyStreet/Cobrand/TfL.pm | 2 +-
 web/cobrands/tfl/assets.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm
index 31c7e4fe8..6bc516366 100644
--- a/perllib/FixMyStreet/Cobrand/TfL.pm
+++ b/perllib/FixMyStreet/Cobrand/TfL.pm
@@ -491,7 +491,7 @@ sub _tlrn_categories { [
     "Single Light out (street light)",
     "Standing water",
     "Street Light - Equipment damaged, pole leaning",
-    "Streetspace Suggestions and Feedback",
+    "Streetspace Feedback",
     "Unstable hoardings",
     "Unstable scaffolding",
     "Worn out road markings",
diff --git a/web/cobrands/tfl/assets.js b/web/cobrands/tfl/assets.js
index 9eb197da8..ae7ba2ae5 100644
--- a/web/cobrands/tfl/assets.js
+++ b/web/cobrands/tfl/assets.js
@@ -72,7 +72,7 @@ var tlrn_categories = [
     "Single Light out (street light)",
     "Standing water",
     "Street Light - Equipment damaged, pole leaning",
-    "Streetspace Suggestions and Feedback",
+    "Streetspace Feedback",
     "Unstable hoardings",
     "Unstable scaffolding",
     "Worn out road markings"
-- 
cgit v1.2.3


From 2eb0d9b6ef151662dcd0a48f0fdf0023de6e672e Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Tue, 15 Sep 2020 17:29:23 +0100
Subject: [Docs] Add instructions for automatic export of dashboard CSV

---
 docs/_includes/admin-tasks-content.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index 13ee4aa51..d0d5e4935 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -863,6 +863,23 @@ Android device or via an iOS device).
 These statistics can be downloaded as a CSV document, suitable for use in a spreadsheet program
 such as Excel or your own reporting tools.
 
+#### Importing dashboard data automatically
+
+You may wish to automatically import data from the dashboard into your system on a regular basis.
+Once you set your chosen criteria on the dashboard page, make a note of the URL of the "Reports"
+or "Updates" link in the "Export as CSV" section.
+Then you should generate an access token by visiting your account page and then "Security" and
+generating a token from there.
+
+You can then specify that token either by appending it to the URL as an `access_token` parameter,
+or including it as an `Authorization: Bearer <token>` HTTP header in the request from your system.
+
+The `export` must be present in the URL, and controls how the CSV is generated.
+Reports can take some time to generate, so there are two different values for the parameter:
+
+ - `export=1`: the response will wait until the file is ready and then provide it
+ - `export=2` (the default): you will immediately get a 202 HTTP response with a redirect to the location where the file will be once it has finished processing. This is more robust.
+
 #### Heatmap
 
 Also accessible from the admin stats page is our heatmap. This can provide an
-- 
cgit v1.2.3


From 2ad199d308e3f3a7d42db3f3c8ab3d36d324922c Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 18 Sep 2020 13:15:37 +0100
Subject: [Northamptonshire] add message about upgrade to front page

Covers switch from Alloy V1 to V2
---
 templates/web/northamptonshire/front/pre-steps.html | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 templates/web/northamptonshire/front/pre-steps.html

diff --git a/templates/web/northamptonshire/front/pre-steps.html b/templates/web/northamptonshire/front/pre-steps.html
new file mode 100644
index 000000000..24d91db87
--- /dev/null
+++ b/templates/web/northamptonshire/front/pre-steps.html
@@ -0,0 +1,3 @@
+<p style="margin: -1em -1em 1em; padding: 1em; background-color: #2C8500; color: #fff;">
+Essential upgrade being undertaken this weekend.  Reports may take longer to arrive with the Council but please continue to log any issues.
+</p>
-- 
cgit v1.2.3


From 49d40355336df1b390a979bfb125d6fca6bcd1c3 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 18 Sep 2020 13:04:11 +0100
Subject: [Northamptonshire] turn off assets

Temporary measure while Alloy is down for upgrade
---
 .cypress/cypress/integration/northamptonshire.js    | 3 +++
 templates/web/fixmystreet.com/footer_extra_js.html  | 1 -
 templates/web/northamptonshire/footer_extra_js.html | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.cypress/cypress/integration/northamptonshire.js b/.cypress/cypress/integration/northamptonshire.js
index 76ce8ff44..1c021ae35 100644
--- a/.cypress/cypress/integration/northamptonshire.js
+++ b/.cypress/cypress/integration/northamptonshire.js
@@ -4,6 +4,7 @@ it('loads the right front page', function() {
 });
 
 it('prevents clicking unless asset selected', function() {
+  this.skip();
   cy.server();
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
@@ -26,6 +27,7 @@ it('prevents clicking unless asset selected', function() {
 });
 
 it('selecting an asset allows a report', function() {
+  this.skip();
   cy.server();
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
@@ -48,6 +50,7 @@ it('selecting an asset allows a report', function() {
 });
 
 it('detects multiple assets at same location', function() {
+  this.skip();
   cy.server();
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
diff --git a/templates/web/fixmystreet.com/footer_extra_js.html b/templates/web/fixmystreet.com/footer_extra_js.html
index 2a4f9ed9c..3e5151546 100644
--- a/templates/web/fixmystreet.com/footer_extra_js.html
+++ b/templates/web/fixmystreet.com/footer_extra_js.html
@@ -14,7 +14,6 @@ IF bodyclass.match('mappage');
     scripts.push( version('/cobrands/eastsussex/assets.js') );
     scripts.push( version('/cobrands/isleofwight/assets.js') );
     scripts.push( version('/cobrands/lincolnshire/assets.js') );
-    scripts.push( version('/cobrands/northamptonshire/assets.js') );
     scripts.push( version('/cobrands/hounslow/assets.js') );
     scripts.push( version('/cobrands/oxfordshire/assets.js') );
     scripts.push( version('/cobrands/westminster/assets.js') );
diff --git a/templates/web/northamptonshire/footer_extra_js.html b/templates/web/northamptonshire/footer_extra_js.html
index 523f441cf..4f076de2d 100644
--- a/templates/web/northamptonshire/footer_extra_js.html
+++ b/templates/web/northamptonshire/footer_extra_js.html
@@ -4,4 +4,4 @@ IF bodyclass.match('mappage');
     version('/cobrands/fixmystreet-uk-councils/alloy.js'),
   );
 END %]
-[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 roadworks=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 validation=1 roadworks=1 %]
-- 
cgit v1.2.3


From c321b919c06cafd432fe4aa3fd6792d8a702312f Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 7 Nov 2019 12:19:26 +0000
Subject: [Northamptonshire] update assets to use AlloyV2

update the defaults etc to use the alloy V2 code, along with updating
the layer ids etc.
---
 web/cobrands/northamptonshire/assets.js | 307 ++++++--------------------------
 1 file changed, 58 insertions(+), 249 deletions(-)

diff --git a/web/cobrands/northamptonshire/assets.js b/web/cobrands/northamptonshire/assets.js
index 377e1091c..5d96a9aa3 100644
--- a/web/cobrands/northamptonshire/assets.js
+++ b/web/cobrands/northamptonshire/assets.js
@@ -7,223 +7,45 @@ if (!fixmystreet.maps) {
 var is_live = !fixmystreet.staging;
 
 var layers = [
-  /*
+/*
 {
-  "layer_name": "Street Lights",
-  "layer": 5,
-  "version": "5.4-9.6-"
-},
-{
-  "layer_name": "Street Lighting Nightscape",
-  "layer": 9,
-  "version": "9.6-"
-},
-{
-  "layer_name": "Carriageways",
-  "layer": 20,
-  "version": "20.54-"
-},
-{
-  "layer_name": "Road Heirarchy",
-  "layer": 39,
-  "version": "39.53-"
-},
-{
-  "layer_name": "Posts",
-  "layer": 59,
-  "version": "59.133-"
-},
-{
-  "layer_name": "Grips",
-  "layer": 61,
-  "version": "61.1-"
-},
-{
-  "layer_name": "Traffic Monitoring",
-  "layer": 62,
-  "version": "62.2-"
-},
-{
-  "layer_name": "Special Treatment",
-  "layer": 64,
-  "version": "64.1-"
-},
-{
-  "layer_name": "Gully",
-  "layer": 66,
-  "version": "66.9-"
-},
-{
-  "layer_name": "Channel",
-  "layer": 68,
-  "version": "68.2-"
-},
-{
-  "layer_name": "Comms Cabinet",
-  "layer": 69,
-  "version": "69.1-"
-},
-{
-  "layer_name": "Steps",
-  "layer": 70,
-  "version": "70.1-"
-},
-{
-  "layer_name": "Step Handrail",
-  "layer": 71,
-  "version": "71.1-"
-},
-{
-  "layer_name": "Tree Group",
-  "layer": 74,
-  "version": "74.1-"
-},
-{
-  "layer_name": "Defects Ancillary Items",
-  "layer": 171,
-  "version": "171.33-"
-},
-{
-  "layer_name": "Speed Limit",
-  "layer": 172,
-  "version": "172.33-"
-},
-{
-  "layer_name": "PRoW Network",
-  "layer": 173,
-  "version": "173.1-"
-},
-{
-  "layer_name": "Footway Schemes",
-  "layer": 174,
-  "version": "174.1-"
-},
-{
-  "layer_name": "FINGER POST",
-  "layer": 178,
-  "version": "178.39-"
-},
-{
-  "layer_name": "GAPS",
-  "layer": 179,
-  "version": "179.1-"
-},
-{
-  "layer_name": "OBSTRUCTIONS",
-  "layer": 182,
-  "version": "182.2-"
-},
-{
-  "layer_name": "STEPS",
-  "layer": 184,
-  "version": "184.2-"
-},
-{
-  "layer_name": "Gate Types",
-  "layer": 191,
-  "version": "191.2-"
-},
-{
-  "layer_name": "Gate Condition",
-  "layer": 192,
-  "version": "192.2-"
-},
-{
-  "layer_name": "Bridge Type",
-  "layer": 193,
-  "version": "193.17-"
-},
-{
-  "layer_name": "Bridge Condition",
-  "layer": 194,
-  "version": "194.17-"
-},
-{
-  "layer_name": "PRoW Net By Type",
-  "layer": 201,
-  "version": "201.1-"
-},
-{
-  "layer_name": "Finger Post Condition",
-  "layer": 209,
-  "version": "209.39-"
-},
-{
-  "layer_name": "F Post Path Type",
-  "layer": 210,
-  "version": "210.39-"
-},
-{
-  "layer_name": "AW_Sewer",
-  "layer": 215,
-  "version": "215.1-"
-},
-{
-  "layer_name": "CCTV",
-  "layer": 218,
-  "version": "218.1-"
-},
-{
-  "layer_name": "VMS",
-  "layer": 219,
-  "version": "219.1-"
-},
-{
-  "layer_name": "Warning Signs",
-  "layer": 220,
-  "version": "220.1-"
-},
-{
-  "layer_name": "Traffic Calming",
-  "layer": 221,
-  "version": "221.1-"
-},
-{
-  "layer_name": "Bluetooth Counter",
-  "layer": 222,
-  "version": "222.1-"
-},
+  "name": "Posts",
+  "id": "5d480a68fe2ad809d85a78cf"
+}
 {
-  "layer_name": "Midblock",
-  "layer": 223,
-  "version": "223.1-"
-},
+  "name": "Grips",
+  "id": "5d480aeefe2ad8059ce44c75"
+}
 {
-  "layer_name": "Over Height",
-  "layer": 224,
-  "version": "224.1-"
-},
+  "name": "Special Treatment",
+  "id": "5d480b39fe2ad809d85a78ec"
+}
 {
-  "layer_name": "RTI Display",
-  "layer": 226,
-  "version": "226.1-"
-},
+  "name": "Channel",
+  "id": "5d480b66fe2ad809d85a78f0"
+}
 {
-  "layer_name": "System Links",
-  "layer": 227,
-  "version": "227.1-"
-},
+  "name": "Comms Cabinet",
+  "id": "5d480c01fe2ad8059ce44cd4"
+}
 {
-  "layer_name": "CULVERTS (PRoW)",
-  "layer": 229,
-  "version": "229.1-"
-},
+  "name": "Steps",
+  "id": "5d480c3bfe2ad8059ce44cda"
+}
 {
-  "layer_name": "PEDESTRIAN GUARDRAIL",
-  "layer": 230,
-  "version": "230.1-"
-},
+  "name": "Steps Handrail",
+  "id": "5d4812adfe2ad809d85a7a6e"
+}
 {
-  "layer_name": "Traffic Signal Controller",
-  "layer": 231,
-  "version": "231.1-"
-},
+  "name": "Tree Group",
+  "id": "5d481333fe2ad809d85a7a78"
+}
 {
-  "layer_name": "Traffic Signal Posts",
-  "layer": 232,
-  "version": "232.1-"
-},
-  */
+  "name": "Traffic Calming",
+  "id": "5d481403fe2ad8059ce44efd"
+}
+
+*/
 {
   "categories": [
         "Loose / Raised/Sunken",
@@ -234,66 +56,58 @@ var layers = [
   ],
   "item_name": "drain",
   "layer_name": "Gully",
-  "layer": 66,
-  "version": "66.80-",
+  "styleid": '5d480b8ffe2ad809d85a78ff',
   "max_resolution": 0.5971642833948135
 },
 {
   "categories": [ "Grit Bin - damaged/replacement", "Grit Bin - empty/refill" ],
   "item_name": "grit bin",
   "layer_name": "Grit Bins",
-  "layer": 13,
-  "version": "13.7-"
+  "styleid": '5d480942fe2ad809d85a78ad',
 },
 {
   "categories": [ "Highway Bridges - Damaged/Unsafe" ],
   "asset_type": 'area',
   "item_name": 'bridge',
   "layer_name": "Structures",
-  "layer": 14,
-  "version": "14.7-"
+  "styleid": '5d4809fffe2ad8059ce44bbe',
 },
 {
   "categories": [ "Damaged / Missing / Facing Wrong Way", "Obscured by vegetation or Dirty" ],
   "item_name": "sign",
   "layer_name": "Signs",
-  "layer": is_live ? 60 : 303,
-  "version": is_live ? "60.2172-" : "303.1-"
+  "styleid": '5d480a8ffe2ad809d85a78d3',
 },
 {
   "categories": [ "Shelter Damaged", "Sign/Pole Damaged" ],
   "layer_name": "Bus Stop",
-  "layer": 72,
-  "version": "72.14-"
+  "styleid": '5d4812dffe2ad809d85a7a72',
 },
 {
   "categories": [ "Bridge-Damaged/ Missing" ],
   "item_name": "bridge or right of way",
   "layer_name": "BRIDGES",
-  "layer": 177,
-  "version": "177.40-"
+  "styleid": "5d48161ffe2ad809d85a7add"
 },
 {
   "categories": [ "Gate - Damaged/ Missing" ],
   "item_name": "gate or right of way",
   "layer_name": "GATE",
-  "layer": 181,
-  "version": "181.14-"
+  "styleid": "5d481906fe2ad8059ce450b4",
 },
 {
   "categories": [ "Stile-Damaged/Missing" ],
   "item_name": "stile or right of way",
   "layer_name": "STILE",
-  "layer": 185,
-  "version": "185.10-"
+  "styleid": "5d481a05fe2ad8059ce45121",
 },
 {
   "categories": [ "Sign/Waymarking - Damaged/Missing" ],
   "item_name": "waymarking or right of way",
   "layer_name": "WAYMARK POST",
-  "layer": 187,
-  "version": "187.10-"
+  "styleid": "5d481a4ffe2ad809d85a7b90"
 },
+/*
 {
   "categories": [
     "Damaged/Exposed Wiring / Vandalised",
@@ -309,7 +123,6 @@ var layers = [
   "item_name": "signal or crossing",
   "layer_name": "Midblock",
   "layer": 223,
-  "version": "223.2-"
 },
 {
   "categories": [
@@ -326,8 +139,8 @@ var layers = [
   "item_name": "signal or crossing",
   "layer_name": "TL Junction",
   "layer": 225,
-  "version": "225.5-"
 },
+*/
 {
   "categories": [
       "Fallen Tree",
@@ -335,15 +148,12 @@ var layers = [
       "Restricted Visibility"
   ],
   "layer_name": "Tree",
-  "layer": 307,
-  "version": "307.7-",
-  "snap_threshold": 0,
+  "styleid": '5d481376fe2ad8059ce44ef2',
 },
 {
   "categories": [ "Safety Bollard - Damaged/Missing" ],
   "layer_name": "Safety Bollard",
-  "layer": 233,
-  "version": "233.28-"
+  "styleid": "5d481446fe2ad8059ce44f02",
 },
 ];
 
@@ -385,11 +195,11 @@ OpenLayers.Layer.NCCVectorNearest = OpenLayers.Class(OpenLayers.Layer.VectorNear
 // default options for northants assets include
 // a) checking for multiple assets in same location
 // b) preventing submission unless an asset is selected
-var northants_defaults = $.extend(true, {}, fixmystreet.alloy_defaults, {
+var northants_defaults = $.extend(true, {}, fixmystreet.assets.alloyv2_defaults, {
   class: OpenLayers.Layer.NCCVectorAsset,
-  protocol_class: OpenLayers.Protocol.Alloy,
+  protocol_class: OpenLayers.Protocol.AlloyV2,
   http_options: {
-      environment: is_live ? 26 : 28
+      layerid: is_live ? 26 : 'layers_highwayAssetsCustom_5d4806b0fe2ad809d85a774f'
   },
   non_interactive: false,
   body: "Northamptonshire County Council",
@@ -443,11 +253,10 @@ fixmystreet.alloy_add_layers(northants_defaults, layers);
 
 // NCC roads layers which prevent report submission unless we have selected
 // an asset.
-var northants_road_defaults = $.extend(true, {}, fixmystreet.alloy_defaults, {
-    class: OpenLayers.Layer.NCCVectorNearest,
-    protocol_class: OpenLayers.Protocol.Alloy,
+var northants_road_defaults = $.extend(true, {}, fixmystreet.assets.alloyv2_defaults, {
+    protocol_class: OpenLayers.Protocol.AlloyV2,
     http_options: {
-        environment: is_live ? 26 : 28
+        layerid: is_live ? 26 : 'layers_highwayAssetsCustom_5d4806b0fe2ad809d85a774f'
     },
     body: "Northamptonshire County Council",
     road: true,
@@ -469,8 +278,8 @@ var northants_road_defaults = $.extend(true, {}, fixmystreet.alloy_defaults, {
 
 fixmystreet.assets.add(northants_road_defaults, {
     http_options: {
-      layerid: 221,
-      layerVersion: '221.4-',
+      // Traffic Calming
+      styleid: "5d481403fe2ad8059ce44efd",
     },
     no_asset_msg_id: '#js-not-an-asset',
     asset_item: 'speed hump',
@@ -488,9 +297,9 @@ var barrier_style = new OpenLayers.Style({
 });
 
 fixmystreet.assets.add(northants_road_defaults, {
+    // Pedestrian Guardrail
     http_options: {
-      layerid: is_live ? 1068 : 230,
-      layerVersion: is_live ? '1068.1-' : '230.4-',
+      styleid: "5d4813c1fe2ad8059ce44ef6",
     },
     stylemap: new OpenLayers.StyleMap({
         'default': barrier_style
@@ -511,10 +320,10 @@ var highways_style = new OpenLayers.Style({
 });
 
 fixmystreet.assets.add(northants_road_defaults, {
-    protocol_class: OpenLayers.Protocol.Alloy,
+    protocol_class: OpenLayers.Protocol.AlloyV2,
+    // Carriageways
     http_options: {
-      layerid: 20,
-      layerVersion: '20.249-',
+      styleid: "5d480710fe2ad8059ce44a1d",
     },
     stylemap: new OpenLayers.StyleMap({
         'default': highways_style
@@ -605,8 +414,8 @@ prow_style.addRules([rule_footpath, rule_boat, rule_bridleway]);
 
 fixmystreet.assets.add(northants_road_defaults, {
     http_options: {
-      layerid: is_live ? 1110 : 310,
-      layerVersion: is_live ? '1110.1-' : '310.1-',
+      // PRoW Network
+      styleid: "5d4815ebfe2ad809d85a7ac9"
     },
     stylemap: new OpenLayers.StyleMap({
         'default': prow_style
-- 
cgit v1.2.3


From c8e76112038ded4f03cc9a8caea4dbb8a91982a6 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 28 Nov 2019 18:05:26 +0000
Subject: [Northamptonshire] update cypress tests for alloy v2

---
 .cypress/cypress/fixtures/bus_stops.json         |  7 +++----
 .cypress/cypress/integration/northamptonshire.js | 14 +++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.cypress/cypress/fixtures/bus_stops.json b/.cypress/cypress/fixtures/bus_stops.json
index f3808c912..dbfb44e68 100644
--- a/.cypress/cypress/fixtures/bus_stops.json
+++ b/.cypress/cypress/fixtures/bus_stops.json
@@ -1,14 +1,13 @@
 {
-  "type": "FeatureCollection",
-  "features": [
+  "results": [
     {
       "type": "Feature",
       "id": "307.9404949",
       "geometry": {
         "type": "Point",
         "coordinates": [
-          -99073,
-          6843328
+            -0.889992,
+            52.238301
         ]
       },
       "properties": {
diff --git a/.cypress/cypress/integration/northamptonshire.js b/.cypress/cypress/integration/northamptonshire.js
index 1c021ae35..8cd11d40e 100644
--- a/.cypress/cypress/integration/northamptonshire.js
+++ b/.cypress/cypress/integration/northamptonshire.js
@@ -8,8 +8,8 @@ it('prevents clicking unless asset selected', function() {
   cy.server();
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
-  cy.route('**/render-layer/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
-  cy.route('**/16301/10787**', 'fixture:bus_stops.json').as('bus_stops-layer');
+  cy.route('**/northants.assets/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
+  cy.route('**/65206/43150/**', 'fixture:bus_stops.json').as('bus_stops-layer');
   cy.route('/report/new/ajax*').as('report-ajax');
   cy.visit('http://northamptonshire.localhost:3001/');
   cy.get('[name=pc]').type('NN1 1NS');
@@ -31,8 +31,8 @@ it('selecting an asset allows a report', function() {
   cy.server();
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
-  cy.route('**/render-layer/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
-  cy.route('**/16301/10787**', 'fixture:bus_stops.json').as('bus_stops-layer');
+  cy.route('**/northants.assets/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
+  cy.route('**/65206/43150/**', 'fixture:bus_stops.json').as('bus_stops-layer');
   cy.route('/report/new/ajax*').as('report-ajax');
   cy.visit('http://northamptonshire.localhost:3001/');
   cy.get('[name=pc]').type('NN1 2NS');
@@ -54,9 +54,9 @@ it('detects multiple assets at same location', function() {
   cy.server();
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
-  cy.route('**/render-layer/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
-  cy.route('**/16301/10787**', 'fixture:bus_stops.json').as('bus_stops-layer');
-  cy.route('**/16301/10788**', 'fixture:bus_stops.json').as('bus_stops-layer2');
+  cy.route('**/northants.assets/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
+  cy.route('**/65206/43150/**', 'fixture:bus_stops.json').as('bus_stops-layer');
+  cy.route('**/65206/43151/**', 'fixture:bus_stops.json').as('bus_stops-layer2');
   cy.route('/report/new/ajax*').as('report-ajax');
   cy.visit('http://northamptonshire.localhost:3001/');
   cy.get('[name=pc]').type('NN1 2NS');
-- 
cgit v1.2.3


From 20f7e0da39cb057efea6c3774c0f7d5436ff709c Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 16 Jul 2020 16:46:35 +0100
Subject: [AlloyV2] update asset fetching code

change resolution and zoom level for asset layers
---
 .cypress/cypress/fixtures/bus_stops_none.json    |  3 +--
 .cypress/cypress/integration/northamptonshire.js |  8 ++++----
 web/cobrands/fixmystreet-uk-councils/alloy.js    | 11 +++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.cypress/cypress/fixtures/bus_stops_none.json b/.cypress/cypress/fixtures/bus_stops_none.json
index 3102a72dd..749921de7 100644
--- a/.cypress/cypress/fixtures/bus_stops_none.json
+++ b/.cypress/cypress/fixtures/bus_stops_none.json
@@ -1,6 +1,5 @@
 {
-  "type": "FeatureCollection",
-  "features": [
+  "results": [
   ],
   "crs": {
     "properties": {
diff --git a/.cypress/cypress/integration/northamptonshire.js b/.cypress/cypress/integration/northamptonshire.js
index 8cd11d40e..453557b99 100644
--- a/.cypress/cypress/integration/northamptonshire.js
+++ b/.cypress/cypress/integration/northamptonshire.js
@@ -9,7 +9,7 @@ it('prevents clicking unless asset selected', function() {
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
   cy.route('**/northants.assets/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
-  cy.route('**/65206/43150/**', 'fixture:bus_stops.json').as('bus_stops-layer');
+  cy.route('**/32602/21575/**', 'fixture:bus_stops.json').as('bus_stops-layer');
   cy.route('/report/new/ajax*').as('report-ajax');
   cy.visit('http://northamptonshire.localhost:3001/');
   cy.get('[name=pc]').type('NN1 1NS');
@@ -32,7 +32,7 @@ it('selecting an asset allows a report', function() {
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
   cy.route('**/northants.assets/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
-  cy.route('**/65206/43150/**', 'fixture:bus_stops.json').as('bus_stops-layer');
+  cy.route('**/32602/21575/**', 'fixture:bus_stops.json').as('bus_stops-layer');
   cy.route('/report/new/ajax*').as('report-ajax');
   cy.visit('http://northamptonshire.localhost:3001/');
   cy.get('[name=pc]').type('NN1 2NS');
@@ -55,8 +55,8 @@ it('detects multiple assets at same location', function() {
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
   cy.route('**/northants.assets/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
-  cy.route('**/65206/43150/**', 'fixture:bus_stops.json').as('bus_stops-layer');
-  cy.route('**/65206/43151/**', 'fixture:bus_stops.json').as('bus_stops-layer2');
+  cy.route('**/32602/21575/**', 'fixture:bus_stops.json').as('bus_stops-layer');
+  cy.route('**/32602/21576/**', 'fixture:bus_stops.json').as('bus_stops-layer2');
   cy.route('/report/new/ajax*').as('report-ajax');
   cy.visit('http://northamptonshire.localhost:3001/');
   cy.get('[name=pc]').type('NN1 2NS');
diff --git a/web/cobrands/fixmystreet-uk-councils/alloy.js b/web/cobrands/fixmystreet-uk-councils/alloy.js
index 88d0b017f..a06c197fe 100644
--- a/web/cobrands/fixmystreet-uk-councils/alloy.js
+++ b/web/cobrands/fixmystreet-uk-councils/alloy.js
@@ -4,6 +4,7 @@ OpenLayers.Protocol.Alloy = OpenLayers.Class(OpenLayers.Protocol.HTTP, {
     currentRequests: [],
 
     tileSize: 512,
+    resolution: 2.388657133579254,
     abort: function() {
         if (this.currentRequests.length) {
             for (var j = 0; j < this.currentRequests.length; j++) {
@@ -56,14 +57,11 @@ OpenLayers.Protocol.Alloy = OpenLayers.Class(OpenLayers.Protocol.HTTP, {
 
     getTileCoord: function(bounds, maxExtent, map, reverse) {
         var origin = new OpenLayers.LonLat(maxExtent.left, maxExtent.top);
-        // hard code this number as we want to avoid fetching asset groups
-        // which happens at more zoomed out levels
-        var resolution = 2.388657133579254;
 
         var adjustX = reverse ? 0.5 : 0;
         var adjustY = reverse ? 0 : 0.5;
-        var xFromOrigin = Math.floor((bounds[0] - origin.lon) / resolution + adjustX);
-        var yFromOrigin = Math.floor((bounds[1] - origin.lat) / resolution + adjustY);
+        var xFromOrigin = Math.floor((bounds[0] - origin.lon) / this.resolution + adjustX);
+        var yFromOrigin = Math.floor((bounds[1] - origin.lat) / this.resolution + adjustY);
         var tileCoordX = Math.floor(xFromOrigin / this.tileSize);
         var tileCoordY = Math.floor(yFromOrigin / this.tileSize) * -1;
 
@@ -169,8 +167,9 @@ OpenLayers.Format.AlloyV2 = OpenLayers.Class(OpenLayers.Format.GeoJSON, {
 
 OpenLayers.Protocol.AlloyV2 = OpenLayers.Class(OpenLayers.Protocol.Alloy, {
     tileSize: 128,
+    resolution: 4.777314267158508,
     getURL: function(coords, options) {
-        return OpenLayers.String.format(options.base, {'layerid': options.layerid, 'styleid': options.styleid, 'z': 17, 'x': coords[0], 'y': coords[1]});
+        return OpenLayers.String.format(options.base, {'layerid': options.layerid, 'styleid': options.styleid, 'z': 16, 'x': coords[0], 'y': coords[1]});
     }
 });
 
-- 
cgit v1.2.3


From 53b9535d0151af3e4c1b50e17b3a5304873a2a23 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 16 Jul 2020 16:47:32 +0100
Subject: [Northants] update defaults and URL

Some of this has changed/moved in the base class so update accordingly
---
 web/cobrands/northamptonshire/assets.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/web/cobrands/northamptonshire/assets.js b/web/cobrands/northamptonshire/assets.js
index 5d96a9aa3..b5d557049 100644
--- a/web/cobrands/northamptonshire/assets.js
+++ b/web/cobrands/northamptonshire/assets.js
@@ -4,7 +4,11 @@ if (!fixmystreet.maps) {
     return;
 }
 
-var is_live = !fixmystreet.staging;
+var base_url = fixmystreet.staging ?
+      "https://tilma.staging.mysociety.org/resource-proxy/proxy.php?https://northants.assets/${layerid}/${x}/${y}/${z}/cluster" :
+      "https://tilma.mysociety.org/resource-proxy/proxy.php?https://northants.assets/${layerid}/${x}/${y}/${z}/cluster";
+
+var url_with_style = base_url + '?styleIds=${styleid}';
 
 var layers = [
 /*
@@ -157,6 +161,8 @@ var layers = [
 },
 ];
 
+var highway_layer = 'layers_highwayAssetsCustom_5d4806b0fe2ad809d85a774f';
+
 // This is required so that the found/not found actions are fired on category
 // select and pin move rather than just on asset select/not select.
 OpenLayers.Layer.NCCVectorAsset = OpenLayers.Class(OpenLayers.Layer.VectorAsset, {
@@ -195,11 +201,12 @@ OpenLayers.Layer.NCCVectorNearest = OpenLayers.Class(OpenLayers.Layer.VectorNear
 // default options for northants assets include
 // a) checking for multiple assets in same location
 // b) preventing submission unless an asset is selected
-var northants_defaults = $.extend(true, {}, fixmystreet.assets.alloyv2_defaults, {
+var northants_defaults = $.extend(true, {}, fixmystreet.alloyv2_defaults, {
   class: OpenLayers.Layer.NCCVectorAsset,
   protocol_class: OpenLayers.Protocol.AlloyV2,
   http_options: {
-      layerid: is_live ? 26 : 'layers_highwayAssetsCustom_5d4806b0fe2ad809d85a774f'
+      base: url_with_style,
+      layerid: highway_layer
   },
   non_interactive: false,
   body: "Northamptonshire County Council",
@@ -253,10 +260,11 @@ fixmystreet.alloy_add_layers(northants_defaults, layers);
 
 // NCC roads layers which prevent report submission unless we have selected
 // an asset.
-var northants_road_defaults = $.extend(true, {}, fixmystreet.assets.alloyv2_defaults, {
+var northants_road_defaults = $.extend(true, {}, fixmystreet.alloyv2_defaults, {
     protocol_class: OpenLayers.Protocol.AlloyV2,
     http_options: {
-        layerid: is_live ? 26 : 'layers_highwayAssetsCustom_5d4806b0fe2ad809d85a774f'
+        base: url_with_style,
+        layerid: highway_layer
     },
     body: "Northamptonshire County Council",
     road: true,
@@ -415,7 +423,8 @@ prow_style.addRules([rule_footpath, rule_boat, rule_bridleway]);
 fixmystreet.assets.add(northants_road_defaults, {
     http_options: {
       // PRoW Network
-      styleid: "5d4815ebfe2ad809d85a7ac9"
+      base: base_url,
+      layerid: 'layers_pRoWType_5d483b2ffe2ad809d85a8d9a'
     },
     stylemap: new OpenLayers.StyleMap({
         'default': prow_style
-- 
cgit v1.2.3


From e76efec747d695ec88af26864a5a3a66ebb93ee2 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 23 Jul 2020 12:17:17 +0100
Subject: [Northamptonshire] distinguish PRoW assets by type

Use the styleid to identify PRoW types and colour them differently in V2
layers
---
 web/cobrands/northamptonshire/assets.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/cobrands/northamptonshire/assets.js b/web/cobrands/northamptonshire/assets.js
index b5d557049..6bfb73bea 100644
--- a/web/cobrands/northamptonshire/assets.js
+++ b/web/cobrands/northamptonshire/assets.js
@@ -367,20 +367,20 @@ fixmystreet.assets.add(northants_road_defaults, {
 function ncc_match_prow_type(f, styleId) {
     return f &&
            f.attributes &&
-           f.attributes.layerStyleId &&
-           f.attributes.layerStyleId == styleId;
+           f.attributes.styleId &&
+           f.attributes.styleId == styleId;
 }
 
 function ncc_prow_is_fp(f) {
-    return ncc_match_prow_type(f, is_live ? 6190 : 1454);
+    return ncc_match_prow_type(f, '5d483b84fe2ad809d85a8dab' );
 }
 
 function ncc_prow_is_bw(f) {
-    return ncc_match_prow_type(f, is_live ? 6192 : 1453);
+    return ncc_match_prow_type(f, '5d483b84fe2ad809d85a8dac');
 }
 
 function ncc_prow_is_boat(f) {
-    return ncc_match_prow_type(f, is_live ? 6193: 1455);
+    return ncc_match_prow_type(f, '5d483b84fe2ad809d85a8dad');
 }
 
 var rule_footpath = new OpenLayers.Rule({
-- 
cgit v1.2.3


From 2a78b728a2573d3494289c5967788472bc46c574 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 7 Aug 2020 11:12:26 +0100
Subject: [Northamptonshire] add in V2 PRoW and Traffic Light assets

---
 web/cobrands/northamptonshire/assets.js | 142 ++++++++++++--------------------
 1 file changed, 54 insertions(+), 88 deletions(-)

diff --git a/web/cobrands/northamptonshire/assets.js b/web/cobrands/northamptonshire/assets.js
index 6bfb73bea..24f67eb64 100644
--- a/web/cobrands/northamptonshire/assets.js
+++ b/web/cobrands/northamptonshire/assets.js
@@ -11,45 +11,6 @@ var base_url = fixmystreet.staging ?
 var url_with_style = base_url + '?styleIds=${styleid}';
 
 var layers = [
-/*
-{
-  "name": "Posts",
-  "id": "5d480a68fe2ad809d85a78cf"
-}
-{
-  "name": "Grips",
-  "id": "5d480aeefe2ad8059ce44c75"
-}
-{
-  "name": "Special Treatment",
-  "id": "5d480b39fe2ad809d85a78ec"
-}
-{
-  "name": "Channel",
-  "id": "5d480b66fe2ad809d85a78f0"
-}
-{
-  "name": "Comms Cabinet",
-  "id": "5d480c01fe2ad8059ce44cd4"
-}
-{
-  "name": "Steps",
-  "id": "5d480c3bfe2ad8059ce44cda"
-}
-{
-  "name": "Steps Handrail",
-  "id": "5d4812adfe2ad809d85a7a6e"
-}
-{
-  "name": "Tree Group",
-  "id": "5d481333fe2ad809d85a7a78"
-}
-{
-  "name": "Traffic Calming",
-  "id": "5d481403fe2ad8059ce44efd"
-}
-
-*/
 {
   "categories": [
         "Loose / Raised/Sunken",
@@ -87,6 +48,23 @@ var layers = [
   "layer_name": "Bus Stop",
   "styleid": '5d4812dffe2ad809d85a7a72',
 },
+{
+  "categories": [
+      "Fallen Tree",
+      "Restricted Visibility / Overgrown / Overhanging",
+      "Restricted Visibility"
+  ],
+  "layer_name": "Tree",
+  "styleid": '5d481376fe2ad8059ce44ef2',
+},
+{
+  "categories": [ "Safety Bollard - Damaged/Missing" ],
+  "layer_name": "Safety Bollard",
+  "styleid": "5d481446fe2ad8059ce44f02",
+},
+];
+
+var prow_assets = [
 {
   "categories": [ "Bridge-Damaged/ Missing" ],
   "item_name": "bridge or right of way",
@@ -109,59 +87,13 @@ var layers = [
   "categories": [ "Sign/Waymarking - Damaged/Missing" ],
   "item_name": "waymarking or right of way",
   "layer_name": "WAYMARK POST",
-  "styleid": "5d481a4ffe2ad809d85a7b90"
-},
-/*
-{
-  "categories": [
-    "Damaged/Exposed Wiring / Vandalised",
-    "Lamp/Bulb Failure",
-    "Signal Failure",
-    "Signal Failure all out",
-    "Signal Stuck",
-    "Signal Head Failure",
-    "Request Timing Review",
-    "Damaged Control box",
-    "Signal Failure/Damaged - Toucan/Pelican"
-  ],
-  "item_name": "signal or crossing",
-  "layer_name": "Midblock",
-  "layer": 223,
-},
-{
-  "categories": [
-    "Damaged/Exposed Wiring / Vandalised",
-    "Lamp/Bulb Failure",
-    "Signal Failure",
-    "Signal Failure all out",
-    "Signal Stuck",
-    "Signal Head Failure",
-    "Request Timing Review",
-    "Damaged Control box",
-    "Signal Failure/Damaged - Toucan/Pelican"
-  ],
-  "item_name": "signal or crossing",
-  "layer_name": "TL Junction",
-  "layer": 225,
-},
-*/
-{
-  "categories": [
-      "Fallen Tree",
-      "Restricted Visibility / Overgrown / Overhanging",
-      "Restricted Visibility"
-  ],
-  "layer_name": "Tree",
-  "styleid": '5d481376fe2ad8059ce44ef2',
-},
-{
-  "categories": [ "Safety Bollard - Damaged/Missing" ],
-  "layer_name": "Safety Bollard",
-  "styleid": "5d481446fe2ad8059ce44f02",
+  "styleid": "5d481a4ffe2ad809d85a7b90&styleIds=5d481742fe2ad809d85a7b05"
 },
 ];
 
 var highway_layer = 'layers_highwayAssetsCustom_5d4806b0fe2ad809d85a774f';
+var prow_asset_layer = 'layers_pRoWAssets_5d48157cfe2ad809d85a7abc';
+var signal_asset_layer = 'layers_nETCOM_5d483dd7fe2ad809d85a8fab';
 
 // This is required so that the found/not found actions are fired on category
 // select and pin move rather than just on asset select/not select.
@@ -258,6 +190,40 @@ var northants_defaults = $.extend(true, {}, fixmystreet.alloyv2_defaults, {
 
 fixmystreet.alloy_add_layers(northants_defaults, layers);
 
+var prow_defaults = $.extend(true, {}, northants_defaults, {
+  http_options: {
+    layerid: prow_asset_layer
+  }
+});
+
+fixmystreet.alloy_add_layers(prow_defaults, prow_assets);
+
+var signals_defaults = $.extend(true, {}, northants_defaults, {
+  http_options: {
+    layerid: signal_asset_layer
+  }
+});
+
+
+fixmystreet.assets.add(signals_defaults, {
+  http_options: {
+    layer_id: signal_asset_layer,
+    styleid: "5d484093fe2ad809d85a9139&styleIds=5d483f6cfe2ad8059ce464de",
+  },
+  asset_category: [
+    "Damaged/Exposed Wiring / Vandalised",
+    "Lamp/Bulb Failure",
+    "Signal Failure",
+    "Signal Failure all out",
+    "Signal Stuck",
+    "Signal Head Failure",
+    "Request Timing Review",
+    "Damaged Control box",
+    "Signal Failure/Damaged - Toucan/Pelican"
+  ],
+  asset_item: "signal or crossing"
+});
+
 // NCC roads layers which prevent report submission unless we have selected
 // an asset.
 var northants_road_defaults = $.extend(true, {}, fixmystreet.alloyv2_defaults, {
-- 
cgit v1.2.3


From 0db97450c94e955a49dc5d3ab975a22ceccdd274 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 14 Aug 2020 14:33:41 +0100
Subject: [Northamptonshire] script to update external ids

The migration from V1 to V2 changes the IDs so take a CSV of the changes
and apply it, saving the old id just in case.
---
 bin/northamptonshire/update_ids_for_v2 | 59 ++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100755 bin/northamptonshire/update_ids_for_v2

diff --git a/bin/northamptonshire/update_ids_for_v2 b/bin/northamptonshire/update_ids_for_v2
new file mode 100755
index 000000000..eac52b938
--- /dev/null
+++ b/bin/northamptonshire/update_ids_for_v2
@@ -0,0 +1,59 @@
+#!/usr/bin/env perl
+
+# The migration from Alloy V1 to V2 causes the IDs to change. This takes a CSV
+# with a mapping of old ids to new ones and applies it to the external_id, saving
+# the old one in extra in case it's relevant.
+
+use strict;
+use warnings;
+use v5.14;
+
+BEGIN {
+    use File::Basename qw(dirname);
+    use File::Spec;
+    my $d = dirname(File::Spec->rel2abs($0));
+    require "$d/../../setenv.pl";
+}
+
+use FixMyStreet::DB;
+
+use Getopt::Long;
+use Text::CSV;
+
+my $NEW_ID = 'alloy_item_id';
+my $OLD_ID = 'res_id';
+
+my ($commit, $file);
+GetOptions(
+    'commit' => \$commit,
+    'file=s' => \$file,
+);
+
+if (!$commit) {
+    say "*** DRY RUN ***";
+}
+
+my $csv = Text::CSV->new({ binary => 1 });
+open my $fh, "<:encoding(utf-8)", $file or die "Failed to open $file: $!\n";
+$csv->header($fh);
+
+my $count = 0;
+my $northants = FixMyStreet::DB->resultset("Body")->find({ name => 'Northamptonshire County Council' });
+if ($northants) {
+    while (my $report = $csv->getline_hr( $fh ) ) {
+        next unless $report->{$OLD_ID};
+        my $p = FixMyStreet::DB->resultset('Problem')->to_body( $northants->id )->search({ external_id => $report->{$OLD_ID} })->first;
+        next unless $p;
+
+        if ($commit) {
+            $p->set_extra_metadata('old_external_id', $p->external_id);
+            $p->external_id($report->{$NEW_ID});
+            $p->update;
+        }
+        $count++;
+    }
+
+    say "updated $count rows";
+} else {
+    say STDERR "Could not find Northamptonshire";
+}
-- 
cgit v1.2.3


From 9aee2b8cbcdc8155cf5835c369ae76991928826f Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 18 Sep 2020 15:19:37 +0100
Subject: [Northamptonshire] turn assets back on

---
 .cypress/cypress/integration/northamptonshire.js    | 3 ---
 templates/web/fixmystreet.com/footer_extra_js.html  | 1 +
 templates/web/northamptonshire/footer_extra_js.html | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.cypress/cypress/integration/northamptonshire.js b/.cypress/cypress/integration/northamptonshire.js
index 453557b99..aac6cb66b 100644
--- a/.cypress/cypress/integration/northamptonshire.js
+++ b/.cypress/cypress/integration/northamptonshire.js
@@ -4,7 +4,6 @@ it('loads the right front page', function() {
 });
 
 it('prevents clicking unless asset selected', function() {
-  this.skip();
   cy.server();
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
@@ -27,7 +26,6 @@ it('prevents clicking unless asset selected', function() {
 });
 
 it('selecting an asset allows a report', function() {
-  this.skip();
   cy.server();
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
@@ -50,7 +48,6 @@ it('selecting an asset allows a report', function() {
 });
 
 it('detects multiple assets at same location', function() {
-  this.skip();
   cy.server();
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
diff --git a/templates/web/fixmystreet.com/footer_extra_js.html b/templates/web/fixmystreet.com/footer_extra_js.html
index 3e5151546..2a4f9ed9c 100644
--- a/templates/web/fixmystreet.com/footer_extra_js.html
+++ b/templates/web/fixmystreet.com/footer_extra_js.html
@@ -14,6 +14,7 @@ IF bodyclass.match('mappage');
     scripts.push( version('/cobrands/eastsussex/assets.js') );
     scripts.push( version('/cobrands/isleofwight/assets.js') );
     scripts.push( version('/cobrands/lincolnshire/assets.js') );
+    scripts.push( version('/cobrands/northamptonshire/assets.js') );
     scripts.push( version('/cobrands/hounslow/assets.js') );
     scripts.push( version('/cobrands/oxfordshire/assets.js') );
     scripts.push( version('/cobrands/westminster/assets.js') );
diff --git a/templates/web/northamptonshire/footer_extra_js.html b/templates/web/northamptonshire/footer_extra_js.html
index 4f076de2d..523f441cf 100644
--- a/templates/web/northamptonshire/footer_extra_js.html
+++ b/templates/web/northamptonshire/footer_extra_js.html
@@ -4,4 +4,4 @@ IF bodyclass.match('mappage');
     version('/cobrands/fixmystreet-uk-councils/alloy.js'),
   );
 END %]
-[% PROCESS 'footer_extra_js_base.html' highways=1 validation=1 roadworks=1 %]
+[% PROCESS 'footer_extra_js_base.html' highways=1 cobrand_js=1 validation=1 roadworks=1 %]
-- 
cgit v1.2.3


From fdc0ab785be35055913767fd19a9cf0ffb9ff7df Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 18 Sep 2020 15:20:06 +0100
Subject: [Northamptonshire] remove upgrade message

---
 templates/web/northamptonshire/front/pre-steps.html | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 templates/web/northamptonshire/front/pre-steps.html

diff --git a/templates/web/northamptonshire/front/pre-steps.html b/templates/web/northamptonshire/front/pre-steps.html
deleted file mode 100644
index 24d91db87..000000000
--- a/templates/web/northamptonshire/front/pre-steps.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<p style="margin: -1em -1em 1em; padding: 1em; background-color: #2C8500; color: #fff;">
-Essential upgrade being undertaken this weekend.  Reports may take longer to arrive with the Council but please continue to log any issues.
-</p>
-- 
cgit v1.2.3


From fd31e8f629b9bc04486c8e3f0f6e330868b38597 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Sun, 20 Sep 2020 17:35:41 +0100
Subject: [Northamptonshire] update staging asset server address

---
 web/cobrands/northamptonshire/assets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/cobrands/northamptonshire/assets.js b/web/cobrands/northamptonshire/assets.js
index 24f67eb64..b08f48850 100644
--- a/web/cobrands/northamptonshire/assets.js
+++ b/web/cobrands/northamptonshire/assets.js
@@ -5,7 +5,7 @@ if (!fixmystreet.maps) {
 }
 
 var base_url = fixmystreet.staging ?
-      "https://tilma.staging.mysociety.org/resource-proxy/proxy.php?https://northants.assets/${layerid}/${x}/${y}/${z}/cluster" :
+      "https://tilma.staging.mysociety.org/resource-proxy/proxy.php?https://northants.staging/${layerid}/${x}/${y}/${z}/cluster" :
       "https://tilma.mysociety.org/resource-proxy/proxy.php?https://northants.assets/${layerid}/${x}/${y}/${z}/cluster";
 
 var url_with_style = base_url + '?styleIds=${styleid}';
-- 
cgit v1.2.3


From 92dbe2100f813dbad20f15fa42d597495b7f7e40 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Sun, 20 Sep 2020 17:36:30 +0100
Subject: [Northamptonshire] improve external id mapping script

Now uses FixMyStreet id as the lookup based on external_id was much too
slow in practice
---
 bin/northamptonshire/update_ids_for_v2 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/northamptonshire/update_ids_for_v2 b/bin/northamptonshire/update_ids_for_v2
index eac52b938..2876bb0d8 100755
--- a/bin/northamptonshire/update_ids_for_v2
+++ b/bin/northamptonshire/update_ids_for_v2
@@ -22,6 +22,7 @@ use Text::CSV;
 
 my $NEW_ID = 'alloy_item_id';
 my $OLD_ID = 'res_id';
+my $FMS_ID = 'fms_id';
 
 my ($commit, $file);
 GetOptions(
@@ -42,14 +43,19 @@ my $northants = FixMyStreet::DB->resultset("Body")->find({ name => 'Northamptons
 if ($northants) {
     while (my $report = $csv->getline_hr( $fh ) ) {
         next unless $report->{$OLD_ID};
-        my $p = FixMyStreet::DB->resultset('Problem')->to_body( $northants->id )->search({ external_id => $report->{$OLD_ID} })->first;
+        my $p = FixMyStreet::DB->resultset('Problem')->to_body( $northants->id )->search({ id => $report->{$FMS_ID} })->first;
         next unless $p;
+        if ( $p->external_id ne $report->{$OLD_ID} ) {
+            warn "mismatch for " . $report->{$FMS_ID} . "\n";
+            next;
+        }
 
         if ($commit) {
             $p->set_extra_metadata('old_external_id', $p->external_id);
             $p->external_id($report->{$NEW_ID});
             $p->update;
         }
+        say "Processed $count" if $count % 100 == 0;
         $count++;
     }
 
-- 
cgit v1.2.3


From 9152db674f3367e81eac8194c2b25aea91e4db61 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Mon, 21 Sep 2020 07:09:35 +0100
Subject: [Northamptonshire] fix failing browser tests

cope with change to staging assets URL
---
 .cypress/cypress/integration/northamptonshire.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cypress/cypress/integration/northamptonshire.js b/.cypress/cypress/integration/northamptonshire.js
index aac6cb66b..0de02d8c3 100644
--- a/.cypress/cypress/integration/northamptonshire.js
+++ b/.cypress/cypress/integration/northamptonshire.js
@@ -7,7 +7,7 @@ it('prevents clicking unless asset selected', function() {
   cy.server();
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
-  cy.route('**/northants.assets/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
+  cy.route('**/northants.staging/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
   cy.route('**/32602/21575/**', 'fixture:bus_stops.json').as('bus_stops-layer');
   cy.route('/report/new/ajax*').as('report-ajax');
   cy.visit('http://northamptonshire.localhost:3001/');
@@ -29,7 +29,7 @@ it('selecting an asset allows a report', function() {
   cy.server();
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
-  cy.route('**/northants.assets/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
+  cy.route('**/northants.staging/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
   cy.route('**/32602/21575/**', 'fixture:bus_stops.json').as('bus_stops-layer');
   cy.route('/report/new/ajax*').as('report-ajax');
   cy.visit('http://northamptonshire.localhost:3001/');
@@ -51,7 +51,7 @@ it('detects multiple assets at same location', function() {
   cy.server();
   cy.fixture('bus_stops.json');
   cy.fixture('bus_stops_none.json');
-  cy.route('**/northants.assets/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
+  cy.route('**/northants.staging/**', 'fixture:bus_stops_none.json').as('empty-bus_stops-layer');
   cy.route('**/32602/21575/**', 'fixture:bus_stops.json').as('bus_stops-layer');
   cy.route('**/32602/21576/**', 'fixture:bus_stops.json').as('bus_stops-layer2');
   cy.route('/report/new/ajax*').as('report-ajax');
-- 
cgit v1.2.3


From 6aece0d14bf772aff62152e2572326be964bf161 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 18 Sep 2020 16:54:56 +0100
Subject: fix using multiple disable messages on category questions

Provide a stopper per disable message, rather than per question.
Previously there was one stopper per dropdown so only the last message
encountered was used.
---
 CHANGELOG.md                                     |  1 +
 perllib/FixMyStreet/App/Controller/Report/New.pm | 10 ++++++----
 t/app/controller/report_new_open311.t            | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17e39c6f3..e9c5605a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
         - Do not have bootstrap run sudo commands. #2930
         - Fix lookups in templates of categories with &s.
         - Fix a few obscure asset layer changing issues.
+        - Fix multiple disable messages for dropdown answers
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index a00251171..e7b4d70a7 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -332,12 +332,14 @@ sub disable_form_message : Private {
             my %category;
             foreach my $opt (@{$_->{values}}) {
                 if ($opt->{disable}) {
-                    $category{message} = $opt->{disable_message} || $_->{datatype_description};
-                    $category{code} = $_->{code};
-                    push @{$category{answers}}, $opt->{key};
+                    my $message = $opt->{disable_message} || $_->{datatype_description};
+                    $category{$message} ||= {};
+                    $category{$message}->{message} = $message;
+                    $category{$message}->{code} = $_->{code};
+                    push @{$category{$message}->{answers}}, $opt->{key};
                 }
             }
-            push @{$out{questions}}, \%category if %category;
+            push @{$out{questions}}, $_ for values %category;
         }
     }
 
diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t
index 08435fb2b..7cd6dca09 100644
--- a/t/app/controller/report_new_open311.t
+++ b/t/app/controller/report_new_open311.t
@@ -394,6 +394,14 @@ subtest "Category extras includes form disabling string" => sub {
         $contact4->push_extra_fields({ datatype_description => 'Please please ring', description => 'Is it dangerous?', code => 'dangerous',
             variable => 'true', order => '0', values => [ { name => 'Yes', key => 'yes', disable => 1 }, { name => 'No', key => 'no' } ]
         });
+        $contact4->push_extra_fields({ datatype_description => 'Please ring different numbers', description => 'What sort of dangerous?', code => 'danger_type',
+            variable => 'true', order => '0', values => [
+                { name => 'slightly', key => 'slightly', disable => 1, disable_message => 'Ring the slightly number'  },
+                { name => 'very', key => 'very', disable => 1, disable_message => 'Ring the very number'  },
+                { name => 'extremely', key => 'extremely', disable => 1, disable_message => 'Ring the very number'  },
+                { name => 'No', key => 'no' }
+            ]
+        });
         $contact4->update;
         for (
           { url => '/report/new/ajax?' },
@@ -401,6 +409,7 @@ subtest "Category extras includes form disabling string" => sub {
         ) {
             my $json = $mech->get_ok_json($_->{url} . '&latitude=55.952055&longitude=-3.189579');
             my $output = $json->{by_category} ? $json->{by_category}{Pothole}{disable_form} : $json->{disable_form};
+            $output->{questions} = [ sort { $a->{message} cmp $b->{message} } @{ $output->{questions} } ];
             is_deeply $output, {
                 all => 'Please ring us!',
                 questions => [
@@ -409,6 +418,16 @@ subtest "Category extras includes form disabling string" => sub {
                         code => 'dangerous',
                         answers => [ 'yes' ],
                     },
+                    {
+                        message => 'Ring the slightly number',
+                        code => 'danger_type',
+                        answers => [ 'slightly' ],
+                    },
+                    {
+                        message => 'Ring the very number',
+                        code => 'danger_type',
+                        answers => [ 'very', 'extremely' ],
+                    },
                 ],
             };
         }
-- 
cgit v1.2.3


From 49a2bf517a60d71b251bdf7e23e5717c792f527d Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 24 Sep 2020 09:52:11 +0100
Subject: [IsleOfWight] use standard confirm validation

---
 perllib/FixMyStreet/Cobrand/IsleOfWight.pm                       | 1 +
 templates/web/isleofwight/footer_extra_js.html                   | 2 +-
 web/cobrands/fixmystreet-uk-councils/council_validation_rules.js | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/IsleOfWight.pm b/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
index f6d631a78..72555b9e6 100644
--- a/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
+++ b/perllib/FixMyStreet/Cobrand/IsleOfWight.pm
@@ -6,6 +6,7 @@ use warnings;
 
 use Moo;
 with 'FixMyStreet::Roles::ConfirmOpen311';
+with 'FixMyStreet::Roles::ConfirmValidation';
 
 sub council_area_id { 2636 }
 sub council_area { 'Isle of Wight' }
diff --git a/templates/web/isleofwight/footer_extra_js.html b/templates/web/isleofwight/footer_extra_js.html
index 379ace871..490bbfe33 100644
--- a/templates/web/isleofwight/footer_extra_js.html
+++ b/templates/web/isleofwight/footer_extra_js.html
@@ -1,4 +1,4 @@
-[% PROCESS 'footer_extra_js_base.html' cobrand_js=1 roadworks=1 %]
+[% PROCESS 'footer_extra_js_base.html' validation=1 cobrand_js=1 roadworks=1 %]
 [% IF bodyclass.match('mappage');
     scripts.push(
         version('/cobrands/isleofwight/js.js'),
diff --git a/web/cobrands/fixmystreet-uk-councils/council_validation_rules.js b/web/cobrands/fixmystreet-uk-councils/council_validation_rules.js
index 171f200ff..98a3a68a5 100644
--- a/web/cobrands/fixmystreet-uk-councils/council_validation_rules.js
+++ b/web/cobrands/fixmystreet-uk-councils/council_validation_rules.js
@@ -23,6 +23,8 @@ body_validation_rules = {
     'Buckinghamshire Council': confirm_validation_rules,
     'Cheshire East Council': confirm_validation_rules,
     'Hounslow Borough Council': confirm_validation_rules,
+    'Isle of Wight Council': confirm_validation_rules,
+    'Island Roads': confirm_validation_rules,
     'Lincolnshire County Council': confirm_validation_rules,
     'Northamptonshire County Council': {
         title: {
-- 
cgit v1.2.3


From ba1179d0378a35809f4eb2df0ceb3e189c4bd1bc Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 18 Sep 2020 20:11:31 +0100
Subject: Show username error in correct place only.

---
 perllib/FixMyStreet/App/Controller/Report/New.pm     | 10 ++++++++++
 perllib/FixMyStreet/App/Controller/Report/Update.pm  | 10 ++++++++++
 t/app/controller/report_new_errors.t                 | 20 ++++++++++++++++++++
 t/app/controller/report_new_open311.t                |  4 ++--
 t/app/controller/report_updates.t                    | 19 +++++++++++++++++--
 templates/web/base/contact/enquiry/index.html        |  4 ++--
 .../web/base/report/form/user_loggedout_email.html   |  4 ++--
 .../bromley/report/form/user_loggedout_email.html    |  4 ++--
 .../web/zurich/report/new/fill_in_details_form.html  |  4 ++--
 9 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index e7b4d70a7..d6314dacf 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -1250,6 +1250,16 @@ sub check_for_errors : Private {
         $field_errors{photo} = $photo_error;
     }
 
+    # Now assign the username error according to where it came from
+    if ($field_errors{username}) {
+        if ($c->get_param('submit_sign_in') || $c->get_param('password_sign_in')) {
+            $field_errors{username_sign_in} = $field_errors{username};
+        } else {
+            $field_errors{username_register} = $field_errors{username};
+        }
+        delete $field_errors{username};
+    }
+
     # all good if no errors
     return 1 unless scalar keys %field_errors || $c->stash->{login_success};
 
diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index 8ffba3dcf..0fbdc6ce2 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -404,6 +404,16 @@ sub check_for_errors : Private {
         $field_errors{photo} = $photo_error;
     }
 
+    # Now assign the username error according to where it came from
+    if ($field_errors{username}) {
+        if ($c->get_param('submit_sign_in') || $c->get_param('password_sign_in')) {
+            $field_errors{username_sign_in} = $field_errors{username};
+        } else {
+            $field_errors{username_register} = $field_errors{username};
+        }
+        delete $field_errors{username};
+    }
+
     # all good if no errors
     return 1
       unless ( scalar keys %field_errors
diff --git a/t/app/controller/report_new_errors.t b/t/app/controller/report_new_errors.t
index f45f13c1e..c82a5fa13 100644
--- a/t/app/controller/report_new_errors.t
+++ b/t/app/controller/report_new_errors.t
@@ -695,6 +695,26 @@ subtest "test password errors for a user who is signing in as they report" => su
         $mech->follow_link_ok( { text_regex => qr/skip this step/i, },
             "follow 'skip this step' link" );
 
+        $mech->submit_form_ok(
+            {
+                button      => 'submit_sign_in',
+                with_fields => {
+                    title         => 'Test Report',
+                    detail        => 'Test report details.',
+                    photo1        => '',
+                    username      => 'test-2',
+                    password_sign_in => 'secret1',
+                    category      => 'Street lighting',
+                }
+            },
+            "submit with wrong password"
+        );
+
+        is_deeply $mech->page_errors, [
+            "Please enter a valid email",
+            "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the \x{2018}No\x{2019} section of the form.",
+        ], "check there were errors";
+
         $mech->submit_form_ok(
             {
                 button      => 'submit_sign_in',
diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t
index 7cd6dca09..9a8063a84 100644
--- a/t/app/controller/report_new_open311.t
+++ b/t/app/controller/report_new_open311.t
@@ -130,8 +130,8 @@ foreach my $test (
             'This information is required',
             'Please enter a subject',
             'Please enter some details',
-            'Please enter your email',
             'Please enter your name',
+            'Please enter your email',
         ],
         submit_with => {
             title => 'test',
@@ -170,8 +170,8 @@ foreach my $test (
             'This information is required',
             'Please enter a subject',
             'Please enter some details',
-            'Please enter your email',
             'Please enter your name',
+            'Please enter your email',
         ],
         submit_with => {
             title => 'test',
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 92cbed861..7ae5ed7b2 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -285,7 +285,7 @@ for my $test (
             password_sign_in => '',
         },
         changes => {},
-        field_errors => [ 'Please enter a message', 'Please enter your email', 'Please enter your name' ]
+        field_errors => [ 'Please enter a message', 'Please enter your name', 'Please enter your email' ]
     },
     {
         desc => 'Invalid email, no message',
@@ -303,7 +303,7 @@ for my $test (
             password_register => '',
         },
         changes => {},
-        field_errors => [ 'Please enter a message', 'Please enter a valid email', 'Please enter your name' ]
+        field_errors => [ 'Please enter a message', 'Please enter your name', 'Please enter a valid email' ]
     },
     {
         desc => 'email with spaces, no message',
@@ -1222,6 +1222,21 @@ $report->update;
 $report->comments->delete;
 
 for my $test (
+    {
+        desc => 'submit an update with bad email and password',
+        form_values => {
+            submit_update => 1,
+            username => 'registered@',
+            update        => 'Update from a user',
+            add_alert     => undef,
+            password_sign_in => 'secret',
+        },
+        field_errors => [
+            'Please enter a valid email',
+            "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the \x{2018}No\x{2019} section of the form.",
+            'Please enter your name', # FIXME Not really necessary error
+        ],
+    },
     {
         desc => 'submit an update for a registered user, signing in with wrong password',
         form_values => {
diff --git a/templates/web/base/contact/enquiry/index.html b/templates/web/base/contact/enquiry/index.html
index 1180c08b4..33bdbed5a 100644
--- a/templates/web/base/contact/enquiry/index.html
+++ b/templates/web/base/contact/enquiry/index.html
@@ -16,8 +16,8 @@
         <input type="text" class="form-control required" name="name" id="form_name" value="[% ( form_name OR c.user.name ) | html %]" size="30">
 
         <label for="form_email">[% loc('Your email') %]</label>
-        [% IF field_errors.username %]
-           <div class="form-error">[% field_errors.username %]</div>
+        [% IF field_errors.username_register %]
+           <div class="form-error">[% field_errors.username_register %]</div>
         [% END %]
         <input type="text" class="form-control required email" name="username" id="form_email" [% "disabled" IF c.user.email %] value="[% ( email OR c.user.email ) | html %]" size="30">
 
diff --git a/templates/web/base/report/form/user_loggedout_email.html b/templates/web/base/report/form/user_loggedout_email.html
index 9f631987b..f3163dc5c 100644
--- a/templates/web/base/report/form/user_loggedout_email.html
+++ b/templates/web/base/report/form/user_loggedout_email.html
@@ -10,8 +10,8 @@
 [% END %]
 
 <label for="form_[% name %]">[% username_label %]</label>
-[% IF field_errors.username %]
-    <p class='form-error'>[% field_errors.username %]</p>
+[% IF field_errors.$name %]
+    <p class='form-error'>[% field_errors.$name %]</p>
 [% END %]
 <input type="[% username_type %]" name="username" id="form_[% name %]"
        value="[% username_value | html %]"
diff --git a/templates/web/bromley/report/form/user_loggedout_email.html b/templates/web/bromley/report/form/user_loggedout_email.html
index 8aad16289..5672dbc43 100644
--- a/templates/web/bromley/report/form/user_loggedout_email.html
+++ b/templates/web/bromley/report/form/user_loggedout_email.html
@@ -13,8 +13,8 @@
     <span class="muted">([% loc('We never show your email') %])</span>
   [% END %]
 </label>
-[% IF field_errors.username %]
-    <p class='form-error'>[% field_errors.username %]</p>
+[% IF field_errors.$name %]
+    <p class='form-error'>[% field_errors.$name %]</p>
 [% END %]
 <input type="[% username_type %]" name="username" id="form_[% name %]"
        value="[% username_value | html %]"
diff --git a/templates/web/zurich/report/new/fill_in_details_form.html b/templates/web/zurich/report/new/fill_in_details_form.html
index 376429dad..b2861bf40 100644
--- a/templates/web/zurich/report/new/fill_in_details_form.html
+++ b/templates/web/zurich/report/new/fill_in_details_form.html
@@ -51,8 +51,8 @@
             [% PROCESS "report/new/category_wrapper.html" %]
 
                 <label for="form_username_register">[% loc('Your email') %]</label>
-                [% IF field_errors.username %]
-                    <p class='form-error'>[% field_errors.username %]</p>
+                [% IF field_errors.username_register %]
+                    <p class='form-error'>[% field_errors.username_register %]</p>
                 [% END %]
                 <input class="form-control" type="email" value="[% email | html %]" name="username" id="form_username_register" required>
 
-- 
cgit v1.2.3


From a38ecfbe4c5e5741f902eab498a83857500ea8cc Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 25 Sep 2020 13:26:23 +0100
Subject: Show username error, in case reporting as another.

If a staff user is reporting as another user, and gives an invalid
email address, for example.
---
 templates/web/base/report/new/form_user_loggedin.html    | 3 +++
 templates/web/base/report/update/form_user_loggedin.html | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html
index d26948fc2..515f3842a 100644
--- a/templates/web/base/report/new/form_user_loggedin.html
+++ b/templates/web/base/report/new/form_user_loggedin.html
@@ -37,6 +37,9 @@
 
 [% IF c.user.email_verified %]
     <label for="form_username">[% loc('Email address') %]<span class="hidden"> [% loc('(optional)') %]</span></label>
+    [% IF field_errors.username_register %]
+      <p class='form-error'>[% field_errors.username_register %]</p>
+    [% END %]
     <input class="form-control" id="form_username" name="username"
     [%- IF NOT can_contribute_as_another_user -%]
     disabled
diff --git a/templates/web/base/report/update/form_user_loggedin.html b/templates/web/base/report/update/form_user_loggedin.html
index 35c9beeff..8d55737d2 100644
--- a/templates/web/base/report/update/form_user_loggedin.html
+++ b/templates/web/base/report/update/form_user_loggedin.html
@@ -23,6 +23,9 @@
       [% END %]
     </select>
     <label for="form_username">[% loc('Email address') %]</label>
+    [% IF field_errors.username_register %]
+      <p class='form-error'>[% field_errors.username_register %]</p>
+    [% END %]
     <input class="form-control" name="username" id="form_username" type="text" value="[% c.user.email | html %]">
   [% END %]
 
-- 
cgit v1.2.3


From 85a6b7df9bd0b1711637b39d5a63ed6434686b33 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 21 Sep 2020 09:10:58 +0100
Subject: If text auth on, ask which method they wish to use

---
 CHANGELOG.md                                       |  1 +
 perllib/FixMyStreet/App/Controller/Report/New.pm   | 17 +++++-
 t/app/controller/report_new_text.t                 | 49 ++++++++++++-----
 .../base/report/form/user_loggedout_by_email.html  | 63 +++++++++++++++-------
 web/cobrands/fixmystreet/fixmystreet.js            | 20 +++----
 5 files changed, 106 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9c5605a2..3249b0f9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
         - Add aerial maps option to Bing and OSM maps.
         - Select matches for both filter category and group. #3110
         - Add an extra zoom level to most map types. #3130
+        - Improve new report form when using phone verification.
     - Changes:
         - Mark user as active when sent an email alert.
     - Bugfixes:
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index d6314dacf..8f3261853 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -844,7 +844,7 @@ sub process_user : Private {
 
     # Extract all the params to a hash to make them easier to work with
     my %params = map { $_ => $c->get_param($_) }
-      ( 'email', 'name', 'phone', 'password_register', 'fms_extra_title' );
+      qw( email name phone password_register fms_extra_title update_method );
 
     # Report form includes two username fields: #form_username_register and #form_username_sign_in
     $params{username} = (first { $_ } $c->get_param_list('username')) || '';
@@ -898,6 +898,20 @@ sub process_user : Private {
         $params{username} = $params{phone};
     }
 
+    # Code to deal with SMS being switched on and so the user being asked to
+    # pick a method and no username field
+    if (!$params{username} && !$params{update_method}) {
+        $c->stash->{field_errors}->{update_method} = _('Please pick your update preference');
+    }
+    if (!$params{username} && $params{update_method}) {
+        if ($params{update_method} eq 'phone') {
+            $params{username} = $params{phone};
+        } else {
+            $params{username} = $params{email};
+        }
+        $c->stash->{update_method} = $params{update_method};
+    }
+
     my $parsed = FixMyStreet::SMS->parse_username($params{username});
     my $type = $parsed->{type} || 'email';
     $type = 'email' unless FixMyStreet->config('SMS_AUTHENTICATION') || $c->stash->{contributing_as_another_user};
@@ -1235,6 +1249,7 @@ sub check_for_errors : Private {
     # if using social login then we don't care about other errors
     $c->stash->{is_social_user} = $c->get_param('social_sign_in') ? 1 : 0;
     if ( $c->stash->{is_social_user} ) {
+        delete $field_errors{update_method};
         delete $field_errors{name};
         delete $field_errors{username};
     }
diff --git a/t/app/controller/report_new_text.t b/t/app/controller/report_new_text.t
index 852cdac76..9256a00de 100644
--- a/t/app/controller/report_new_text.t
+++ b/t/app/controller/report_new_text.t
@@ -15,17 +15,43 @@ $mech->create_contact_ok( body_id => $body->id, category => 'Street lighting', e
 $mech->create_contact_ok( body_id => $body->id, category => 'Trees', email => 'trees@example.com' );
 
 # test that phone number validation works okay
+my %defaults = (
+    title => 'Title', detail => 'Detail', name => 'Bob Jones',
+    category => 'Street lighting', may_show_name => 1,
+    photo1 => '', photo2 => '', photo3 => '',
+    password_register => '', password_sign_in => '',
+);
 foreach my $test (
+    {
+        msg => 'missing update method',
+        pc => 'EH1 1BB',
+        fields => {
+            update_method => undef, phone => '', email => '',
+            %defaults,
+        },
+        changes => {
+            username => '',
+        },
+        errors => [ 'Please enter your email', 'Please pick your update preference' ],
+    },
+    {
+        msg => 'email method',
+        pc => 'EH1 1BB',
+        fields => {
+            update_method => 'email', phone => '', email => 'bademail',
+            %defaults,
+        },
+        changes => {
+            username => 'bademail',
+        },
+        errors => [ 'Please enter a valid email' ],
+    },
     {
         msg => 'invalid number',
         pc => 'EH1 1BB',
         fields => {
-            username => '0121 4960000000', email => '', phone => '',
-            title => 'Title', detail => 'Detail', name => 'Bob Jones',
-            category => 'Street lighting',
-            may_show_name => '1',
-            photo1 => '', photo2 => '', photo3 => '',
-            password_register => '', password_sign_in => '',
+            update_method => 'phone', phone => '0121 4960000000', email => '',
+            %defaults,
         },
         changes => {
             username => '01214960000000',
@@ -37,12 +63,8 @@ foreach my $test (
         msg => 'landline number',
         pc => 'EH1 1BB',
         fields => {
-            username => '0121 4960000', email => '', phone => '',
-            title => 'Title', detail => 'Detail', name => 'Bob Jones',
-            category => 'Street lighting',
-            may_show_name => '1',
-            photo1 => '', photo2 => '', photo3 => '',
-            password_register => '', password_sign_in => '',
+            update_method => 'phone', phone => '0121 4960000', email => '',
+            %defaults,
         },
         changes => {
             username => '0121 496 0000',
@@ -142,7 +164,8 @@ foreach my $test (
                     title => 'Test Report', detail => 'Test report details.',
                     photo1 => '',
                     name => 'Joe Bloggs', may_show_name => '1',
-                    username => $test_phone,
+                    update_method => 'phone',
+                    phone => $test_phone,
                     category => 'Street lighting',
                     password_register => $test->{password} ? 'secret' : '',
                 }
diff --git a/templates/web/base/report/form/user_loggedout_by_email.html b/templates/web/base/report/form/user_loggedout_by_email.html
index 459428059..2e41deaea 100644
--- a/templates/web/base/report/form/user_loggedout_by_email.html
+++ b/templates/web/base/report/form/user_loggedout_by_email.html
@@ -7,15 +7,13 @@
     [% INCLUDE 'report/form/user_name.html' %]
     [% INCLUDE 'report/_show_name_label.html' %]
 
-  [% IF type != 'update' %]
-    [% IF NOT c.cobrand.call_hook('disable_phone_number_entry') AND NOT c.config.SMS_AUTHENTICATION %]
-        <div id="js-hide-if-username-phone">
-            <label for="form_phone">[% loc('Phone number (optional)') %]</label>
-            [% IF field_errors.phone %]
-              <p class='form-error'>[% field_errors.phone %]</p>
-            [% END %]
-            <input class="form-control" type="text" value="[% phone | html %]" name="phone" id="form_phone">
-        </div>
+  [% IF type != 'update' AND NOT c.config.SMS_AUTHENTICATION %]
+    [% UNLESS c.cobrand.call_hook('disable_phone_number_entry') %]
+        <label for="form_phone">[% loc('Phone number (optional)') %]</label>
+        [% IF field_errors.phone %]
+          <p class='form-error'>[% field_errors.phone %]</p>
+        [% END %]
+        <input class="form-control" type="text" value="[% phone | html %]" name="phone" id="form_phone">
     [% END %]
   [% END %]
 
@@ -25,19 +23,44 @@
     </div>
   [% END %]
 
-    [% PROCESS 'report/form/user_loggedout_email.html' name='username_register' %]
+  [% IF type != 'update' AND c.config.SMS_AUTHENTICATION AND NOT c.cobrand.call_hook('disable_phone_number_entry') %]
 
-  [% IF type != 'update' AND c.config.SMS_AUTHENTICATION %]
-    [% UNLESS c.cobrand.call_hook('disable_phone_number_entry') %]
-        <div id="js-hide-if-username-phone" class="hidden-js">
-            <label for="form_phone">[% loc('Phone number (optional)') %]</label>
-            <input class="form-control" type="text" value="[% phone | html %]" name="phone" id="form_phone">
-        </div>
+  <fieldset>
+      <legend>How would you like to receive updates?</legend>
+
+    [% IF field_errors.update_method %]
+        <p class='form-error'>[% field_errors.update_method %]</p>
     [% END %]
-    <div id="js-hide-if-username-email" class="hidden-js">
-        <label for="form_email">[% loc('Email address (optional)') %]</label>
-        <input class="form-control" type="text" value="[% email | html %]" name="email" id="form_email">
-    </div>
+    <p class="segmented-control segmented-control--radio">
+        <input required type="radio" name="update_method" id="update_method_email"
+             data-show="#js-optional-phone" data-hide="#js-optional-email"
+            value="email"[% ' checked' IF update_method == 'email' %]>
+        <label class="btn" for="update_method_email">[% loc('Email') %]</label>
+        <input type="radio" name="update_method" id="update_method_phone"
+             data-show="#js-optional-email" data-hide="#js-optional-phone"
+            value="phone"[% ' checked' IF update_method == 'phone' %]>
+        <label class="btn" for="update_method_phone">[% loc('Phone') %]</label>
+    </p>
+  </fieldset>
+
+    [% IF field_errors.username_register %]
+        <p class='form-error'>[% field_errors.username_register %]</p>
+    [% END %]
+
+    <label for="form_email">[% loc('Your email') %]<span class="hidden-js" id="js-optional-email"> [% loc('(optional)') %]</span></label>
+    [% IF field_errors.email %]
+        <p class='form-error'>[% field_errors.email %]</p>
+    [% END %]
+    <input type="email" name="email" id="form_email" value="[% email %]" class="form-control">
+
+    <label for="form_phone">[% loc('Phone number') %]<span class="hidden-js" id="js-optional-phone"> [% loc('(optional)') %]</span></label>
+    [% IF field_errors.phone %]
+        <p class='form-error'>[% field_errors.phone %]</p>
+    [% END %]
+    <input class="form-control" type="text" value="[% phone %]" name="phone" id="form_phone">
+
+  [% ELSE %]
+    [% PROCESS 'report/form/user_loggedout_email.html' name='username_register' %]
   [% END %]
 
   [% IF type == 'update' %]
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 5485ff7c7..09f4f49a3 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -1094,16 +1094,16 @@ $.extend(fixmystreet.set_up, {
     });
   },
 
-  reporting_hide_phone_email: function() {
-    $('#form_username_register').on('keyup change', function() {
-        var username = $(this).val();
-        if (/^[^a-z]+$/i.test(username)) {
-            $('#js-hide-if-username-phone').hide();
-            $('#js-hide-if-username-email').show();
-        } else {
-            $('#js-hide-if-username-phone').show();
-            $('#js-hide-if-username-email').hide();
-        }
+  reporting_required_phone_email: function() {
+    var fem = $('#form_email');
+    var fph = $('#form_phone');
+    $('#update_method_email').on('change', function() {
+      fem.prop('required', true);
+      fph.prop('required', false);
+    });
+    $('#update_method_phone').on('change', function() {
+      fem.prop('required', false);
+      fph.prop('required', true);
     });
   },
 
-- 
cgit v1.2.3


From 22cc2b0e1e6bb2dd7bde7231ad7f7190737ce545 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 24 Sep 2020 14:39:59 +0100
Subject: Split up two username fields.

Rename the not-logging-in username field to username_register.
Keep the sign-in field as username because that e.g. overlaps
with auth code in two-factor authentication.
---
 perllib/FixMyStreet/App/Controller/Report/New.pm   | 21 +++++---
 .../FixMyStreet/App/Controller/Report/Update.pm    | 14 ++++--
 t/app/controller/auth_social.t                     |  6 ++-
 t/app/controller/contact_enquiry.t                 |  6 +--
 t/app/controller/report_display.t                  |  2 +-
 t/app/controller/report_import.t                   |  2 +-
 t/app/controller/report_new.t                      | 10 ++--
 t/app/controller/report_new_errors.t               | 56 +++++++++++++++-------
 t/app/controller/report_new_open311.t              | 11 +++--
 t/app/controller/report_new_text.t                 |  6 +--
 t/app/controller/report_new_unresponsive.t         |  2 +-
 t/app/controller/report_update_text.t              | 20 ++++----
 t/app/controller/report_updates.t                  | 45 +++++++++--------
 t/cobrand/bromley.t                                |  4 +-
 t/cobrand/form_extras.t                            |  2 +-
 t/cobrand/hackney.t                                |  2 +-
 t/cobrand/isleofwight.t                            |  2 +-
 t/cobrand/zurich.t                                 |  2 +-
 templates/web/base/contact/enquiry/index.html      |  2 +-
 .../web/base/report/form/user_loggedout_email.html |  7 ++-
 .../bromley/report/form/user_loggedout_email.html  |  7 ++-
 .../zurich/report/new/fill_in_details_form.html    |  2 +-
 22 files changed, 134 insertions(+), 97 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 8f3261853..ad2649aa3 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -6,7 +6,7 @@ BEGIN { extends 'Catalyst::Controller'; }
 
 use utf8;
 use Encode;
-use List::Util qw(first uniq);
+use List::Util qw(uniq);
 use HTML::Entities;
 use Path::Class;
 use Utils;
@@ -126,8 +126,10 @@ sub report_new_ajax : Path('mobile') : Args(0) {
 
     # Apps are sending email as username
     # Prepare for when they upgrade
-    if (!$c->get_param('username')) {
-        $c->set_param('username', $c->get_param('email'));
+    my $username_field = ( $c->get_param('submit_sign_in') || $c->get_param('password_sign_in') )
+        ? 'username': 'username_register';
+    if (!$c->get_param($username_field)) {
+        $c->set_param($username_field, $c->get_param('email'));
     }
 
     # create the report - loading a partial if available
@@ -846,8 +848,14 @@ sub process_user : Private {
     my %params = map { $_ => $c->get_param($_) }
       qw( email name phone password_register fms_extra_title update_method );
 
-    # Report form includes two username fields: #form_username_register and #form_username_sign_in
-    $params{username} = (first { $_ } $c->get_param_list('username')) || '';
+    if ($c->user_exists) {
+        $params{username} = $c->get_param('username');
+    } elsif ($c->get_param('submit_sign_in') || $c->get_param('password_sign_in')) {
+        $params{username} = $c->get_param('username');
+    } else {
+        $params{username} = $c->get_param('username_register');
+    }
+    $params{username} ||= '';
 
     my $anon_button = $c->cobrand->allow_anonymous_reports eq 'button' && $c->get_param('report_anonymously');
     my $anon_fallback = $c->cobrand->allow_anonymous_reports eq '1' && !$c->user_exists && !$params{username};
@@ -915,8 +923,7 @@ sub process_user : Private {
     my $parsed = FixMyStreet::SMS->parse_username($params{username});
     my $type = $parsed->{type} || 'email';
     $type = 'email' unless FixMyStreet->config('SMS_AUTHENTICATION') || $c->stash->{contributing_as_another_user};
-    $report->user( $c->model('DB::User')->find_or_new( { $type => $parsed->{username} } ) )
-        unless $report->user;
+    $report->user( $c->model('DB::User')->find_or_new( { $type => $parsed->{username} } ) );
 
     $c->stash->{phone_may_be_mobile} = $type eq 'phone' && $parsed->{may_be_mobile};
 
diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index 0fbdc6ce2..02d3d2ae8 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -6,7 +6,6 @@ BEGIN { extends 'Catalyst::Controller'; }
 
 use utf8;
 use Path::Class;
-use List::Util 'first';
 use Utils;
 
 =head1 NAME
@@ -103,8 +102,14 @@ sub process_user : Private {
     my %params = map { $_ => $c->get_param($_) }
       ( 'name', 'password_register', 'fms_extra_title' );
 
-    # Update form includes two username fields: #form_username_register and #form_username_sign_in
-    $params{username} = (first { $_ } $c->get_param_list('username')) || '';
+    if ($c->user_exists) {
+        $params{username} = $c->get_param('username');
+    } elsif ($c->get_param('submit_sign_in') || $c->get_param('password_sign_in')) {
+        $params{username} = $c->get_param('username');
+    } else {
+        $params{username} = $c->get_param('username_register');
+    }
+    $params{username} ||= '';
 
     my $anon_button = $c->cobrand->allow_anonymous_reports eq 'button' && $c->get_param('report_anonymously');
     if ($anon_button) {
@@ -145,8 +150,7 @@ sub process_user : Private {
     my $parsed = FixMyStreet::SMS->parse_username($params{username});
     my $type = $parsed->{type} || 'email';
     $type = 'email' unless FixMyStreet->config('SMS_AUTHENTICATION') || $c->stash->{contributing_as_another_user};
-    $update->user( $c->model('DB::User')->find_or_new( { $type => $parsed->{username} } ) )
-        unless $update->user;
+    $update->user( $c->model('DB::User')->find_or_new( { $type => $parsed->{username} } ) );
 
     $c->stash->{phone_may_be_mobile} = $type eq 'phone' && $parsed->{may_be_mobile};
 
diff --git a/t/app/controller/auth_social.t b/t/app/controller/auth_social.t
index 1f6889dcc..9d1ea836f 100644
--- a/t/app/controller/auth_social.t
+++ b/t/app/controller/auth_social.t
@@ -241,7 +241,8 @@ for my $state ( 'refused', 'no email', 'existing UID', 'okay' ) {
                 $mech->content_contains('We need your email address, please give it below.');
                 # We don't have an email, so check that we can still submit it,
                 # and the ID carries through the confirmation
-                $fields->{username} = $test->{email};
+                $fields->{username} = $test->{email} if $page eq 'my';
+                $fields->{username_register} = $test->{email} unless $page eq 'my';
                 $fields->{name} = 'Ffion Tester' unless $page eq 'my';
                 $mech->submit_form(with_fields => $fields, $page eq 'my' ? (button => 'sign_in_by_code') : ());
                 $mech->content_contains('Nearly done! Now check your email');
@@ -408,7 +409,8 @@ for my $tw_state ( 'refused', 'existing UID', 'no email' ) {
                 $mech->content_contains('We need your email address, please give it below.');
                 # We don't have an email, so check that we can still submit it,
                 # and the ID carries through the confirmation
-                $fields->{username} = $tw_email;
+                $fields->{username_register} = $tw_email unless $page eq 'my';
+                $fields->{username} = $tw_email if $page eq 'my';
                 $fields->{name} = 'Ffion Tester' unless $page eq 'my';
                 $mech->submit_form(with_fields => $fields, $page eq 'my' ? (button => 'sign_in_by_code') : ());
                 $mech->content_contains('Nearly done! Now check your email');
diff --git a/t/app/controller/contact_enquiry.t b/t/app/controller/contact_enquiry.t
index feb2a0545..f1b5b15cd 100644
--- a/t/app/controller/contact_enquiry.t
+++ b/t/app/controller/contact_enquiry.t
@@ -80,7 +80,7 @@ FixMyStreet::override_config {
         $mech->submit_form_ok( {
             with_fields => {
                 name => 'Test User',
-                username => 'testuser@example.org',
+                username_register => 'testuser@example.org',
                 category => 'Other',
                 detail => 'This is a general enquiry',
             }
@@ -149,7 +149,7 @@ FixMyStreet::override_config {
         $mech->submit_form_ok( {
             with_fields => {
                 name => 'Simon Neil',
-                username => $user->email,
+                username_register => $user->email,
                 category => 'General Enquiry',
                 detail => 'This is a general enquiry',
             }
@@ -212,7 +212,7 @@ FixMyStreet::override_config {
             submit_problem => 1,
             token => $csrf,
             name => 'Test User',
-            username => 'testuser@example.org',
+            username_register => 'testuser@example.org',
             category => 'Other',
             detail => encode_utf8('This is a general enquiry‽'),
             photo1         => [ $sample_jpeg, undef, Content_Type => 'image/jpeg' ],
diff --git a/t/app/controller/report_display.t b/t/app/controller/report_display.t
index 4bd0fc991..00c7bf19b 100644
--- a/t/app/controller/report_display.t
+++ b/t/app/controller/report_display.t
@@ -109,7 +109,7 @@ subtest "test a good report" => sub {
 
     my %fields = (
         name      => '',
-        username => '',
+        username_register => '',
         update    => '',
         add_alert => 1, # defaults to true
         fixed     => undef
diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t
index b2e15330a..7b5ede7a9 100644
--- a/t/app/controller/report_import.t
+++ b/t/app/controller/report_import.t
@@ -376,7 +376,7 @@ subtest "Submit a correct entry (with location) to cobrand" => sub {
         photo2         => '',
         photo3         => '',
         phone         => '',
-        username => 'test-ll@example.com',
+        username_register => 'test-ll@example.com',
       },
       "check imported fields are shown"
           or diag Dumper( $mech->visible_form_values ); use Data::Dumper;
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index 6af709c2c..b0c93c332 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -156,7 +156,7 @@ foreach my $test (
                     photo1        => '',
                     name          => 'Joe Bloggs',
                     may_show_name => '1',
-                    username      => 'test-1@example.com',
+                    username_register => 'test-1@example.com',
                     phone         => '07903 123 456',
                     category      => 'Street lighting',
                     password_register => $test->{password} ? 'secret' : '',
@@ -680,7 +680,7 @@ subtest "test report creation for a category that is non public" => sub {
                     title         => 'Test Report',
                     detail        => 'Test report details.',
                     photo1        => '',
-                    username      => $user->email,
+                    username_register => $user->email,
                     name          => 'Joe Bloggs',
                     category      => 'Street lighting',
                 }
@@ -940,7 +940,7 @@ for my $test (
             title             => "Test Report",
             detail            => 'Test report details.',
             photo1            => '',
-            username          => 'firstlast@example.com',
+            username_register => 'firstlast@example.com',
             may_show_name     => '1',
             phone             => '07903 123 456',
             category          => 'Trees',
@@ -1085,7 +1085,7 @@ subtest "test Hart" => sub {
                 $mech->submit_form_ok( { with_fields => { pc => 'GU51 4AE' } }, "submit location" );
                 $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
                 my %optional_fields = $test->{confirm} ?  () :
-                    ( username => $test_email, phone => '07903 123 456' );
+                    ( username_register => $test_email, phone => '07903 123 456' );
 
                 # we do this as otherwise test::www::mechanize::catalyst
                 # goes to the value set in ->host above irregardless and
@@ -1279,7 +1279,7 @@ subtest "extra google analytics code displayed on email confirmation problem cre
             title             => "Test Report",
             detail            => 'Test report details.',
             photo1            => '',
-            username          => 'firstlast@example.com',
+            username_register => 'firstlast@example.com',
             name              => 'Test User',
             may_show_name     => '1',
             phone             => '07903 123 456',
diff --git a/t/app/controller/report_new_errors.t b/t/app/controller/report_new_errors.t
index c82a5fa13..470cb7d79 100644
--- a/t/app/controller/report_new_errors.t
+++ b/t/app/controller/report_new_errors.t
@@ -112,6 +112,7 @@ foreach my $test (
             photo3        => '',
             name          => '',
             may_show_name => '1',
+            username_register => '',
             username      => '',
             phone         => '',
             password_sign_in => '',
@@ -137,6 +138,7 @@ foreach my $test (
             photo3        => '',
             name          => '',
             may_show_name => '1',
+            username_register => '',
             username      => '',
             phone         => '',
             category      => 'Something bad',
@@ -165,6 +167,7 @@ foreach my $test (
             photo3        => '',
             name          => '',
             may_show_name => '1',
+            username_register => '',
             username      => '',
             phone         => '',
             category      => 'Street lighting',
@@ -190,6 +193,7 @@ foreach my $test (
             photo3        => '',
             name          => '',
             may_show_name => undef,
+            username_register => '',
             username      => '',
             phone         => '',
             category      => 'Street lighting',
@@ -215,6 +219,7 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Jones',
             may_show_name => undef,
+            username_register => '',
             username      => '',
             phone         => '',
             category      => 'Street lighting',
@@ -239,6 +244,7 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Jones',
             may_show_name => '1',
+            username_register => '',
             username      => '',
             phone         => '',
             category      => 'Street lighting',
@@ -263,6 +269,7 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Jones',
             may_show_name => '1',
+            username_register => '',
             username      => '',
             phone         => '',
             category      => 'Street lighting',
@@ -287,6 +294,7 @@ foreach my $test (
             photo3        => '',
             name          => 'DUDE',
             may_show_name => '1',
+            username_register => '',
             username      => '',
             phone         => '',
             category      => 'Street lighting',
@@ -310,6 +318,7 @@ foreach my $test (
             photo3        => '',
             name          => 'anonymous',
             may_show_name => '1',
+            username_register => '',
             username      => '',
             phone         => '',
             category      => 'Street lighting',
@@ -333,13 +342,14 @@ foreach my $test (
             photo3        => '',
             name          => 'Joe Smith',
             may_show_name => '1',
-            username      => 'not an email',
+            username_register => 'not an email',
+            username      => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
         },
-        changes => { username => 'notanemail' },
+        changes => {},
         errors  => [ 'Please enter a valid email', ],
     },
     {
@@ -353,6 +363,7 @@ foreach my $test (
             photo3        => '',
             name          => '',
             may_show_name => '1',
+            username_register => '',
             username      => '',
             phone         => '',
             category      => 'Street lighting',
@@ -379,7 +390,8 @@ foreach my $test (
             photo3        => '',
             name          => '  Bob    Jones   ',
             may_show_name => '1',
-            username      => '   BOB @ExAmplE.COM   ',
+            username_register => '   BOB @ExAmplE.COM   ',
+            username      => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
@@ -387,7 +399,6 @@ foreach my $test (
         },
         changes => {
             name  => 'Bob Jones',
-            username => 'bob@example.com',
         },
         errors => [ 'Please enter a subject', 'Please enter some details', ],
     },
@@ -402,7 +413,8 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Jones',
             may_show_name => '1',
-            username      => 'bob@example.com',
+            username_register => 'bob@example.com',
+            username      => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
@@ -424,7 +436,8 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Jones',
             may_show_name => '1',
-            username      => 'bob@example.com',
+            username_register => 'bob@example.com',
+            username      => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
@@ -446,7 +459,8 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Jones',
             may_show_name => '1',
-            username      => 'bob@example.com',
+            username_register => 'bob@example.com',
+            username      => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
@@ -468,14 +482,14 @@ foreach my $test (
             photo3        => '',
             name          => 'Joe Smith',
             may_show_name => '1',
-            username      => 'user@example.com',
+            username_register => 'user@example.com',
+            username      => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
             password_register => '',
         },
         changes => {
-            username => 'user@example.com',
             title => 'User@example.com'
         },
         errors  => [ 'Please make sure you are not including an email address', ],
@@ -492,7 +506,8 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Example',
             may_show_name => '1',
-            username      => 'bob@example.com',
+            username_register => 'bob@example.com',
+            username      => '',
             phone         => '',
             category      => 'Trees',
             password_sign_in => '',
@@ -512,7 +527,8 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Example',
             may_show_name => '1',
-            username      => 'bob@example.com',
+            username_register => 'bob@example.com',
+            username      => '',
             phone         => '',
             category      => 'Trees',
             password_sign_in => '',
@@ -532,7 +548,8 @@ foreach my $test (
             photo3        => '',
             name          => 'Bob Example',
             may_show_name => '1',
-            username      => 'bob@example.com',
+            username_register => 'bob@example.com',
+            username      => '',
             phone         => '123456789 12345678910',
             category      => 'Trees',
             password_sign_in => '',
@@ -552,7 +569,8 @@ foreach my $test (
             photo3        => '',
             name          => 'This is a very long name that should fail validation',
             may_show_name => '1',
-            username      => 'bob@example.com',
+            username_register => 'bob@example.com',
+            username      => '',
             phone         => '',
             category      => 'Street lighting',
             password_sign_in => '',
@@ -572,7 +590,8 @@ foreach my $test (
             photo3        => '',
             name          => 'This is a very long name that should fail validation',
             may_show_name => '1',
-            username      => 'bob@example.com',
+            username_register => 'bob@example.com',
+            username      => '',
             phone         => '',
             category      => 'Trees',
             password_sign_in => '',
@@ -592,7 +611,8 @@ foreach my $test (
             photo3        => '',
             name          => 'This is a really extraordinarily long name that definitely should fail validation',
             may_show_name => '1',
-            username      => 'bob.has.a.very.long.email@thisisalonghostname.example.com',
+            username_register => 'bob.has.a.very.long.email@thisisalonghostname.example.com',
+            username      => '',
             phone         => '01234 5678910 09876 54321 ext 203',
             category      => 'Trees',
             password_sign_in => '',
@@ -612,7 +632,8 @@ foreach my $test (
             photo3        => '',
             name          => 'A User',
             may_show_name => '1',
-            username      => 'user@example.org',
+            username_register => 'user@example.org',
+            username      => '',
             phone         => '',
             category      => 'Trees',
             password_sign_in => '',
@@ -632,7 +653,8 @@ foreach my $test (
             photo3        => '',
             name          => 'A User',
             may_show_name => '1',
-            username      => 'user@example.org',
+            username_register => 'user@example.org',
+            username      => '',
             phone         => '',
             category      => 'Trees',
             password_sign_in => '',
diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t
index 9a8063a84..ebbb06567 100644
--- a/t/app/controller/report_new_open311.t
+++ b/t/app/controller/report_new_open311.t
@@ -108,7 +108,8 @@ my $empty_form = {
     photo3        => '',
     name          => '',
     may_show_name => '1',
-    username      => '',
+    username_register => '',
+    username => '',
     phone         => '',
     category      => '',
     password_sign_in => '',
@@ -137,7 +138,7 @@ foreach my $test (
             title => 'test',
             detail => 'test detail',
             name => 'Test User',
-            username => 'testopen311@example.com',
+            username_register => 'testopen311@example.com',
             category => 'Street lighting',
             number => 27,
             type => 'old',
@@ -177,7 +178,7 @@ foreach my $test (
             title => 'test',
             detail => 'test detail',
             name => 'Test User',
-            username => 'testopen311@example.com',
+            username_register => 'testopen311@example.com',
             size => 'big',
             colour => 'red',
         },
@@ -201,7 +202,7 @@ foreach my $test (
         $mech->clear_emails_ok;
 
         # check that the user does not exist
-        my $test_email = $test->{submit_with}->{username};
+        my $test_email = $test->{submit_with}->{username_register};
         my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
         if ( $user ) {
             $user->problems->delete;
@@ -452,7 +453,7 @@ subtest "Category extras includes form disabling string" => sub {
         # Test submission of whole form, switching back to a blocked category at the same time
         $mech->submit_form_ok({ with_fields => {
             category => 'Pothole', title => 'Title', detail => 'Detail',
-            username => 'testing@example.org', name => 'Testing Example',
+            username_register => 'testing@example.org', name => 'Testing Example',
         } });
         $mech->content_contains('<div id="js-category-stopper" class="box-warning" role="alert" aria-live="assertive">');
         $mech->content_contains('Please ring us!');
diff --git a/t/app/controller/report_new_text.t b/t/app/controller/report_new_text.t
index 9256a00de..8753e7e20 100644
--- a/t/app/controller/report_new_text.t
+++ b/t/app/controller/report_new_text.t
@@ -42,7 +42,7 @@ foreach my $test (
             %defaults,
         },
         changes => {
-            username => 'bademail',
+            username => '',
         },
         errors => [ 'Please enter a valid email' ],
     },
@@ -54,7 +54,7 @@ foreach my $test (
             %defaults,
         },
         changes => {
-            username => '01214960000000',
+            username => '',
             phone => '01214960000000',
         },
         errors => [ 'Please check your phone number is correct' ],
@@ -67,7 +67,7 @@ foreach my $test (
             %defaults,
         },
         changes => {
-            username => '0121 496 0000',
+            username => '',
             phone => '0121 496 0000',
         },
         errors => [ 'Please enter a mobile number', ],
diff --git a/t/app/controller/report_new_unresponsive.t b/t/app/controller/report_new_unresponsive.t
index 033475c25..211f7198d 100644
--- a/t/app/controller/report_new_unresponsive.t
+++ b/t/app/controller/report_new_unresponsive.t
@@ -107,7 +107,7 @@ sub make_report {
                 detail        => 'Test report details.',
                 photo1        => '',
                 name          => 'Joe Bloggs',
-                username      => $user->email,
+                username_register => $user->email,
                 may_show_name => '1',
                 phone         => '07903 123 456',
                 category      => 'Trees',
diff --git a/t/app/controller/report_update_text.t b/t/app/controller/report_update_text.t
index 52f221264..3f9a73773 100644
--- a/t/app/controller/report_update_text.t
+++ b/t/app/controller/report_update_text.t
@@ -62,7 +62,8 @@ for my $test (
     {
         desc => 'Invalid phone',
         fields => {
-            username => '01214960000000',
+            username_register => '01214960000000',
+            username => '',
             update => 'Update',
             name => 'Name',
             photo1 => '',
@@ -80,7 +81,8 @@ for my $test (
     {
         desc => 'landline number',
         fields => {
-            username => '01214960000',
+            username_register => '01214960000',
+            username => '',
             update => 'Update',
             name => 'Name',
             photo1 => '',
@@ -92,9 +94,7 @@ for my $test (
             password_register => '',
             password_sign_in => '',
         },
-        changes => {
-            username => '0121 496 0000',
-        },
+        changes => {},
         field_errors => [ 'Please enter a mobile number' ]
     },
   )
@@ -126,7 +126,7 @@ for my $test (
         desc => 'submit an update, unregistered, logged out',
         form_values => {
             submit_update => 1,
-            username => $test_phone,
+            username_register => $test_phone,
             update => 'Update from an unregistered user',
             add_alert => undef,
             name => 'Unreg User',
@@ -137,7 +137,7 @@ for my $test (
         desc => 'submit an update, unregistered, logged out, sign up for alerts',
         form_values => {
             submit_update => 1,
-            username => $test_phone,
+            username_register => $test_phone,
             update => 'Update from an unregistered user',
             add_alert => 1,
             name => 'Unreg User',
@@ -149,7 +149,7 @@ for my $test (
         registered => 1,
         form_values => {
             submit_update => 1,
-            username => $test_phone,
+            username_register => $test_phone,
             update => 'Update from a registered user',
             add_alert => undef,
             name => 'Reg User',
@@ -194,7 +194,7 @@ for my $test (
         ok $update, 'found update in database';
         is $update->state, 'unconfirmed', 'update unconfirmed';
         my $details = $test->{form_values};
-        is $update->user->phone, $details->{username}, 'update phone';
+        is $update->user->phone, $details->{username_register}, 'update phone';
         is $update->user->phone_verified, 1;
         is $update->text, $details->{update}, 'update text';
         is $add_alerts, $details->{add_alert} ? 1 : 0, 'do not sign up for alerts';
@@ -211,7 +211,7 @@ for my $test (
             ok $user->check_password( 'new_secret' ), 'password changed';
             is $user->name, 'Reg User', 'name changed';
         } else {
-            $user = FixMyStreet::DB->resultset( 'User' )->find( { phone => $details->{username} } );
+            $user = FixMyStreet::DB->resultset( 'User' )->find( { phone => $details->{username_register} } );
             ok $user, 'found user';
         }
 
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 7ae5ed7b2..760a5a45b 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -272,7 +272,8 @@ for my $test (
     {
         desc => 'No email, no message',
         fields => {
-            username  => '',
+            username_register => '',
+            username => '',
             update => '',
             name   => '',
             photo1 => '',
@@ -290,7 +291,8 @@ for my $test (
     {
         desc => 'Invalid email, no message',
         fields => {
-            username  => 'test',
+            username_register => 'test',
+            username => '',
             update => '',
             name   => '',
             photo1 => '',
@@ -308,7 +310,8 @@ for my $test (
     {
         desc => 'email with spaces, no message',
         fields => {
-            username => 'test @ example. com',
+            username_register => 'test @ example. com',
+            username => '',
             update => '',
             name   => '',
             photo1 => '',
@@ -320,15 +323,14 @@ for my $test (
             password_register => '',
             password_sign_in => '',
         },
-        changes => {
-            username => 'test@example.com',
-        },
+        changes => {},
         field_errors => [ 'Please enter a message', 'Please enter your name' ]
     },
     {
         desc => 'email with uppercase, no message',
         fields => {
-            username => 'test@EXAMPLE.COM',
+            username_register => 'test@EXAMPLE.COM',
+            username => '',
             update => '',
             name   => '',
             photo1 => '',
@@ -340,9 +342,7 @@ for my $test (
             password_register => '',
             password_sign_in => '',
         },
-        changes => {
-            username => 'test@example.com',
-        },
+        changes => {},
         field_errors => [ 'Please enter a message', 'Please enter your name' ]
     },
   )
@@ -369,6 +369,7 @@ for my $test (
         desc => 'submit an update for a non registered user',
         initial_values => {
             name          => '',
+            username_register => '',
             username => '',
             may_show_name => undef,
             add_alert     => 1,
@@ -382,7 +383,7 @@ for my $test (
         },
         form_values => {
             submit_update => 1,
-            username => 'unregistered@example.com',
+            username_register => 'unregistered@example.com',
             update        => 'Update from an unregistered user',
             add_alert     => undef,
             name          => 'Unreg User',
@@ -394,6 +395,7 @@ for my $test (
         desc => 'submit an update for a non registered user and sign up',
         initial_values => {
             name          => '',
+            username_register => '',
             username => '',
             may_show_name => undef,
             add_alert     => 1,
@@ -407,7 +409,7 @@ for my $test (
         },
         form_values => {
             submit_update => 1,
-            username => 'unregistered@example.com',
+            username_register => 'unregistered@example.com',
             update        => "update from an\r\n\r\nunregistered user",
             add_alert     => 1,
             name          => 'Unreg User',
@@ -465,14 +467,14 @@ for my $test (
 
         ok $update, 'found update in database';
         is $update->state, 'unconfirmed', 'update unconfirmed';
-        is $update->user->email, $details->{username}, 'update email';
+        is $update->user->email, $details->{username_register}, 'update email';
         is $update->text, $details->{update}, 'update text';
         is $add_alerts, $details->{add_alert} ? 1 : 0, 'do not sign up for alerts';
 
         $mech->get_ok( $url );
         $mech->content_contains("/report/$report_id#update_$update_id");
 
-        my $unreg_user = FixMyStreet::DB->resultset( 'User' )->find( { email => $details->{username} } );
+        my $unreg_user = FixMyStreet::DB->resultset( 'User' )->find( { email => $details->{username_register} } );
 
         ok $unreg_user, 'found user';
 
@@ -497,6 +499,7 @@ for my $test (
         desc => 'overriding email confirmation allows report confirmation with no email sent',
         initial_values => {
             name          => '',
+            username_register => '',
             username => '',
             may_show_name => undef,
             add_alert     => 1,
@@ -510,7 +513,7 @@ for my $test (
         },
         form_values => {
             submit_update => 1,
-            username => 'unregistered@example.com',
+            username_register => 'unregistered@example.com',
             update        => "update no email confirm",
             add_alert     => 1,
             name          => 'Unreg User',
@@ -562,10 +565,10 @@ for my $test (
 
         ok $update, 'found update in database';
         is $update->state, 'confirmed', 'update confirmed';
-        is $update->user->email, $details->{username}, 'update email';
+        is $update->user->email, $details->{username_register}, 'update email';
         is $update->text, $details->{update}, 'update text';
 
-        my $unreg_user = FixMyStreet::DB->resultset( 'User' )->find( { email => $details->{username} } );
+        my $unreg_user = FixMyStreet::DB->resultset( 'User' )->find( { email => $details->{username_register} } );
 
         ok $unreg_user, 'found user';
 
@@ -1323,7 +1326,7 @@ subtest 'submit an update for a registered user, creating update by email' => su
     $mech->submit_form_ok( {
         with_fields => {
             submit_update => 1,
-            username => $user->email,
+            username_register => $user->email,
             update        => 'Update from a user',
             add_alert     => undef,
             name          => 'New Name',
@@ -1772,7 +1775,7 @@ for my $test (
         fields => {
             submit_update => 1,
             name          => 'Test User',
-            username => $report->user->email,
+            username_register => $report->user->email,
             may_show_name => 1,
             update        => 'update from owner',
             add_alert     => undef,
@@ -1794,7 +1797,7 @@ for my $test (
             submit_update => 1,
             name          => 'Test User',
             may_show_name => 1,
-            username => $report->user->email,
+            username_register => $report->user->email,
             update        => 'update from owner',
             add_alert     => undef,
             fixed         => 1,
@@ -1859,7 +1862,7 @@ for my $test (
         my $update = $report->comments->first;
         ok $update, 'found update';
         is $update->text, $results->{update}, 'update text';
-        is $update->user->email, $test->{fields}->{username}, 'update user';
+        is $update->user->email, $test->{fields}->{username_register}, 'update user';
         is $update->state, 'unconfirmed', 'update confirmed';
         is $update->anonymous, $test->{anonymous}, 'user anonymous';
 
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index 6a7a60811..d26b10709 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -123,7 +123,7 @@ for my $test (
         cobrand => 'bromley',
         fields => {
             submit_update   => 1,
-            username => 'unregistered@example.com',
+            username_register => 'unregistered@example.com',
             update          => 'Update from an unregistered user',
             add_alert       => undef,
             first_name            => 'Unreg',
@@ -136,7 +136,7 @@ for my $test (
         cobrand => 'fixmystreet',
         fields => {
             submit_update   => 1,
-            username => 'unregistered@example.com',
+            username_register => 'unregistered@example.com',
             update          => 'Update from an unregistered user',
             add_alert       => undef,
             name            => 'Unreg User',
diff --git a/t/cobrand/form_extras.t b/t/cobrand/form_extras.t
index 3807dd56a..72c725d75 100644
--- a/t/cobrand/form_extras.t
+++ b/t/cobrand/form_extras.t
@@ -41,7 +41,7 @@ FixMyStreet::override_config {
                 detail => 'Test report details.',
                 name => 'Joe Bloggs',
                 may_show_name => '1',
-                username => 'test-1@example.com',
+                username_register => 'test-1@example.com',
                 password_register => '',
             }
         },
diff --git a/t/cobrand/hackney.t b/t/cobrand/hackney.t
index 6ab47a7ce..8022d562a 100644
--- a/t/cobrand/hackney.t
+++ b/t/cobrand/hackney.t
@@ -178,7 +178,7 @@ subtest "sends branded confirmation emails" => sub {
                     detail        => 'Test report details.',
                     photo1        => '',
                     name          => 'Joe Bloggs',
-                    username      => 'test-1@example.com',
+                    username_register => 'test-1@example.com',
                     category      => 'Roads',
                 }
             },
diff --git a/t/cobrand/isleofwight.t b/t/cobrand/isleofwight.t
index 303cdbc07..ad9017e26 100644
--- a/t/cobrand/isleofwight.t
+++ b/t/cobrand/isleofwight.t
@@ -481,7 +481,7 @@ subtest "sends branded confirmation emails" => sub {
                     detail        => 'Test report details.',
                     photo1        => '',
                     name          => 'Joe Bloggs',
-                    username      => 'test-1@example.com',
+                    username_register => 'test-1@example.com',
                     category      => 'Roads',
                 }
             },
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index 2992a37e7..c73bd01e1 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -907,7 +907,7 @@ subtest "photo must be supplied for categories that require it" => sub {
     $mech->get_ok('/report/new?lat=47.381817&lon=8.529156');
     $mech->submit_form_ok({ with_fields => {
         detail => 'Problem-Bericht',
-        username => 'user@example.org',
+        username_register => 'user@example.org',
         category => 'Graffiti - photo required',
     }});
     is $mech->res->code, 200, "missing photo shouldn't return anything but 200";
diff --git a/templates/web/base/contact/enquiry/index.html b/templates/web/base/contact/enquiry/index.html
index 33bdbed5a..b19c5181b 100644
--- a/templates/web/base/contact/enquiry/index.html
+++ b/templates/web/base/contact/enquiry/index.html
@@ -19,7 +19,7 @@
         [% IF field_errors.username_register %]
            <div class="form-error">[% field_errors.username_register %]</div>
         [% END %]
-        <input type="text" class="form-control required email" name="username" id="form_email" [% "disabled" IF c.user.email %] value="[% ( email OR c.user.email ) | html %]" size="30">
+        <input type="text" class="form-control required email" name="username_register" id="form_email" [% "disabled" IF c.user.email %] value="[% ( email OR c.user.email ) | html %]" size="30">
 
         <div class="form-group">
           <label for="form_phone">[% loc('Your phone number') %]</label>
diff --git a/templates/web/base/report/form/user_loggedout_email.html b/templates/web/base/report/form/user_loggedout_email.html
index f3163dc5c..db3604d54 100644
--- a/templates/web/base/report/form/user_loggedout_email.html
+++ b/templates/web/base/report/form/user_loggedout_email.html
@@ -2,18 +2,17 @@
 [% IF c.config.SMS_AUTHENTICATION %]
     [% SET username_label = loc('Your email or mobile') %]
     [% SET username_type = 'text' %]
-    [% SET username_value = object.user.username %]
 [% ELSE %]
     [% SET username_label = loc('Your email') %]
     [% SET username_type = 'email' %]
-    [% SET username_value = object.user.email %]
 [% END %]
+[% SET username_field = (name == 'username_sign_in') ? 'username' : name ~%]
 
 <label for="form_[% name %]">[% username_label %]</label>
 [% IF field_errors.$name %]
     <p class='form-error'>[% field_errors.$name %]</p>
 [% END %]
-<input type="[% username_type %]" name="username" id="form_[% name %]"
-       value="[% username_value | html %]"
+<input type="[% username_type %]" name="[% username_field %]" id="form_[% name %]"
+       value="[% c.get_param(username_field) %]"
     class="form-control required">
 <!-- /user_loggedout_email.html -->
diff --git a/templates/web/bromley/report/form/user_loggedout_email.html b/templates/web/bromley/report/form/user_loggedout_email.html
index 5672dbc43..e7f08a4a8 100644
--- a/templates/web/bromley/report/form/user_loggedout_email.html
+++ b/templates/web/bromley/report/form/user_loggedout_email.html
@@ -1,12 +1,11 @@
 [% IF c.config.SMS_AUTHENTICATION %]
     [% SET username_label = loc('Your email or mobile') %]
     [% SET username_type = 'text' %]
-    [% SET username_value = object.user.username %]
 [% ELSE %]
     [% SET username_label = loc('Your email') %]
     [% SET username_type = 'email' %]
-    [% SET username_value = object.user.email %]
 [% END %]
+[% SET username_field = (name == 'username_sign_in') ? 'username' : 'username_register' ~%]
 
 <label for="form_[% name %]">[% loc('Email' ) %]
   [% IF type == 'update' %]
@@ -16,6 +15,6 @@
 [% IF field_errors.$name %]
     <p class='form-error'>[% field_errors.$name %]</p>
 [% END %]
-<input type="[% username_type %]" name="username" id="form_[% name %]"
-       value="[% username_value | html %]"
+<input type="[% username_type %]" name="[% username_field %]" id="form_[% name %]"
+       value="[% c.get_param(username_field) %]"
     class="form-control required">
diff --git a/templates/web/zurich/report/new/fill_in_details_form.html b/templates/web/zurich/report/new/fill_in_details_form.html
index b2861bf40..8d840c43e 100644
--- a/templates/web/zurich/report/new/fill_in_details_form.html
+++ b/templates/web/zurich/report/new/fill_in_details_form.html
@@ -54,7 +54,7 @@
                 [% IF field_errors.username_register %]
                     <p class='form-error'>[% field_errors.username_register %]</p>
                 [% END %]
-                <input class="form-control" type="email" value="[% email | html %]" name="username" id="form_username_register" required>
+                <input class="form-control" type="email" value="[% email | html %]" name="username_register" id="form_username_register" required>
 
                 <label for="form_name">[% loc('Name') %] [% loc('(optional)') %]</label>
                 [% IF field_errors.name %]
-- 
cgit v1.2.3


From 82a3e9bfcf094538db75755f63984a428670dedd Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 25 Sep 2020 12:10:32 +0100
Subject: Make sure JS error is not within segmented control

---
 web/cobrands/fixmystreet/fixmystreet.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 09f4f49a3..40ff03912 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -316,7 +316,11 @@ $.extend(fixmystreet.set_up, {
         errorElement: 'div',
         errorClass: 'form-error',
         errorPlacement: function( error, element ) {
-            element.before( error );
+            if (element.parent().hasClass('segmented-control')) {
+                element.parent().before( error );
+            } else {
+                element.before( error );
+            }
         },
         submitHandler: function(form) {
             if (form.submit_problem) {
-- 
cgit v1.2.3


From 2abe443efb8bbbd7cf3048eec271fd28a777932f Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 11 Sep 2020 18:11:03 +0100
Subject: Show error if text confirmation code sending fails

---
 perllib/FixMyStreet/App/Controller/Report/New.pm   |  5 +++
 .../FixMyStreet/App/Controller/Report/Update.pm    |  5 +++
 t/app/controller/report_new_text.t                 | 14 +++++++
 t/app/controller/report_update_text.t              | 47 ++++++++++++----------
 4 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index ad2649aa3..d676e2856 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -1340,6 +1340,11 @@ sub send_problem_confirm_text : Private {
 
     $data->{id} = $report->id;
     $c->forward('/auth/phone/send_token', [ $data, 'problem', $report->user->phone ]);
+    my $error = $c->render_fragment( 'auth/_username_error.html', { default => 'phone' });
+    if ($error) {
+        $c->stash->{field_errors}{phone} = $error;
+        $c->forward('generate_map');
+    }
     $c->stash->{submit_url} = '/report/new/text';
 }
 
diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index 02d3d2ae8..2acafc654 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -592,6 +592,11 @@ sub send_confirmation_text : Private {
     my ( $self, $c ) = @_;
     my $update = $c->stash->{update};
     $c->forward('/auth/phone/send_token', [ $c->stash->{token_data}, 'comment', $update->user->phone ]);
+    my $error = $c->render_fragment( 'auth/_username_error.html', { default => 'phone' });
+    if ($error) {
+        $c->stash->{field_errors}{username_register} = $error;
+        $c->go( '/report/display', [ $c->stash->{problem}->id ], [] );
+    }
     $c->stash->{submit_url} = '/report/update/text';
 }
 
diff --git a/t/app/controller/report_new_text.t b/t/app/controller/report_new_text.t
index 8753e7e20..fa012c6ae 100644
--- a/t/app/controller/report_new_text.t
+++ b/t/app/controller/report_new_text.t
@@ -72,6 +72,19 @@ foreach my $test (
         },
         errors => [ 'Please enter a mobile number', ],
     },
+    {
+        msg => 'number that fails',
+        pc => 'EH1 1BB',
+        fields => {
+            update_method => 'phone', phone => '+18165550101', email => '',
+            %defaults,
+        },
+        changes => {
+            username => '',
+            phone => '+1 816-555-0101',
+        },
+        errors => [ 'Sending a confirmation text failed: "Unable to send (21408)"' ],
+    },
   )
 {
     subtest "check form errors where $test->{msg}" => sub {
@@ -82,6 +95,7 @@ foreach my $test (
             MAPIT_URL => 'http://mapit.uk/',
             SMS_AUTHENTICATION => 1,
             PHONE_COUNTRY => 'GB',
+            TWILIO_ACCOUNT_SID => 'AC123',
         }, sub {
             $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
                 "submit location" );
diff --git a/t/app/controller/report_update_text.t b/t/app/controller/report_update_text.t
index 3f9a73773..fbf5ca0c6 100644
--- a/t/app/controller/report_update_text.t
+++ b/t/app/controller/report_update_text.t
@@ -58,22 +58,25 @@ my $comment = FixMyStreet::DB->resultset('Comment')->find_or_create( {
 my $comment_id = $comment->id;
 ok $comment, "created test update - $comment_id";
 
+my %defaults = (
+    username => '',
+    update => 'Update',
+    name => 'Name',
+    photo1 => '',
+    photo2 => '',
+    photo3 => '',
+    fixed => undef,
+    add_alert => 1,
+    may_show_name => undef,
+    password_sign_in => '',
+    password_register => '',
+);
 for my $test (
     {
         desc => 'Invalid phone',
         fields => {
             username_register => '01214960000000',
-            username => '',
-            update => 'Update',
-            name => 'Name',
-            photo1 => '',
-            photo2 => '',
-            photo3 => '',
-            fixed => undef,
-            add_alert => 1,
-            may_show_name => undef,
-            password_sign_in => '',
-            password_register => '',
+            %defaults,
         },
         changes => {},
         field_errors => [ 'Please check your phone number is correct' ]
@@ -82,21 +85,20 @@ for my $test (
         desc => 'landline number',
         fields => {
             username_register => '01214960000',
-            username => '',
-            update => 'Update',
-            name => 'Name',
-            photo1 => '',
-            photo2 => '',
-            photo3 => '',
-            fixed => undef,
-            add_alert => 1,
-            may_show_name => undef,
-            password_register => '',
-            password_sign_in => '',
+            %defaults,
         },
         changes => {},
         field_errors => [ 'Please enter a mobile number' ]
     },
+    {
+        desc => 'fails to send',
+        fields => {
+            username_register => '+18165550101',
+            %defaults,
+        },
+        changes => {},
+        field_errors => [ 'Sending a confirmation text failed: "Unable to send (21408)"' ]
+    },
   )
 {
     subtest "submit an update - $test->{desc}" => sub {
@@ -104,6 +106,7 @@ for my $test (
 
         FixMyStreet::override_config {
             SMS_AUTHENTICATION => 1,
+            TWILIO_ACCOUNT_SID => 'AC123',
             PHONE_COUNTRY => 'GB',
         }, sub {
             $mech->submit_form_ok( { with_fields => $test->{fields} }, 'submit update' );
-- 
cgit v1.2.3


From ba768bd5f31544dd0ecbc5f910def42debe02129 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Tue, 15 Sep 2020 13:32:11 +0100
Subject: [UK] "Search tips" message when there are no location search results

UK cobrands now display UK-specific postcode/address search tips, when
the geocoder returns no results. This should hopefully help people
tweak their search, to return a better result next time.

The tips are based on findings from a study we ran on geocoder misses
across all UK cobrands over March, April, May, and June 2020.
---
 CHANGELOG.md                                       |  1 +
 templates/web/base/around/postcode_form.html       |  2 +-
 .../around/location_error.html                     |  1 +
 .../web/fixmystreet.com/around/location_error.html | 31 +++++++++
 web/cobrands/bathnes/_colours.scss                 |  3 +
 web/cobrands/bexley/_colours.scss                  |  2 +
 web/cobrands/borsetshire/_colours.scss             |  4 ++
 web/cobrands/bristol/_colours.scss                 |  6 ++
 web/cobrands/bristol/base.scss                     |  4 ++
 web/cobrands/bromley/_colours.scss                 |  2 +
 web/cobrands/buckinghamshire/_colours.scss         |  4 ++
 web/cobrands/cheshireeast/_colours.scss            |  5 ++
 web/cobrands/cheshireeast/base.scss                |  4 ++
 web/cobrands/eastherts/_colours.scss               |  5 ++
 web/cobrands/fixmystreet.com/base.scss             |  1 -
 web/cobrands/fixmystreet.com/layout.scss           |  4 ++
 web/cobrands/greenwich/_colours.scss               |  4 ++
 web/cobrands/hackney/_colours.scss                 |  8 ++-
 web/cobrands/hart/_colours.scss                    |  3 +
 web/cobrands/highwaysengland/_colours.scss         |  6 ++
 web/cobrands/hounslow/_colours.scss                |  4 ++
 web/cobrands/isleofwight/_colours.scss             |  3 +
 web/cobrands/lincolnshire/_colours.scss            |  6 ++
 web/cobrands/northamptonshire/_colours.scss        |  4 ++
 web/cobrands/oxfordshire/_colours.scss             |  4 ++
 web/cobrands/oxfordshire/base.scss                 |  7 ++
 web/cobrands/oxfordshire/layout.scss               |  5 ++
 web/cobrands/peterborough/_colours.scss            |  6 ++
 web/cobrands/sass/_base.scss                       |  1 +
 web/cobrands/sass/_search-help.scss                | 78 ++++++++++++++++++++++
 web/cobrands/stevenage/_colours.scss               |  3 +
 web/cobrands/tfl/_colours.scss                     |  5 ++
 web/cobrands/warwickshire/_colours.scss            |  6 ++
 web/cobrands/westminster/_colours.scss             |  7 +-
 34 files changed, 235 insertions(+), 4 deletions(-)
 create mode 120000 templates/web/fixmystreet-uk-councils/around/location_error.html
 create mode 100644 templates/web/fixmystreet.com/around/location_error.html
 create mode 100644 web/cobrands/sass/_search-help.scss

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9c5605a2..de2f75664 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@
         - Rewrite open311-update-reports to share code and improve functionality.
     - UK:
         - Add option for recaptcha. #3050
+        - Display search tips when location search returns no results. #3180
 
 * v3.0.1 (6th May 2020)
     - New features:
diff --git a/templates/web/base/around/postcode_form.html b/templates/web/base/around/postcode_form.html
index 60fa1a703..d682bbdca 100644
--- a/templates/web/base/around/postcode_form.html
+++ b/templates/web/base/around/postcode_form.html
@@ -35,7 +35,7 @@
         %]
         <a href="[% c.uri_for('/around', link_params) | html %]" id="geolocate_link">&hellip; [% loc('or use my location') %]</a>
 
-        [% UNLESS possible_location_matches %]
+        [% UNLESS possible_location_matches OR location_error_pc_lookup %]
             [% INCLUDE 'around/_postcode_form_post.html' %]
         [% END %]
     </div>
diff --git a/templates/web/fixmystreet-uk-councils/around/location_error.html b/templates/web/fixmystreet-uk-councils/around/location_error.html
new file mode 120000
index 000000000..970e242fb
--- /dev/null
+++ b/templates/web/fixmystreet-uk-councils/around/location_error.html
@@ -0,0 +1 @@
+../../fixmystreet.com/around/location_error.html
\ No newline at end of file
diff --git a/templates/web/fixmystreet.com/around/location_error.html b/templates/web/fixmystreet.com/around/location_error.html
new file mode 100644
index 000000000..4e4ac8736
--- /dev/null
+++ b/templates/web/fixmystreet.com/around/location_error.html
@@ -0,0 +1,31 @@
+[% IF location_error_pc_lookup %]
+
+    <div class="search-help">
+        <h2 class="search-help__header" role="alert">
+            [% location_error | safe %]
+        </h2>
+
+        <div class="search-help__tips">
+            <div class="search-help__tips__category">
+                <h3>[% loc('Searching by postcode?') %]</h3>
+                <ul>
+                    <li>[% loc('Check you <strong>haven’t swapped numbers and letters</strong>. <code>O</code>, <code>0</code>, <code>I</code> and <code>1</code> aren’t the same.') %]</li>
+                    <li>[% loc('<strong>Don’t forget the space</strong> in your postcode.') %]</li>
+                    <li>[% loc('<strong>Don’t mix postcodes and street names.</strong>') %]</li>
+                </ul>
+            </div>
+            <div class="search-help__tips__category">
+                <h3>[% loc('Searching by street name?') %]</h3>
+                <ul>
+                    <li>[% loc('<strong>One at a time!</strong> Multiple street names in a single search can confuse us.') %]</li>
+                    <li>[% loc('If you’re <strong>not sure on the spelling</strong>, try another nearby street you <em>are</em> sure about, then trace your way back on our map.') %]</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
+[% ELSE %]
+
+    <p class="form-error">[% location_error | safe %]</p>
+
+[% END %]
diff --git a/web/cobrands/bathnes/_colours.scss b/web/cobrands/bathnes/_colours.scss
index c9503ae04..9021a0562 100644
--- a/web/cobrands/bathnes/_colours.scss
+++ b/web/cobrands/bathnes/_colours.scss
@@ -42,3 +42,6 @@ $front_main_background: $bathnes-primary;
 
 $menu-image: 'menu-black';
 $header-top-border: false;
+
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
diff --git a/web/cobrands/bexley/_colours.scss b/web/cobrands/bexley/_colours.scss
index 453623fb5..4b78a39f7 100644
--- a/web/cobrands/bexley/_colours.scss
+++ b/web/cobrands/bexley/_colours.scss
@@ -51,3 +51,5 @@ $header-top-border: false;
 $heading-font: Lato, sans-serif;
 $body-font: Lato, sans-serif;
 $meta-font: $body-font;
+
+$search-help-background: #fff3f3;
diff --git a/web/cobrands/borsetshire/_colours.scss b/web/cobrands/borsetshire/_colours.scss
index 45936ddb9..5cdda2401 100644
--- a/web/cobrands/borsetshire/_colours.scss
+++ b/web/cobrands/borsetshire/_colours.scss
@@ -34,3 +34,7 @@ $mappage-header-height: 5em; // 3em #site-logo plus 1em padding top and bottom
 $body-font: Cabin, "Calibri", "Gill Sans", "Gill Sans MT", sans-serif;
 $meta-font: $body-font;
 $heading-font: $body-font;
+
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
diff --git a/web/cobrands/bristol/_colours.scss b/web/cobrands/bristol/_colours.scss
index cd87161a8..c4ff28f9f 100644
--- a/web/cobrands/bristol/_colours.scss
+++ b/web/cobrands/bristol/_colours.scss
@@ -33,3 +33,9 @@ $header-top-border: false;
 
 $col_click_map: $g1;
 $col_click_map_dark: darken($g1, 10%);
+
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-header-font-weight: normal;
+$search-help-header-font-size-desktop: 1.25em;
+$search-help-margin-desktop: -1em -1em 0 -1em;
diff --git a/web/cobrands/bristol/base.scss b/web/cobrands/bristol/base.scss
index cbd5ee081..bce22f3a3 100644
--- a/web/cobrands/bristol/base.scss
+++ b/web/cobrands/bristol/base.scss
@@ -118,3 +118,7 @@ label {
     color: $g7 !important;
     font-weight: bold !important;
 }
+
+b, strong {
+  @extend %bold-font;
+}
diff --git a/web/cobrands/bromley/_colours.scss b/web/cobrands/bromley/_colours.scss
index 53f6bc2c6..1edec0e9b 100644
--- a/web/cobrands/bromley/_colours.scss
+++ b/web/cobrands/bromley/_colours.scss
@@ -30,3 +30,5 @@ $header-top-border-width: 4px;
 
 // Override the container width to match Bromley' site, which is wider
 $container-max-width: 1200px;
+
+$search-help-header-font-size-desktop: 1.25em;
diff --git a/web/cobrands/buckinghamshire/_colours.scss b/web/cobrands/buckinghamshire/_colours.scss
index cf328b673..7350e8f33 100644
--- a/web/cobrands/buckinghamshire/_colours.scss
+++ b/web/cobrands/buckinghamshire/_colours.scss
@@ -55,6 +55,10 @@ $col_click_map_dark: darken($bucks_charcoal, 10%);
 $header-top-border-width: 0;
 $header-top-border: 0;
 
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
+
 @mixin bucks-button {
   background-color: $bucks_button_bg;
   border: 0;
diff --git a/web/cobrands/cheshireeast/_colours.scss b/web/cobrands/cheshireeast/_colours.scss
index e0bc13b08..2dbc353c9 100644
--- a/web/cobrands/cheshireeast/_colours.scss
+++ b/web/cobrands/cheshireeast/_colours.scss
@@ -43,3 +43,8 @@ $header-top-border: false;
 $heading-font: 'Open Sans', sans-serif;
 $body-font: 'Open Sans', sans-serif;
 $meta-font: $body-font;
+
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
+$search-help-margin-desktop: 0;
diff --git a/web/cobrands/cheshireeast/base.scss b/web/cobrands/cheshireeast/base.scss
index c0d798c3a..b4174c100 100644
--- a/web/cobrands/cheshireeast/base.scss
+++ b/web/cobrands/cheshireeast/base.scss
@@ -112,6 +112,10 @@ a#geolocate_link {
   }
 }
 
+.search-help__header {
+    line-height: 1.3;
+}
+
 /* Header/footer */
 
 #site-logo {
diff --git a/web/cobrands/eastherts/_colours.scss b/web/cobrands/eastherts/_colours.scss
index 84ef39bd1..f365c28e6 100644
--- a/web/cobrands/eastherts/_colours.scss
+++ b/web/cobrands/eastherts/_colours.scss
@@ -35,3 +35,8 @@ $container-max-width: 70.5em; // match 1128px row width in East Herts template
 $eh-header-height: 84px + 16px + 16px;
 $eh-nav-height: 48px;
 $mappage-header-height: $eh-header-height + $eh-nav-height;
+
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
+$search-help-margin-desktop: 0;
diff --git a/web/cobrands/fixmystreet.com/base.scss b/web/cobrands/fixmystreet.com/base.scss
index f261e677d..475d4dc4e 100644
--- a/web/cobrands/fixmystreet.com/base.scss
+++ b/web/cobrands/fixmystreet.com/base.scss
@@ -176,7 +176,6 @@ svg|g.site-logo__svg {
   border-bottom: none;
 }
 
-
 $mysoc-footer-background-color: #222;
 $mysoc-footer-text-color: #acacac;
 $mysoc-footer-site-name-text-color: #fff;
diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss
index e6a862f73..852b0857f 100644
--- a/web/cobrands/fixmystreet.com/layout.scss
+++ b/web/cobrands/fixmystreet.com/layout.scss
@@ -172,6 +172,10 @@ a#geolocate_link {
     }
 }
 
+.search-help__header {
+    font-family: inherit;
+}
+
 body.frontpage {
     #site-logo {
         margin: 2em 0;
diff --git a/web/cobrands/greenwich/_colours.scss b/web/cobrands/greenwich/_colours.scss
index 973767a2d..41c3891e3 100644
--- a/web/cobrands/greenwich/_colours.scss
+++ b/web/cobrands/greenwich/_colours.scss
@@ -24,3 +24,7 @@ $col_big_numbers: $primary;
 $col_click_map: $greenwich_red;
 
 $container-max-width: 990px;
+
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
diff --git a/web/cobrands/hackney/_colours.scss b/web/cobrands/hackney/_colours.scss
index 4c0af7b03..464733a40 100644
--- a/web/cobrands/hackney/_colours.scss
+++ b/web/cobrands/hackney/_colours.scss
@@ -42,4 +42,10 @@ $montserrat: 'Montserrat', Arial, sans-serif;
 
 $heading-font: $montserrat;
 $body-font: $montserrat;
-$meta-font: $montserrat;
\ No newline at end of file
+$meta-font: $montserrat;
+
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
+$search-help-margin: 0 -1em;
+$search-help-margin-desktop: 0 -1em;
diff --git a/web/cobrands/hart/_colours.scss b/web/cobrands/hart/_colours.scss
index 321b893ad..568ba66f1 100644
--- a/web/cobrands/hart/_colours.scss
+++ b/web/cobrands/hart/_colours.scss
@@ -26,3 +26,6 @@ $mappage-header-height: 173px + 32px;
 $header-top-border: false;
 
 $container-max-width: 60em;
+
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
diff --git a/web/cobrands/highwaysengland/_colours.scss b/web/cobrands/highwaysengland/_colours.scss
index 4b7d46453..d8b30aed6 100644
--- a/web/cobrands/highwaysengland/_colours.scss
+++ b/web/cobrands/highwaysengland/_colours.scss
@@ -40,3 +40,9 @@ $mappage-header-height: 5.75em;
 $body-font: "proxima-nova", "Proxima Nova", Montserrat, Arial, sans-serif;
 $heading-font: $body-font;
 $meta-font: $body-font;
+
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
+$search-help-margin: 0 -1em;
+$search-help-margin-desktop: 0 -1em;
diff --git a/web/cobrands/hounslow/_colours.scss b/web/cobrands/hounslow/_colours.scss
index 622055e82..0fb3d985a 100644
--- a/web/cobrands/hounslow/_colours.scss
+++ b/web/cobrands/hounslow/_colours.scss
@@ -38,3 +38,7 @@ $header-top-border: false;
 $heading-font: InfoText, Frutiger, Arial, sans-serif;
 $body-font: Frutiger, Arial, sans-serif;
 $meta-font: $body-font;
+
+$search-help-background: #fff3f3;
+$search-help-header-background: $red;
+$search-help-header-font-size-desktop: 1.25em;
\ No newline at end of file
diff --git a/web/cobrands/isleofwight/_colours.scss b/web/cobrands/isleofwight/_colours.scss
index 511fcef02..e1334bcb1 100644
--- a/web/cobrands/isleofwight/_colours.scss
+++ b/web/cobrands/isleofwight/_colours.scss
@@ -31,3 +31,6 @@ $header-top-border: false;
 $body-font: Helvetica, Arial, sans-serif;
 $heading-font: $body-font;
 $meta-font: $body-font;
+
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
diff --git a/web/cobrands/lincolnshire/_colours.scss b/web/cobrands/lincolnshire/_colours.scss
index 8d8ad2bf4..8e80d374a 100644
--- a/web/cobrands/lincolnshire/_colours.scss
+++ b/web/cobrands/lincolnshire/_colours.scss
@@ -49,3 +49,9 @@ $menu-image: 'menu-black';
 
 $front_main_background: white;
 // $header-top-border: false;
+
+$search-help-alignment: left;
+$search-help-header-color: $lincs-pop;
+$search-help-header-background: transparent;
+$search-help-header-font-size-desktop: 1.25em;
+$search-help-margin-desktop: -2em -2em 0 -2em;
diff --git a/web/cobrands/northamptonshire/_colours.scss b/web/cobrands/northamptonshire/_colours.scss
index 17c7822fb..bb2e0a654 100644
--- a/web/cobrands/northamptonshire/_colours.scss
+++ b/web/cobrands/northamptonshire/_colours.scss
@@ -30,3 +30,7 @@ $header-top-border: false;
 $heading-font: PraterSansWeb, sans-serif;
 $body-font: "Open Sans", Arial, "Helvetica Neue", Helvetica, sans-serif;
 $meta-font: $body-font;
+
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
+$search-help-header-font-family: inherit;
diff --git a/web/cobrands/oxfordshire/_colours.scss b/web/cobrands/oxfordshire/_colours.scss
index d52571721..535b3757a 100644
--- a/web/cobrands/oxfordshire/_colours.scss
+++ b/web/cobrands/oxfordshire/_colours.scss
@@ -42,3 +42,7 @@ $header-top-border: false;
 $form-control-border-color: #525252;
 
 $pin_prefix: '/cobrands/oxfordshire/images/';
+
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-margin-desktop: -2em 0 0 0;
\ No newline at end of file
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index fefbc619e..243e6aa52 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -141,6 +141,13 @@ ol.big-numbers {
         margin-bottom: 1em;
         padding-bottom: 5px;
     }
+
+    // Overloaded selector, to override `.content h2`
+    h2.search-help__header {
+        margin-bottom: 0;
+        padding-bottom: 1rem;
+        font-size: 1em;
+    }
 }
 
 dd, p {
diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss
index 91ea8c4d1..e6490910f 100644
--- a/web/cobrands/oxfordshire/layout.scss
+++ b/web/cobrands/oxfordshire/layout.scss
@@ -136,6 +136,11 @@ $mappage-header-height: 10em;
     .content h2 {
         font-size: 2em;
     }
+
+    // Overloaded selector, to override `.content h2`
+    h2.search-help__header {
+        font-size: 20px;
+    }
 }
 
 #front_stats {
diff --git a/web/cobrands/peterborough/_colours.scss b/web/cobrands/peterborough/_colours.scss
index 8211d8835..9b2a0b6bb 100644
--- a/web/cobrands/peterborough/_colours.scss
+++ b/web/cobrands/peterborough/_colours.scss
@@ -44,3 +44,9 @@ $roboto: 'Roboto', Arial, sans-serif;
 $heading-font: $roboto;
 $body-font: $roboto;
 $meta-font: $roboto;
+
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-margin: 1em -1em 0 -1em;
+$search-help-margin-desktop: -2em -1em 0 -1em;
+$search-help-header-font-size-desktop: 1.25em;
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 2992f3f65..b5830ebfd 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -2829,3 +2829,4 @@ $nicetable-hover-background: rgba($primary, 0.15) !default;
 @import "_autocomplete";
 @import "_dashboard";
 @import "_top-banner";
+@import "_search-help";
diff --git a/web/cobrands/sass/_search-help.scss b/web/cobrands/sass/_search-help.scss
new file mode 100644
index 000000000..43bbf5a9e
--- /dev/null
+++ b/web/cobrands/sass/_search-help.scss
@@ -0,0 +1,78 @@
+$search-help-alignment: center !default;
+$search-help-background: transparent !default;
+$search-help-color: inherit !default;
+$search-help-margin: -1em -1em 0 -1em !default; // overlap .container padding
+$search-help-margin-desktop: -1em -1em -2em -1em !default; // overlap .content and .tablewrapper padding-bottoms
+$search-help-header-background: #DB3914 !default;
+$search-help-header-color: #fff !default;
+$search-help-header-font-weight: bold !default;
+$search-help-header-font-size: 1em !default;
+$search-help-header-font-size-desktop: $search-help-header-font-size !default;
+$search-help-header-font-family: null !default;
+
+.search-help {
+    margin: $search-help-margin;
+    background: $search-help-background;
+    color: $search-help-color;
+
+    // Override greedy `.tablewrapper > div` styles
+    .tablewrapper > & {
+        display: block;
+        width: auto;
+    }
+
+    @media (min-width: 48em) {
+        margin: $search-help-margin-desktop;
+    }
+}
+
+.search-help__header {
+    margin: 0;
+    text-align: $search-help-alignment;
+    background: $search-help-header-background;
+    color: $search-help-header-color;
+    font-family: $search-help-header-font-family;
+    font-weight: $search-help-header-font-weight;
+    font-size: $search-help-header-font-size;
+    padding: 1em; // IE8
+    padding: 1rem;
+
+    @media (min-width: 48em) {
+        font-size: $search-help-header-font-size-desktop;
+    }
+}
+
+.search-help__tips {
+    overflow: auto; // expand to include margin-bottom on last child
+
+    @media (min-width: 48em) {
+        @include flex-container();
+        @if ( $search-help-alignment == left ) {
+            @include justify-content(flex-start);
+        } @else if ( $search-help-alignment == right ) {
+            @include justify-content(flex-end);
+        } @else {
+            @include justify-content(center);
+            padding: 1em 0;
+        }
+    }
+
+    h3 {
+        margin-top: 0;
+        text-align: $search-help-alignment;
+    }
+}
+
+.search-help__tips__category {
+    margin: 1em;
+
+    @media (min-width: 48em) {
+        max-width: 20em;
+    }
+
+    ul {
+        margin-bottom: 0;
+        font-size: 0.875em;
+        margin-left: 1em;
+    }
+}
diff --git a/web/cobrands/stevenage/_colours.scss b/web/cobrands/stevenage/_colours.scss
index 0bedded8a..bdbe7281b 100644
--- a/web/cobrands/stevenage/_colours.scss
+++ b/web/cobrands/stevenage/_colours.scss
@@ -16,3 +16,6 @@ $nav_hover_background_colour: #444;
 $col_click_map: #00BD08;
 
 $container-max-width: 984px; // to match Stevenage header width
+
+$search-help-background: #fff3f3;
+$search-help-margin-desktop: -2em -2em 0 -2em;
diff --git a/web/cobrands/tfl/_colours.scss b/web/cobrands/tfl/_colours.scss
index b175dcd26..3e232b443 100644
--- a/web/cobrands/tfl/_colours.scss
+++ b/web/cobrands/tfl/_colours.scss
@@ -50,6 +50,11 @@ $col_fixed_label_dark: #4B8304;
 
 $header-top-border: false;
 
+$search-help-alignment: left;
+$search-help-background: $red-light;
+$search-help-header-background: $red;
+$search-help-margin-desktop: -1em -1em 0em -1em;
+
 @mixin tflbutton {
   background: $beck-blue;
   border-radius: 22.5px;
diff --git a/web/cobrands/warwickshire/_colours.scss b/web/cobrands/warwickshire/_colours.scss
index aac759179..760d919a4 100644
--- a/web/cobrands/warwickshire/_colours.scss
+++ b/web/cobrands/warwickshire/_colours.scss
@@ -32,3 +32,9 @@ $header-top-border: false;
 $mappage-header-height: 5em;
 
 $container-max-width: 78em;
+
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-margin-desktop: 1em -1em 0 -1em;
+$search-help-header-background: $warwickshire-red;
+$search-help-header-font-size-desktop: 1.25em;
diff --git a/web/cobrands/westminster/_colours.scss b/web/cobrands/westminster/_colours.scss
index be1779daa..8850593c2 100644
--- a/web/cobrands/westminster/_colours.scss
+++ b/web/cobrands/westminster/_colours.scss
@@ -35,4 +35,9 @@ $meta-font: $body-font;
 
 $mappage-header-height: 4.5em;
 
-$high-dpi-screen: '-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi';
\ No newline at end of file
+$high-dpi-screen: '-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi';
+
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-margin: 0 -1em;
+$search-help-margin-desktop: 1em -1em 0 -1em;
-- 
cgit v1.2.3


From f63e2feb37cc9b1e5aca60d85be166fa84eb5f9f Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Mon, 21 Sep 2020 17:07:10 +0100
Subject: TestMech->page_errors now handles error markup with leading spaces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "error" output in our new `.search-help__header` element begins and
ends with whitespace. The test really shouldn’t care about whitespace
at the start and end of HTML tags, so this commit makes page_errors
trim whitespace from the errors it passes to the tests.

Also adds `.search-help__header` as a location to find page errors!
---
 perllib/FixMyStreet/TestMech.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index 1b7fba1bd..277eca2b1 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -340,12 +340,13 @@ arrayref of TEXTs. If none found return empty arrayref.
 sub page_errors {
     my $mech   = shift;
     my $result = scraper {
-        process 'div.form-error, p.form-error, p.error, ul.error li', 'errors[]', 'TEXT';
+        process 'div.form-error, p.form-error, p.error, ul.error li, .search-help__header', 'errors[]', 'TEXT';
     }
     ->scrape( $mech->response );
     my $err = $result->{errors} || [];
     my %seen = ();
     $err = [ grep { not $seen{$_}++ } @$err ];
+    @$err = map { s/^\s+|\s+$//g; $_ } @$err;
     return $err;
 }
 
-- 
cgit v1.2.3


From b6fb09db4ff31aba28833b9e735e6c92ce9081c7 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Tue, 29 Sep 2020 09:55:24 +0100
Subject: do not trigger duplicate check with stopper check

The stopper checking code is triggered using the category_change event
which, by default also calls the duplicate check code. This meant that
when an extra question dropdown with an associated stopper was updated
the duplicate check re-ran and the duplicate reports panel was re-shown.

The invocation of category_change on the extra questions now includes
the skip_duplicates parameter to avoid this.

Fixes mysociety/fixmystreet-commercial#2007
---
 .cypress/cypress/integration/duplicates.js     | 19 +++++++++++++++++
 CHANGELOG.md                                   |  1 +
 perllib/FixMyStreet/App/Controller/Test.pm     | 28 ++++++++++++++++++++++++++
 templates/web/borsetshire/footer_extra_js.html |  6 +++++-
 web/cobrands/fixmystreet/fixmystreet.js        |  2 +-
 5 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/.cypress/cypress/integration/duplicates.js b/.cypress/cypress/integration/duplicates.js
index 3dba5e38a..c0e0d8004 100644
--- a/.cypress/cypress/integration/duplicates.js
+++ b/.cypress/cypress/integration/duplicates.js
@@ -77,4 +77,23 @@ describe('Duplicate tests', function() {
       cy.get('#js-duplicate-reports li h3 a').should('have.attr', 'href', '/report/1');
     });
 
+    it('does not redisplay duplicates when stopper questions are changed', function() {
+      cy.server();
+      cy.route('/report/new/ajax*').as('report-ajax');
+      cy.visit('http://borsetshire.localhost:3001/_test/setup/regression-duplicate-stopper'); // Server-side setup
+      cy.visit('http://borsetshire.localhost:3001/report/1');
+      cy.contains('Report another problem here').click();
+      cy.wait('@report-ajax');
+      cy.get('[id=category_group]').select('Flytipping');
+      cy.get('.extra-category-questions').should('not.be.visible');
+      cy.get('.js-hide-duplicate-suggestions:first').click();
+      cy.get('.js-hide-duplicate-suggestions:first').should('not.be.visible');
+      cy.get('.extra-category-questions').should('be.visible');
+      cy.get('[id=form_hazardous]').select('No');
+      cy.wait(500);
+      cy.get('.extra-category-questions').should('be.visible');
+      cy.get('.js-hide-duplicate-suggestions:first').should('not.be.visible');
+      cy.visit('http://borsetshire.localhost:3001/_test/teardown/regression-duplicate-stopper'); // Server-side setup
+    });
+
 });
diff --git a/CHANGELOG.md b/CHANGELOG.md
index de2f75664..2e158da8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
         - Fix lookups in templates of categories with &s.
         - Fix a few obscure asset layer changing issues.
         - Fix multiple disable messages for dropdown answers
+        - Do not trigger duplicate check when checking stoppers
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/FixMyStreet/App/Controller/Test.pm b/perllib/FixMyStreet/App/Controller/Test.pm
index 5ec4bebf3..19a8c5321 100644
--- a/perllib/FixMyStreet/App/Controller/Test.pm
+++ b/perllib/FixMyStreet/App/Controller/Test.pm
@@ -42,6 +42,25 @@ sub setup : Path('/_test/setup') : Args(1) {
         my $problem = FixMyStreet::DB->resultset("Problem")->find(1);
         $problem->update({ category => 'Skips' });
         $c->response->body("OK");
+    } elsif ( $test eq 'regression-duplicate-stopper') {
+        my $problem = FixMyStreet::DB->resultset("Problem")->find(1);
+        $problem->update({ category => 'Flytipping' });
+        my $category = FixMyStreet::DB->resultset('Contact')->search({
+            category => 'Flytipping',
+        })->first;
+        $category->push_extra_fields({
+            code => 'hazardous',
+            datatype => 'singlevaluelist',
+            description => 'Hazardous material',
+            order => 0,
+            variable => 'true',
+            values => [
+                { key => 'yes', name => 'Yes', disable => 1, disable_message => 'Please phone' },
+                { key => 'no', name => 'No' },
+            ],
+        });
+        $category->update;
+        $c->response->body("OK");
     }
 }
 
@@ -51,6 +70,15 @@ sub teardown : Path('/_test/teardown') : Args(1) {
         my $problem = FixMyStreet::DB->resultset("Problem")->find(1);
         $problem->update({ category => 'Potholes' });
         $c->response->body("OK");
+    } elsif ( $test eq 'regression-duplicate-stopper') {
+        my $problem = FixMyStreet::DB->resultset("Problem")->find(1);
+        $problem->update({ category => 'Potholes' });
+        my $category = FixMyStreet::DB->resultset('Contact')->search({
+            category => 'Flytipping',
+        })->first;
+        $category->remove_extra_field('hazardous');
+        $category->update;
+        $c->response->body("OK");
     }
 }
 
diff --git a/templates/web/borsetshire/footer_extra_js.html b/templates/web/borsetshire/footer_extra_js.html
index 3e443af71..e0dfe4995 100644
--- a/templates/web/borsetshire/footer_extra_js.html
+++ b/templates/web/borsetshire/footer_extra_js.html
@@ -2,4 +2,8 @@
     version('/cobrands/fixmystreet-uk-councils/js.js'),
     version('/cobrands/borsetshire/google_maps_style.js'),
     version('/cobrands/borsetshire/js.js'),
-) %]
+);
+IF bodyclass.match('mappage');
+   scripts.push( version('/cobrands/fixmystreet/assets.js') );
+END;
+%]
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 5485ff7c7..9161282f3 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -470,7 +470,7 @@ $.extend(fixmystreet.set_up, {
             $.each(data.disable_form.questions, function(_, question) {
                 if (question.message && question.code) {
                     $('#form_' + question.code).on('change.category', function() {
-                        $(fixmystreet).trigger('report_new:category_change');
+                        $(fixmystreet).trigger('report_new:category_change', { skip_duplicates: true } );
                     });
                 }
             });
-- 
cgit v1.2.3


From ab983c0445fde36a5338b199c7d3996580872e7c Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 7 Aug 2020 17:33:27 +0100
Subject: Enable HTML in updates from staff users

This also extends to response templates.
---
 CHANGELOG.md                                |  2 +
 docs/_includes/admin-tasks-content.md       |  9 +++
 perllib/FixMyStreet/App/View/Web.pm         | 42 +++++++++++---
 perllib/FixMyStreet/Template.pm             |  2 +
 t/app/controller/my.t                       | 23 +++++---
 t/app/controller/questionnaire.t            |  9 ++-
 t/app/controller/report_updates.t           | 87 +++++++++++++++++++++++++++++
 templates/web/base/admin/users/log.html     |  2 +-
 templates/web/base/my/my.html               |  2 +-
 templates/web/base/questionnaire/index.html |  2 +-
 templates/web/base/report/update.html       |  4 +-
 11 files changed, 161 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de2f75664..074b48bef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,8 @@
         - Add full text index to speed up admin search.
         - Offline process for CSV generation.
         - Allow inspectors to change report asset.
+        - Staff users can use HTML tags in updates. #3143
+        - Response templates can include HTML tags. #3143
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index d0d5e4935..aa1225cfc 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -825,6 +825,15 @@ Click on ‘Templates’ in the admin menu. You will see a table of existing tem
 beside the status you wish to change. You may alter any of the fields as described in the section
 above, ‘Creating a template’. Additionally you can delete the template from this page.
 
+
+#### HTML content in templates
+
+HTML tags are permitted in response templates, which makes it possible to include
+images or rich text formatting in the updates which are added to reports.
+
+Refer to the section ["HTML Content in notices"](#html-content-in-notices) above for details of
+what tags and attributes are allowed.
+
 </div>
 
 <div class="admin-task" markdown="1" id="view-statistics">
diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm
index 1e1b50094..5e38fc797 100644
--- a/perllib/FixMyStreet/App/View/Web.pm
+++ b/perllib/FixMyStreet/App/View/Web.pm
@@ -25,7 +25,7 @@ __PACKAGE__->config(
     FILTERS => {
         add_links => \&add_links,
         escape_js => \&escape_js,
-        markup => [ \&markup_factory, 1 ],
+        staff_html_markup => [ \&staff_html_markup_factory, 1 ],
     },
     COMPILE_EXT => '.ttc',
     STAT_TTL    => FixMyStreet->config('STAGING_SITE') ? 1 : 86400,
@@ -100,7 +100,7 @@ sub add_links {
     my $text = shift;
     $text = FixMyStreet::Template::conditional_escape($text);
     $text =~ s/\r//g;
-    $text =~ s{(https?://)([^\s]+)}{"<a href=\"$1$2\">$1" . _space_slash($2) . '</a>'}ge;
+    $text =~ s{(?<!["'])(https?://)([^\s]+)}{"<a href=\"$1$2\">$1" . _space_slash($2) . '</a>'}ge;
     return FixMyStreet::Template::SafeString->new($text);
 }
 
@@ -110,20 +110,44 @@ sub _space_slash {
     return $t;
 }
 
-=head2 markup_factory
+=head2 staff_html_markup_factory
 
-This returns a function that will allow updates to have markdown-style italics.
-Pass in the user that wrote the text, so we know whether it can be privileged.
+This returns a function that processes the text body of an update, applying
+HTML sanitization and markdown-style italics if it was made by a staff user.
+
+Pass in the update extra, so we can determine if it was made by a staff user.
 
 =cut
 
-sub markup_factory {
-    my ($c, $user) = @_;
+sub staff_html_markup_factory {
+    my ($c, $extra) = @_;
+
+    my $staff = $extra->{is_superuser} || $extra->{is_body_user};
+
     return sub {
         my $text = shift;
-        return $text unless $user && ($user->from_body || $user->is_superuser);
+        unless ($staff) {
+            return FixMyStreet::Template::html_paragraph(add_links($text));
+        }
+
+        $text = FixMyStreet::Template::sanitize($text);
+
+        # Apply Markdown-style italics
         $text =~ s{\*(\S.*?\S)\*}{<i>$1</i>};
-        FixMyStreet::Template::SafeString->new($text);
+
+        # Mark safe so add_links doesn't escape everything.
+        $text = FixMyStreet::Template::SafeString->new($text);
+
+        $text = add_links($text);
+
+        # If the update already has block-level elements then don't wrap
+        # individual lines in <p> elements, as we assume the user knows what
+        # they're doing.
+        unless ($text =~ /<(p|ol|ul)>/) {
+            $text = FixMyStreet::Template::html_paragraph($text);
+        }
+
+        return $text;
     }
 }
 
diff --git a/perllib/FixMyStreet/Template.pm b/perllib/FixMyStreet/Template.pm
index 6317f7552..ac9e743ff 100644
--- a/perllib/FixMyStreet/Template.pm
+++ b/perllib/FixMyStreet/Template.pm
@@ -141,6 +141,8 @@ sub html_paragraph : Filter('html_para') {
 sub sanitize {
     my $text = shift;
 
+    $text = $$text if UNIVERSAL::isa($text, 'FixMyStreet::Template::SafeString');
+ 
     my %allowed_tags = map { $_ => 1 } qw( p ul ol li br b i strong em );
     my $scrubber = HTML::Scrubber->new(
         rules => [
diff --git a/t/app/controller/my.t b/t/app/controller/my.t
index 673addf0c..85902ae1a 100644
--- a/t/app/controller/my.t
+++ b/t/app/controller/my.t
@@ -14,17 +14,12 @@ my $other_user = FixMyStreet::DB->resultset('User')->find_or_create({ email => '
 my @other = $mech->create_problems_for_body(1, 1234, 'Another Title', { user => $other_user });
 
 my $user = $mech->log_in_ok( 'test@example.com' );
-$mech->get_ok('/my');
-is $mech->uri->path, '/my', "stayed on '/my' page";
-
-$mech->content_contains('Test Title');
-$mech->content_lacks('Another Title');
-
 my @update;
 my $i = 0;
+my $staff_text = '<p>this is <script>how did this happen</script> <strong>an update</strong></p><ul><li>With</li><li>A</li><li>List</li></ul>';
 foreach ($user, $user, $other_user) {
     $update[$i] = FixMyStreet::DB->resultset('Comment')->create({
-        text => 'this is an update',
+        text => $staff_text,
         user => $_,
         state => 'confirmed',
         problem => $problems[0],
@@ -35,6 +30,20 @@ foreach ($user, $user, $other_user) {
     $i++;
 }
 
+subtest 'Check loading of /my page' => sub {
+    $mech->get_ok('/my');
+    is $mech->uri->path, '/my', "stayed on '/my' page";
+
+    $mech->content_contains('Test Title');
+    $mech->content_lacks('Another Title');
+    $mech->content_contains('&lt;p&gt;this is');
+    $mech->content_lacks('<p>this is  <strong>an update</strong></p><ul><li>With');
+
+    $update[0]->update({ extra => { is_superuser => 1 } });
+    $mech->get_ok('/my');
+    $mech->content_contains('<p>this is  <strong>an update</strong></p><ul><li>With');
+};
+
 foreach (
     { type => 'problem', id => 0, result => 404, desc => 'nothing' },
     { type => 'problem', obj => $problems[0], result => 200, desc => 'own report' },
diff --git a/t/app/controller/questionnaire.t b/t/app/controller/questionnaire.t
index b561b271a..592507288 100644
--- a/t/app/controller/questionnaire.t
+++ b/t/app/controller/questionnaire.t
@@ -351,7 +351,7 @@ my $comment = FixMyStreet::DB->resultset('Comment')->find_or_create(
         user_id    => $user->id,
         name       => 'A User',
         mark_fixed => 'false',
-        text       => 'This is some update text',
+        text       => 'This is some <strong>update</strong> text',
         state      => 'confirmed',
         confirmed  => $sent_time,
         anonymous  => 'f',
@@ -360,7 +360,12 @@ my $comment = FixMyStreet::DB->resultset('Comment')->find_or_create(
 subtest 'Check updates are shown correctly on questionnaire page' => sub {
     $mech->get_ok("/Q/" . $token->token);
     $mech->content_contains( 'Show all updates' );
-    $mech->content_contains( 'This is some update text' );
+    $mech->content_contains( 'This is some &lt;strong&gt;update&lt;/strong&gt; text' );
+};
+subtest 'Check staff update is shown correctly on questionnaire page' => sub {
+    $comment->update({ extra => { is_superuser => 1 } });
+    $mech->get_ok("/Q/" . $token->token);
+    $mech->content_contains( 'This is some <strong>update</strong> text' );
 };
 
 for my $test (
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 92cbed861..9c44abc54 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -2200,4 +2200,91 @@ subtest 'check disabling of updates per category' => sub {
     $mech->content_lacks('Provide an update');
 };
 
+subtest 'check that only staff can display HTML in updates' => sub {
+    $report->comments->delete;
+    $user->update({ from_body => undef, is_superuser => 0 });
+
+    my @lines = (
+        "This update contains:",
+        "1. <strong>some staff-allowed HTML</strong>",
+        "2. *some Markdown-style italics*",
+        "3. <script>some disallowed HTML</script>",
+        "4. An automatic link: https://myfancylink.fixmystreet.com/",
+        "5. A block-level element: <p>This is its own para</p>",
+        ""
+    );
+    my $comment = FixMyStreet::DB->resultset('Comment')->create(
+        {
+            user          => $user,
+            problem_id    => $report->id,
+            text          => join("\n\n", @lines),
+            confirmed     => DateTime->now( time_zone => 'local'),
+            problem_state => 'confirmed',
+            anonymous     => 0,
+            mark_open     => 0,
+            mark_fixed    => 0,
+            state         => 'confirmed',
+        }
+    );
+
+    # First check that comments from a public user don't receive special treatment
+    $mech->get_ok( "/report/" . $report->id );
+
+    $mech->content_contains("1. &lt;strong&gt;some staff-allowed HTML&lt;/strong&gt;");
+    $mech->content_lacks("<strong>some staff-allowed HTML</strong>");
+
+    $mech->content_contains("2. *some Markdown-style italics*");
+    $mech->content_lacks("<i>some Markdown-style italics</i>");
+    $mech->content_lacks("&lt;i&gt;some Markdown-style italics&lt;/i&gt;");
+
+    $mech->content_contains("3. &lt;script&gt;some disallowed HTML&lt;/script&gt;");
+    $mech->content_lacks("<script>some disallowed HTML</script>");
+
+    $mech->content_contains('4. An automatic link: <a href="https://myfancylink.fixmystreet.com/">https://myfancylink.fixmystreet.com/</a>') or diag $mech->content;
+
+    $mech->content_contains("5. A block-level element: &lt;p&gt;This is its own para&lt;/p&gt;");
+    $mech->content_lacks("5. A block-level element: <p>This is its own para</p>");
+
+    # Now check that comments from a member of staff user do allow HTML/italic markup
+    $comment->set_extra_metadata(is_body_user => $body->id);
+    $comment->update;
+    $mech->get_ok( "/report/" . $report->id );
+
+    $mech->content_contains("1. <strong>some staff-allowed HTML</strong>");
+    $mech->content_lacks("&lt;strong&gt;some staff-allowed HTML&lt;/strong&gt;");
+
+    $mech->content_contains("2. <i>some Markdown-style italics</i>");
+    $mech->content_lacks("*some Markdown-style italics*");
+    $mech->content_lacks("&lt;i&gt;some Markdown-style italics&lt;/i&gt;");
+
+    $mech->content_lacks("some disallowed HTML");
+
+    $mech->content_contains('4. An automatic link: <a href="https://myfancylink.fixmystreet.com/">https://myfancylink.fixmystreet.com/</a>');
+
+    $mech->content_contains("5. A block-level element: <p>This is its own para</p>");
+    $mech->content_lacks("<p>\n5. A block-level element: <p>This is its own para</p></p>");
+
+    # and the same for superusers
+    $comment->unset_extra_metadata('is_body_user');
+    $comment->set_extra_metadata(is_superuser => 1);
+    $comment->update;
+    $mech->get_ok( "/report/" . $report->id );
+
+    $mech->content_contains("1. <strong>some staff-allowed HTML</strong>");
+    $mech->content_lacks("&lt;strong&gt;some staff-allowed HTML&lt;/strong&gt;");
+
+    $mech->content_contains("2. <i>some Markdown-style italics</i>");
+    $mech->content_lacks("*some Markdown-style italics*");
+    $mech->content_lacks("&lt;i&gt;some Markdown-style italics&lt;/i&gt;");
+
+    $mech->content_lacks("some disallowed HTML");
+
+    $mech->content_contains('4. An automatic link: <a href="https://myfancylink.fixmystreet.com/">https://myfancylink.fixmystreet.com/</a>');
+
+    $mech->content_contains("5. A block-level element: <p>This is its own para</p>");
+    $mech->content_lacks("<p>\n5. A block-level element: <p>This is its own para</p></p>");
+
+};
+
+
 done_testing();
diff --git a/templates/web/base/admin/users/log.html b/templates/web/base/admin/users/log.html
index 4b426e0ba..5c3f36321 100644
--- a/templates/web/base/admin/users/log.html
+++ b/templates/web/base/admin/users/log.html
@@ -49,7 +49,7 @@ action_map = {
                 [%- tprintf(loc('Problem %s created on behalf of %s'), mark_safe(report_link), item.obj.name) %], ‘[% item.obj.title | html %]’
             [%~ CASE 'update' %]
                 [% tprintf(loc("Update %s created for problem %d"), mark_safe(report_link), item.obj.problem_id) %]
-                [% item.obj.text | add_links | markup(item.obj.user) | html_para %]
+                [% item.obj.text | staff_html_markup(item.obj.extra) %]
             [%~ CASE 'shortlistAdded' %]
                 [%- tprintf(loc('Problem %s added to shortlist'), mark_safe(report_link)) %]
             [%~ CASE 'shortlistRemoved' %]
diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html
index 04c5b6941..d78461cb5 100644
--- a/templates/web/base/my/my.html
+++ b/templates/web/base/my/my.html
@@ -113,7 +113,7 @@ li .my-account-buttons a {
         <div class="item-list__update-wrap">
             [% INCLUDE 'report/photo.html' object=u %]
             <div class="item-list__update-text">
-                [% u.text | add_links | html_para %]
+                [% u.text | staff_html_markup(u.extra) %]
 
                 <p class="meta-2">
                     [% tprintf( loc("Added %s"), prettify_dt( u.confirmed, 'date' ) ) %]
diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html
index 00911c5b1..416200d25 100644
--- a/templates/web/base/questionnaire/index.html
+++ b/templates/web/base/questionnaire/index.html
@@ -55,7 +55,7 @@
         <strong>[% loc('Last update') %]</strong>
         <a href="/report/[% problem.id %]">[% loc('Show all updates') %]</a>
     </p>
-    <p class="questionnaire-report-reminder__last-update">&ldquo;[% updates.last.text | add_links %]&rdquo;</p>
+    <p class="questionnaire-report-reminder__last-update">&ldquo;[% updates.last.text | staff_html_markup(updates.last.extra) %]&rdquo;</p>
   [% END %]
 </div>
 
diff --git a/templates/web/base/report/update.html b/templates/web/base/report/update.html
index ca9397bd4..3b1f092ef 100644
--- a/templates/web/base/report/update.html
+++ b/templates/web/base/report/update.html
@@ -35,7 +35,7 @@
                 [% INCLUDE 'report/photo.html' object=update %]
                 <div class="item-list__update-text">
                     <div class="moderate-display">
-                        [% update.text | add_links | markup(update.user) | html_para %]
+                        [% update.text | staff_html_markup(update.extra) %]
                     </div>
                     [% IF can_moderate %]
                     <div class="moderate-edit">
@@ -43,7 +43,7 @@
                         <label><input type="checkbox" name="update_revert_text" class="revert-textarea">
                         [% loc('Revert to original') %]</label>
                         [% END %]
-                        <textarea class="form-control" name="update_text">[% update.text | add_links %]</textarea>
+                        <textarea class="form-control" name="update_text">[% update.text %]</textarea>
                     </div>
                     [% END %]
 
-- 
cgit v1.2.3


From 245f12237ad2c796667d5d4736483474c1b481ce Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Tue, 11 Aug 2020 09:18:12 +0100
Subject: Enable HTML in update alert emails.

---
 docs/_includes/admin-tasks-content.md              |  6 ++-
 perllib/FixMyStreet/App/View/Web.pm                | 37 +++++++++++--------
 perllib/FixMyStreet/Script/Alerts.pm               |  1 +
 perllib/FixMyStreet/Template.pm                    | 23 ++++++++++++
 perllib/FixMyStreet/TestMech.pm                    | 18 +++++++++
 t/app/controller/alert_new.t                       | 43 ++++++++++++++++++++++
 templates/email/default/_email_comment_list.html   |  2 +-
 .../email/fixamingata/_email_comment_list.html     |  2 +-
 8 files changed, 113 insertions(+), 19 deletions(-)

diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index aa1225cfc..0fdc259e9 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -829,7 +829,11 @@ above, ‘Creating a template’. Additionally you can delete the template from
 #### HTML content in templates
 
 HTML tags are permitted in response templates, which makes it possible to include
-images or rich text formatting in the updates which are added to reports.
+hyperlinks or rich text formatting in the updates which are added to reports.
+
+Be aware that response templates are emailed to users as well as being shown on
+the site, so it's best to keep any HTML formatting quite light-touch due to the
+quirks of email clients' rendering of HTML message.
 
 Refer to the section ["HTML Content in notices"](#html-content-in-notices) above for details of
 what tags and attributes are allowed.
diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm
index 5e38fc797..41444fdd4 100644
--- a/perllib/FixMyStreet/App/View/Web.pm
+++ b/perllib/FixMyStreet/App/View/Web.pm
@@ -126,29 +126,34 @@ sub staff_html_markup_factory {
 
     return sub {
         my $text = shift;
-        unless ($staff) {
-            return FixMyStreet::Template::html_paragraph(add_links($text));
-        }
+        return _staff_html_markup($text, $staff);
+    }
+}
 
-        $text = FixMyStreet::Template::sanitize($text);
+sub _staff_html_markup {
+    my ( $text, $staff ) = @_;
+    unless ($staff) {
+        return FixMyStreet::Template::html_paragraph(add_links($text));
+    }
 
-        # Apply Markdown-style italics
-        $text =~ s{\*(\S.*?\S)\*}{<i>$1</i>};
+    $text = FixMyStreet::Template::sanitize($text);
 
-        # Mark safe so add_links doesn't escape everything.
-        $text = FixMyStreet::Template::SafeString->new($text);
+    # Apply Markdown-style italics
+    $text =~ s{\*(\S.*?\S)\*}{<i>$1</i>};
 
-        $text = add_links($text);
+    # Mark safe so add_links doesn't escape everything.
+    $text = FixMyStreet::Template::SafeString->new($text);
 
-        # If the update already has block-level elements then don't wrap
-        # individual lines in <p> elements, as we assume the user knows what
-        # they're doing.
-        unless ($text =~ /<(p|ol|ul)>/) {
-            $text = FixMyStreet::Template::html_paragraph($text);
-        }
+    $text = add_links($text);
 
-        return $text;
+    # If the update already has block-level elements then don't wrap
+    # individual lines in <p> elements, as we assume the user knows what
+    # they're doing.
+    unless ($text =~ /<(p|ol|ul)>/) {
+        $text = FixMyStreet::Template::html_paragraph($text);
     }
+
+    return $text;
 }
 
 =head2 escape_js
diff --git a/perllib/FixMyStreet/Script/Alerts.pm b/perllib/FixMyStreet/Script/Alerts.pm
index 03373a8cc..fa90ede48 100644
--- a/perllib/FixMyStreet/Script/Alerts.pm
+++ b/perllib/FixMyStreet/Script/Alerts.pm
@@ -41,6 +41,7 @@ sub send() {
                    $item_table.photo as item_photo,
                    $item_table.problem_state as item_problem_state,
                    $item_table.cobrand as item_cobrand,
+                   $item_table.extra as item_extra,
                    $head_table.*
             from alert, $item_table, $head_table
                 where alert.parameter::integer = $head_table.id
diff --git a/perllib/FixMyStreet/Template.pm b/perllib/FixMyStreet/Template.pm
index ac9e743ff..7d6798415 100644
--- a/perllib/FixMyStreet/Template.pm
+++ b/perllib/FixMyStreet/Template.pm
@@ -11,6 +11,9 @@ use FixMyStreet::Template::SafeString;
 use FixMyStreet::Template::Context;
 use FixMyStreet::Template::Stash;
 
+use RABX;
+use IO::String;
+
 my %FILTERS;
 my %SUBS;
 
@@ -157,4 +160,24 @@ sub sanitize {
     return $text;
 }
 
+
+=head2 email_sanitize_html
+
+Intended for use in the _email_comment_list.html template to allow HTML
+in updates from staff/superusers.
+
+=cut
+
+sub email_sanitize_html : Fn('email_sanitize_html') {
+    my $update = shift;
+
+    my $text = $update->{item_text};
+    my $extra = $update->{item_extra};
+    $extra = $extra ? RABX::wire_rd(new IO::String($extra)) : {};
+
+    my $staff = $extra->{is_superuser} || $extra->{is_body_user};
+
+    return FixMyStreet::App::View::Web::_staff_html_markup($text, $staff);
+}
+
 1;
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index 277eca2b1..f6854fc98 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -276,6 +276,24 @@ sub get_text_body_from_email {
     return $body;
 }
 
+sub get_html_body_from_email {
+    my ($mech, $email, $obj) = @_;
+    unless ($email) {
+        $email = $mech->get_email;
+        $mech->clear_emails_ok;
+    }
+
+    my $body;
+    $email->walk_parts(sub {
+        my $part = shift;
+        return if $part->subparts;
+        return if $part->content_type !~ m{text/html};
+        $body = $obj ? $part : $part->body_str;
+        ok $body, "Found HTML body";
+    });
+    return $body;
+}
+
 sub get_link_from_email {
     my ($mech, $email, $multiple, $mismatch) = @_;
     unless ($email) {
diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index d968b56b1..16455c7c4 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -866,4 +866,47 @@ subtest 'check setting include dates in new updates cobrand option' => sub {
     $include_date_in_alert_override->restore();
 };
 
+subtest 'check staff updates can include sanitized HTML' => sub {
+    my $user1 = $mech->create_user_ok('reporter@example.com', name => 'Reporter User');
+    my $user2 = $mech->create_user_ok('staff@example.com', name => 'Staff User', from_body => $body);
+    my $user3 = $mech->create_user_ok('updater@example.com', name => 'Another User');
+
+    my $dt = DateTime->now->add( minutes => -30 );
+    my $r_dt = $dt->clone->add( minutes => 20 );
+
+    my ($report) = $mech->create_problems_for_body(1, $body->id, 'Testing', {
+        user => $user1,
+    });
+
+    my $update1 = $mech->create_comment_for_problem($report, $user2, 'Staff User', 'This is some update text with <strong>HTML</strong> and *italics*. <script>not allowed</script>', 't', 'confirmed', undef, { confirmed  => $r_dt->clone->add( minutes => 8 ) });
+    $update1->set_extra_metadata(is_body_user => $user2->from_body->id);
+    $update1->update;
+
+    $mech->create_comment_for_problem($report, $user3, 'Updater User', 'Public users <i>cannot</i> use HTML. <script>not allowed</script>', 't', 'confirmed', undef, { confirmed  => $r_dt->clone->add( minutes => 9 ) });
+
+    my $alert_user1 = FixMyStreet::DB->resultset('Alert')->create( {
+            user       => $user1,
+            alert_type => 'new_updates',
+            parameter  => $report->id,
+            confirmed  => 1,
+            whensubscribed => $dt,
+    } );
+    ok $alert_user1, "alert created";
+
+    FixMyStreet::DB->resultset('AlertType')->email_alerts();
+    my $email = $mech->get_email;
+    my $plain = $mech->get_text_body_from_email($email);
+    like $plain, qr/This is some update text with <strong>HTML<\/strong> and \*italics\*\./, 'plain text part contains exactly what was entered';
+    like $plain, qr/Public users <i>cannot<\/i> use HTML\./, 'plain text part contains exactly what was entered';
+
+    my $html = $mech->get_html_body_from_email($email);
+    like $html, qr{This is some update text with <strong>HTML</strong> and <i>italics</i>\.}, 'HTML part contains HTML tags';
+    unlike $html, qr/<script>/, 'HTML part contains no script tags';
+
+    $mech->delete_user( $user1 );
+    $mech->delete_user( $user2 );
+    $mech->delete_user( $user3 );
+};
+
+
 done_testing();
diff --git a/templates/email/default/_email_comment_list.html b/templates/email/default/_email_comment_list.html
index 346efadfb..fe6cd5c4c 100644
--- a/templates/email/default/_email_comment_list.html
+++ b/templates/email/default/_email_comment_list.html
@@ -5,7 +5,7 @@
         <img style="[% list_item_photo_style %]" src="[% inline_image(update.get_first_image_fp) %]" alt="">
       </a>
     [%~ END %]
-      [% update.item_text | html_para | replace('<p>', '<p style="' _ list_item_p_style _ '">') %]
+      [% email_sanitize_html(update) | html_para | replace('<p>', '<p style="' _ list_item_p_style _ '">') %]
       <p style="[% list_item_date_style %]">
         [%~ update.item_name | html IF update.item_name AND NOT update.item_anonymous -%]
         [% '(' _ cobrand.prettify_dt(update.confirmed) _ ') ' IF cobrand.include_time_in_update_alerts -%]
diff --git a/templates/email/fixamingata/_email_comment_list.html b/templates/email/fixamingata/_email_comment_list.html
index 346efadfb..fe6cd5c4c 100644
--- a/templates/email/fixamingata/_email_comment_list.html
+++ b/templates/email/fixamingata/_email_comment_list.html
@@ -5,7 +5,7 @@
         <img style="[% list_item_photo_style %]" src="[% inline_image(update.get_first_image_fp) %]" alt="">
       </a>
     [%~ END %]
-      [% update.item_text | html_para | replace('<p>', '<p style="' _ list_item_p_style _ '">') %]
+      [% email_sanitize_html(update) | html_para | replace('<p>', '<p style="' _ list_item_p_style _ '">') %]
       <p style="[% list_item_date_style %]">
         [%~ update.item_name | html IF update.item_name AND NOT update.item_anonymous -%]
         [% '(' _ cobrand.prettify_dt(update.confirmed) _ ') ' IF cobrand.include_time_in_update_alerts -%]
-- 
cgit v1.2.3


From dffc4acfe67fb05f928806601bab8ce1057e7b67 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 29 Sep 2020 14:36:14 +0100
Subject: Translate HTML to text for update alert emails.

---
 perllib/FixMyStreet/Template.pm                 | 61 +++++++++++++++++++++++++
 t/app/controller/alert_new.t                    |  4 +-
 templates/email/default/_email_comment_list.txt |  2 +-
 3 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/perllib/FixMyStreet/Template.pm b/perllib/FixMyStreet/Template.pm
index 7d6798415..35efcc1cf 100644
--- a/perllib/FixMyStreet/Template.pm
+++ b/perllib/FixMyStreet/Template.pm
@@ -7,6 +7,7 @@ use FixMyStreet;
 use mySociety::Locale;
 use Attribute::Handlers;
 use HTML::Scrubber;
+use HTML::TreeBuilder;
 use FixMyStreet::Template::SafeString;
 use FixMyStreet::Template::Context;
 use FixMyStreet::Template::Stash;
@@ -161,6 +162,66 @@ sub sanitize {
 }
 
 
+=head2 email_sanitize_text
+
+Intended for use in the _email_comment_list.txt template to allow HTML
+in updates from staff/superusers. Sanitizes the HTML and then converts
+it all to text.
+
+=cut
+
+sub email_sanitize_text : Fn('email_sanitize_text') {
+    my $update = shift;
+
+    my $text = $update->{item_text};
+    my $extra = $update->{item_extra};
+    $extra = $extra ? RABX::wire_rd(new IO::String($extra)) : {};
+
+    my $staff = $extra->{is_superuser} || $extra->{is_body_user};
+
+    return $text unless $staff;
+
+    $text = FixMyStreet::Template::sanitize($text);
+
+    my $tree = HTML::TreeBuilder->new_from_content($text);
+    _sanitize_elt($tree);
+
+    return $tree->as_text;
+}
+
+my $list_type;
+my $list_num;
+my $sanitize_text_subs = {
+    b => [ '*', '*' ],
+    strong => [ '*', '*' ],
+    i => [ '_', '_' ],
+    em => [ '_', '_' ],
+    p => [ '', "\n\n" ],
+    li => [ '', "\n\n" ],
+};
+sub _sanitize_elt {
+    my $elt = shift;
+    foreach ($elt->content_list) {
+        next unless ref $_;
+        $list_type = $_->tag, $list_num = 1 if $_->tag eq 'ol' || $_->tag eq 'ul';
+        _sanitize_elt($_);
+        $_->replace_with("\n") if $_->tag eq 'br';
+        $_->replace_with('[image: ', $_->attr('alt'), ']') if $_->tag eq 'img';
+        $_->replace_with($_->as_text, ' [', $_->attr('href'), ']') if $_->tag eq 'a';
+        $_->replace_with_content if $_->tag eq 'span' || $_->tag eq 'font';
+        $_->replace_with_content if $_->tag eq 'ul' || $_->tag eq 'ol';
+        if ($_->tag eq 'li') {
+            $sanitize_text_subs->{li}[0] = $list_type eq 'ol' ? "$list_num. " : '* ';
+            $list_num++;
+        }
+        if (my $sub = $sanitize_text_subs->{$_->tag}) {
+            $_->preinsert($sub->[0]);
+            $_->postinsert($sub->[1]);
+            $_->replace_with_content;
+        }
+    }
+}
+
 =head2 email_sanitize_html
 
 Intended for use in the _email_comment_list.html template to allow HTML
diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 16455c7c4..31d8c52ed 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -878,7 +878,7 @@ subtest 'check staff updates can include sanitized HTML' => sub {
         user => $user1,
     });
 
-    my $update1 = $mech->create_comment_for_problem($report, $user2, 'Staff User', 'This is some update text with <strong>HTML</strong> and *italics*. <script>not allowed</script>', 't', 'confirmed', undef, { confirmed  => $r_dt->clone->add( minutes => 8 ) });
+    my $update1 = $mech->create_comment_for_problem($report, $user2, 'Staff User', '<p>This is some update text with <strong>HTML</strong> and *italics*.</p> <ul><li>Even a list</li><li>Which might work</li><li>In the <a href="https://www.fixmystreet.com/">text</a> part</li></ul> <script>not allowed</script>', 't', 'confirmed', undef, { confirmed  => $r_dt->clone->add( minutes => 8 ) });
     $update1->set_extra_metadata(is_body_user => $user2->from_body->id);
     $update1->update;
 
@@ -896,7 +896,7 @@ subtest 'check staff updates can include sanitized HTML' => sub {
     FixMyStreet::DB->resultset('AlertType')->email_alerts();
     my $email = $mech->get_email;
     my $plain = $mech->get_text_body_from_email($email);
-    like $plain, qr/This is some update text with <strong>HTML<\/strong> and \*italics\*\./, 'plain text part contains exactly what was entered';
+    like $plain, qr/This is some update text with \*HTML\* and \*italics\*\.\r\n\r\n\* Even a list\r\n\r\n\* Which might work\r\n\r\n\* In the text \[https:\/\/www.fixmystreet.com\/\] part/, 'plain text part contains no HTML tags from staff update';
     like $plain, qr/Public users <i>cannot<\/i> use HTML\./, 'plain text part contains exactly what was entered';
 
     my $html = $mech->get_html_body_from_email($email);
diff --git a/templates/email/default/_email_comment_list.txt b/templates/email/default/_email_comment_list.txt
index dbf00640f..3e01580c3 100644
--- a/templates/email/default/_email_comment_list.txt
+++ b/templates/email/default/_email_comment_list.txt
@@ -1,7 +1,7 @@
 [% FOR row IN data -%]
 [% row.item_name _ ' : ' IF row.item_name AND NOT row.item_anonymous -%]
 [% '(' _ cobrand.prettify_dt(row.confirmed) _ ') ' IF cobrand.include_time_in_update_alerts -%]
-[% row.item_text %]
+[% email_sanitize_text(row) %]
 
 ------
 
-- 
cgit v1.2.3


From 598bb52cb46aaca98e85328d34b58bbcb7581d71 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 1 Oct 2020 11:34:22 +0100
Subject: Move some templating functions to ::Template.

Most of the functions called by them are in that module, so seems
easiest to keep them together, plus this fixes lack of Web module
import in the Template module.
---
 perllib/FixMyStreet/App/View/Web.pm   | 39 ++-------------------------
 perllib/FixMyStreet/Cobrand/Zurich.pm |  3 ++-
 perllib/FixMyStreet/Template.pm       | 50 ++++++++++++++++++++++++++++++++++-
 3 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm
index 41444fdd4..8d3d53d0d 100644
--- a/perllib/FixMyStreet/App/View/Web.pm
+++ b/perllib/FixMyStreet/App/View/Web.pm
@@ -98,16 +98,7 @@ Add some links to some text (and thus HTML-escapes the other text).
 
 sub add_links {
     my $text = shift;
-    $text = FixMyStreet::Template::conditional_escape($text);
-    $text =~ s/\r//g;
-    $text =~ s{(?<!["'])(https?://)([^\s]+)}{"<a href=\"$1$2\">$1" . _space_slash($2) . '</a>'}ge;
-    return FixMyStreet::Template::SafeString->new($text);
-}
-
-sub _space_slash {
-    my $t = shift;
-    $t =~ s{/(?!$)}{/ }g;
-    return $t;
+    return FixMyStreet::Template::add_links($text);
 }
 
 =head2 staff_html_markup_factory
@@ -126,36 +117,10 @@ sub staff_html_markup_factory {
 
     return sub {
         my $text = shift;
-        return _staff_html_markup($text, $staff);
+        return FixMyStreet::Template::_staff_html_markup($text, $staff);
     }
 }
 
-sub _staff_html_markup {
-    my ( $text, $staff ) = @_;
-    unless ($staff) {
-        return FixMyStreet::Template::html_paragraph(add_links($text));
-    }
-
-    $text = FixMyStreet::Template::sanitize($text);
-
-    # Apply Markdown-style italics
-    $text =~ s{\*(\S.*?\S)\*}{<i>$1</i>};
-
-    # Mark safe so add_links doesn't escape everything.
-    $text = FixMyStreet::Template::SafeString->new($text);
-
-    $text = add_links($text);
-
-    # If the update already has block-level elements then don't wrap
-    # individual lines in <p> elements, as we assume the user knows what
-    # they're doing.
-    unless ($text =~ /<(p|ol|ul)>/) {
-        $text = FixMyStreet::Template::html_paragraph($text);
-    }
-
-    return $text;
-}
-
 =head2 escape_js
 
 Used to escape strings that are going to be put inside JavaScript.
diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 4b893af40..c7b9f70ee 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -10,6 +10,7 @@ use DateTime::Format::Pg;
 use Try::Tiny;
 
 use FixMyStreet::Geocode::Zurich;
+use FixMyStreet::Template;
 use FixMyStreet::WorkingDays;
 
 use strict;
@@ -178,7 +179,7 @@ sub updates_as_hashref {
         $hashref->{update_pp} = $self->prettify_dt( $problem->lastupdate );
 
         if ( $problem->state ne 'external' ) {
-            $hashref->{details} = FixMyStreet::App::View::Web::add_links(
+            $hashref->{details} = FixMyStreet::Template::add_links(
                 $problem->get_extra_metadata('public_response') || '' );
         } else {
             $hashref->{details} = sprintf( _('Assigned to %s'), $problem->body->name );
diff --git a/perllib/FixMyStreet/Template.pm b/perllib/FixMyStreet/Template.pm
index 35efcc1cf..bc087de9a 100644
--- a/perllib/FixMyStreet/Template.pm
+++ b/perllib/FixMyStreet/Template.pm
@@ -238,7 +238,55 @@ sub email_sanitize_html : Fn('email_sanitize_html') {
 
     my $staff = $extra->{is_superuser} || $extra->{is_body_user};
 
-    return FixMyStreet::App::View::Web::_staff_html_markup($text, $staff);
+    return _staff_html_markup($text, $staff);
+}
+
+sub _staff_html_markup {
+    my ( $text, $staff ) = @_;
+    unless ($staff) {
+        return html_paragraph(add_links($text));
+    }
+
+    $text = sanitize($text);
+
+    # Apply Markdown-style italics
+    $text =~ s{\*(\S.*?\S)\*}{<i>$1</i>};
+
+    # Mark safe so add_links doesn't escape everything.
+    $text = FixMyStreet::Template::SafeString->new($text);
+
+    $text = add_links($text);
+
+    # If the update already has block-level elements then don't wrap
+    # individual lines in <p> elements, as we assume the user knows what
+    # they're doing.
+    unless ($text =~ /<(p|ol|ul)>/) {
+        $text = html_paragraph($text);
+    }
+
+    return $text;
+}
+
+=head2 add_links
+
+    [% text | add_links | html_para %]
+
+Add some links to some text (and thus HTML-escapes the other text).
+
+=cut
+
+sub add_links {
+    my $text = shift;
+    $text = conditional_escape($text);
+    $text =~ s/\r//g;
+    $text =~ s{(?<!["'])(https?://)([^\s]+)}{"<a href=\"$1$2\">$1" . _space_slash($2) . '</a>'}ge;
+    return FixMyStreet::Template::SafeString->new($text);
+}
+
+sub _space_slash {
+    my $t = shift;
+    $t =~ s{/(?!$)}{/ }g;
+    return $t;
 }
 
 1;
-- 
cgit v1.2.3


From f4df25a3067a880d753b81df3eb4d3d843dc0ba0 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 29 Jan 2020 11:19:15 +0000
Subject: Factor out all reports body name template.

---
 templates/web/base/reports/_body_name.html        | 1 +
 templates/web/base/reports/body.html              | 7 +------
 templates/web/hounslow/reports/_body_name.html    | 1 +
 templates/web/isleofwight/reports/_body_name.html | 1 +
 4 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 templates/web/base/reports/_body_name.html
 create mode 100644 templates/web/hounslow/reports/_body_name.html
 create mode 100644 templates/web/isleofwight/reports/_body_name.html

diff --git a/templates/web/base/reports/_body_name.html b/templates/web/base/reports/_body_name.html
new file mode 100644
index 000000000..42392e4cd
--- /dev/null
+++ b/templates/web/base/reports/_body_name.html
@@ -0,0 +1 @@
+[% body.name %]
diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html
index d723a7992..d6f9558a3 100755
--- a/templates/web/base/reports/body.html
+++ b/templates/web/base/reports/body.html
@@ -1,9 +1,4 @@
-[% SET body_name = body.name %]
-[% IF c.cobrand.moniker == 'hounslow' %]
-  [% SET body_name = 'Hounslow Highways' %]
-[% ELSIF c.cobrand.moniker == 'isleofwight' %]
-  [% SET body_name = 'Island Roads' %]
-[% END %]
+[% body_name = PROCESS 'reports/_body_name.html' | trim %]
 
 [% IF ward %]
     [% name = "$ward.name, $body_name"
diff --git a/templates/web/hounslow/reports/_body_name.html b/templates/web/hounslow/reports/_body_name.html
new file mode 100644
index 000000000..6cb43da82
--- /dev/null
+++ b/templates/web/hounslow/reports/_body_name.html
@@ -0,0 +1 @@
+Hounslow Highways
diff --git a/templates/web/isleofwight/reports/_body_name.html b/templates/web/isleofwight/reports/_body_name.html
new file mode 100644
index 000000000..764623032
--- /dev/null
+++ b/templates/web/isleofwight/reports/_body_name.html
@@ -0,0 +1 @@
+Island Roads
-- 
cgit v1.2.3


From e3e1e9d54999692dc01f3fdd32693547af8deb7b Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 1 Oct 2020 14:44:07 +0100
Subject: Do not display deleted priorities in inspect form.

---
 CHANGELOG.md                                       |  1 +
 perllib/FixMyStreet/App/Controller/Report.pm       |  3 +-
 perllib/FixMyStreet/DB/Result/Problem.pm           |  6 ++-
 perllib/FixMyStreet/DB/ResultSet/DefectType.pm     |  2 +-
 .../FixMyStreet/DB/ResultSet/ResponsePriority.pm   |  8 +++-
 .../FixMyStreet/DB/ResultSet/ResponseTemplate.pm   |  2 +-
 perllib/FixMyStreet/Roles/ContactExtra.pm          |  2 +-
 perllib/FixMyStreet/TestMech.pm                    | 31 --------------
 t/app/controller/report_inspect.t                  | 12 ++++++
 t/app/model/responsepriority.t                     | 49 ++++++++++++++++------
 .../web/base/report/inspect/extra_details.html     |  2 +-
 11 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aa628795..88330b56f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
         - Allow inspectors to change report asset.
         - Staff users can use HTML tags in updates. #3143
         - Response templates can include HTML tags. #3143
+        - Do not display deleted priorities in inspect form. #3195
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 81d5b18b5..98c4aba17 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -413,7 +413,8 @@ sub inspect : Private {
     if ($c->cobrand->can('body')) {
         my $priorities_by_category = FixMyStreet::App->model('DB::ResponsePriority')->by_categories(
             $c->stash->{contacts},
-            body_id => $c->cobrand->body->id
+            body_id => $c->cobrand->body->id,
+            problem => $problem,
         );
         $c->stash->{priorities_by_category} = $priorities_by_category;
         my $templates_by_category = FixMyStreet::App->model('DB::ResponseTemplate')->by_categories(
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 705f07f79..cd5e876b4 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -780,7 +780,11 @@ alphabetical order of name.
 
 sub response_priorities {
     my $self = shift;
-    return $self->result_source->schema->resultset('ResponsePriority')->for_bodies($self->bodies_str_ids, $self->category);
+    my $rs = $self->result_source->schema->resultset('ResponsePriority')->for_bodies($self->bodies_str_ids, $self->category);
+    $rs->search([
+        'me.deleted' => 0,
+        'me.id' => $self->response_priority_id,
+    ]);
 }
 
 =head2 defect_types
diff --git a/perllib/FixMyStreet/DB/ResultSet/DefectType.pm b/perllib/FixMyStreet/DB/ResultSet/DefectType.pm
index 5b1247129..c4c11042f 100644
--- a/perllib/FixMyStreet/DB/ResultSet/DefectType.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/DefectType.pm
@@ -12,7 +12,7 @@ sub join_table {
 }
 
 sub map_extras {
-    my ($rs, @ts) = @_;
+    my ($rs, $params, @ts) = @_;
     return map {
         my $meta = $_->get_extra_metadata();
         my %extra = map { $_ => $meta->{$_} } keys %$meta;
diff --git a/perllib/FixMyStreet/DB/ResultSet/ResponsePriority.pm b/perllib/FixMyStreet/DB/ResultSet/ResponsePriority.pm
index 96f7cf7a0..af605afa6 100644
--- a/perllib/FixMyStreet/DB/ResultSet/ResponsePriority.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/ResponsePriority.pm
@@ -12,8 +12,12 @@ sub join_table {
 }
 
 sub map_extras {
-    my ($rs, @ts) = @_;
-    return map { { id => $_->id, name => $_->name } } @ts;
+    my ($rs, $params, @ts) = @_;
+    my $current = $params->{problem} && $params->{problem}->response_priority_id || 0;
+    return
+        map { { id => $_->id, name => $_->name } }
+        grep { !$_->deleted || $_->id == $current }
+        @ts;
 }
 
 1;
diff --git a/perllib/FixMyStreet/DB/ResultSet/ResponseTemplate.pm b/perllib/FixMyStreet/DB/ResultSet/ResponseTemplate.pm
index 46fcba153..88ecc2f94 100644
--- a/perllib/FixMyStreet/DB/ResultSet/ResponseTemplate.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/ResponseTemplate.pm
@@ -14,7 +14,7 @@ sub name_column {
 }
 
 sub map_extras {
-    my ($rs, @ts) = @_;
+    my ($rs, $params, @ts) = @_;
     return map {
         my $out = { id => $_->text, name => $_->title };
         $out->{state} = $_->state if $_->state;
diff --git a/perllib/FixMyStreet/Roles/ContactExtra.pm b/perllib/FixMyStreet/Roles/ContactExtra.pm
index 73b1d3e6a..9615b0f0c 100644
--- a/perllib/FixMyStreet/Roles/ContactExtra.pm
+++ b/perllib/FixMyStreet/Roles/ContactExtra.pm
@@ -45,7 +45,7 @@ sub by_categories {
                $_->$join_table == 0 # There's no category at all on this defect type/template/priority
             || (grep { $_->contact_id == $contact->get_column('id') } $_->$join_table)
         } @results;
-        @ts = $rs->map_extras(@ts);
+        @ts = $rs->map_extras(\%params, @ts);
         $extras{$contact->category} = JSON::XS->new->encode(\@ts);
     }
 
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index f6854fc98..7f7104d3d 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -609,29 +609,6 @@ sub get_ok_json {
     return decode_json( $res->content );
 }
 
-sub delete_body {
-    my $mech = shift;
-    my $body = shift;
-
-    $mech->delete_problems_for_body($body->id);
-    $mech->delete_defect_type($_) for $body->defect_types;
-    $mech->delete_contact($_) for $body->contacts;
-    $mech->delete_user($_) for $body->users;
-    $_->delete for $body->response_templates;
-    $_->delete for $body->response_priorities;
-    $body->body_areas->delete;
-    $body->delete;
-}
-
-sub delete_contact {
-    my $mech = shift;
-    my $contact = shift;
-
-    $contact->contact_response_templates->delete_all;
-    $contact->contact_response_priorities->delete_all;
-    $contact->delete;
-}
-
 sub delete_problems_for_body {
     my $mech = shift;
     my $body = shift;
@@ -646,14 +623,6 @@ sub delete_problems_for_body {
     }
 }
 
-sub delete_defect_type {
-    my $mech = shift;
-    my $defect_type = shift;
-
-    $defect_type->contact_defect_types->delete_all;
-    $defect_type->delete;
-}
-
 sub delete_response_template {
     my $mech = shift;
     my $response_template = shift;
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index 96325760c..c10fe7f94 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -17,6 +17,11 @@ my $rp2 = FixMyStreet::DB->resultset("ResponsePriority")->create({
     body => $oxon,
     name => 'Low Priority',
 });
+my $rp3 = FixMyStreet::DB->resultset("ResponsePriority")->create({
+    body => $oxon,
+    name => 'Deleted Priority',
+    deleted => 1,
+});
 FixMyStreet::DB->resultset("ContactResponsePriority")->create({
     contact => $contact,
     response_priority => $rp,
@@ -447,6 +452,7 @@ FixMyStreet::override_config {
     subtest "default response priorities display correctly" => sub {
         $mech->get_ok("/report/$report_id");
         $mech->content_contains('Priority</label', 'report priority list present');
+        $mech->content_lacks('Deleted Priority');
         like $mech->content, qr/<select name="priority" id="problem_priority" class="form-control">[^<]*<option value="" selecte/s, 'blank priority option is selected';
         $mech->content_lacks('value="' . $rp->id . '" selected>High', 'non default priority not selected');
 
@@ -456,6 +462,12 @@ FixMyStreet::override_config {
         $mech->content_contains('value="' . $rp->id . '" selected>High', 'default priority selected');
     };
 
+    subtest "check when report has deleted priority" => sub {
+        $report->update({ response_priority => $rp3 });
+        $mech->get_ok("/report/$report_id");
+        $mech->content_contains('value="' . $rp3->id . '" selected>Deleted Priority');
+    };
+
     foreach my $test (
         { type => 'report_edit_priority', priority => 1 },
         { type => 'report_edit_category', category => 1 },
diff --git a/t/app/model/responsepriority.t b/t/app/model/responsepriority.t
index bd09c2da0..0ecce1529 100644
--- a/t/app/model/responsepriority.t
+++ b/t/app/model/responsepriority.t
@@ -12,6 +12,7 @@ my $oxfordshire = $mech->create_body_ok($area_id, 'Oxfordshire County Council');
 my $other_body = $mech->create_body_ok($area_id, 'Some Other Council');
 my $potholes_contact = $mech->create_contact_ok( body_id => $oxfordshire->id, category => 'Potholes', email => 'potholes@example.com' );
 my $traffic_lights_contact =$mech->create_contact_ok( body_id => $oxfordshire->id, category => 'Traffic lights', email => 'lights@example.com' );
+my @contacts = FixMyStreet::DB->resultset('Contact')->not_deleted->search( { body_id => [ $oxfordshire->id ] } )->all;
 
 my $potholes_response_priority = FixMyStreet::DB->resultset('ResponsePriority')->find_or_create(
     {
@@ -32,25 +33,42 @@ my $general_response_priority = FixMyStreet::DB->resultset('ResponsePriority')->
     }
 );
 
-subtest 'for_bodies returns correct results' => sub {
+my $deleted1_response_priority = FixMyStreet::DB->resultset('ResponsePriority')->find_or_create(
+    {
+        body_id => $oxfordshire->id,
+        name => 'Deleted priority 1',
+        description => 'This priority has been deleted',
+        deleted => 1,
+    }
+);
+
+my $deleted2_response_priority = FixMyStreet::DB->resultset('ResponsePriority')->find_or_create(
+    {
+        body_id => $oxfordshire->id,
+        name => 'Deleted priority 2',
+        description => 'This priority has been deleted',
+        deleted => 1,
+    }
+);
+
+subtest 'for_bodies returns correct results (including deleted)' => sub {
     my $priorities = FixMyStreet::DB->resultset('ResponsePriority')->for_bodies(
         [ $oxfordshire->id ],
         'Potholes'
     );
 
-    is $priorities->count, 2, 'Both priorities are included for Potholes category';
+    is $priorities->count, 4, 'all priorities are included for Potholes category';
 
     $priorities = FixMyStreet::DB->resultset('ResponsePriority')->for_bodies(
         [ $oxfordshire->id ],
         'Traffic lights'
     );
 
-    is $priorities->count, 1, 'Only 1 priority is included for Traffic lights category';
+    is $priorities->count, 3, 'Pothole-only priority ignored for Traffic lights category';
     is $priorities->first->name, $general_response_priority->name, 'Correct priority is returned for Traffic lights category';
 };
 
-subtest 'by_categories returns all response priorities grouped by category' => sub {
-    my @contacts = FixMyStreet::DB->resultset('Contact')->not_deleted->search( { body_id => [ $oxfordshire->id ] } )->all;
+subtest 'by_categories returns all undeleted response priorities grouped by category' => sub {
     my $priorities = FixMyStreet::DB->resultset('ResponsePriority')->by_categories(\@contacts, body_id => $oxfordshire->id);
     my $potholes = decode_json($priorities->{Potholes});
     my $traffic_lights = decode_json($priorities->{'Traffic lights'});
@@ -59,7 +77,7 @@ subtest 'by_categories returns all response priorities grouped by category' => s
     is scalar @$traffic_lights, 1, 'Traffic lights have 1 defect type';
 };
 
-subtest 'by_categories returns all response priorities for an area with multiple bodies' => sub {
+subtest 'by_categories returns all undeleted response priorities for an area with multiple bodies' => sub {
     my $other_response_priority = FixMyStreet::DB->resultset('ResponsePriority')->find_or_create(
         {
             body_id => $other_body->id,
@@ -68,7 +86,6 @@ subtest 'by_categories returns all response priorities for an area with multiple
         }
     );
 
-    my @contacts = FixMyStreet::DB->resultset('Contact')->not_deleted->search( { body_id => [ $oxfordshire->id ] } )->all;
     my $priorities = FixMyStreet::DB->resultset('ResponsePriority')->by_categories(\@contacts, area_id => $area_id);
     my $potholes = decode_json($priorities->{Potholes});
     my $traffic_lights = decode_json($priorities->{'Traffic lights'});
@@ -77,8 +94,16 @@ subtest 'by_categories returns all response priorities for an area with multiple
     is scalar @$traffic_lights, 2, 'Traffic lights have 2 defect types';
 };
 
-END {
-    $mech->delete_body( $other_body );
-    $mech->delete_body( $oxfordshire );
-    done_testing();
-}
+subtest 'test with existing problem' => sub {
+    my ($problem) = $mech->create_problems_for_body(1, $oxfordshire->id, 'Title', {
+        response_priority => $deleted1_response_priority,
+    });
+    my $priorities = FixMyStreet::DB->resultset('ResponsePriority')->by_categories(\@contacts,
+        area_id => $area_id, problem => $problem);
+    my $potholes = decode_json($priorities->{Potholes});
+    my $traffic_lights = decode_json($priorities->{'Traffic lights'});
+    is scalar @$potholes, 4, 'Potholes have 4 defect types, deleted is included';
+    is scalar @$traffic_lights, 3, 'Traffic lights have 3 defect types, deleted is included';
+};
+
+done_testing();
diff --git a/templates/web/base/report/inspect/extra_details.html b/templates/web/base/report/inspect/extra_details.html
index 7777e9a78..66e464cef 100644
--- a/templates/web/base/report/inspect/extra_details.html
+++ b/templates/web/base/report/inspect/extra_details.html
@@ -3,7 +3,7 @@
     <select name="priority" id="problem_priority" class="form-control">
         <option value="" [% 'selected' UNLESS problem.response_priority_id OR has_default_priority %]>-</option>
         [% FOREACH priority IN problem.response_priorities %]
-        <option value="[% priority.id %]" [% 'selected' IF ( problem.response_priority_id == priority.id ) OR priority.is_default %][% 'disabled' IF priority.deleted %]>[% priority.name | html %]</option>
+        <option value="[% priority.id %]" [% 'selected' IF problem.response_priority_id == priority.id OR (NOT problem.response_priority_id AND priority.is_default) %]>[% priority.name | html %]</option>
         [% END %]
     </select>
 </p>
-- 
cgit v1.2.3


From 5fb4955f20a9173830b8d47fd006bda16132d9a3 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 2 Oct 2020 11:06:06 +0100
Subject: Ignore Test.pm in coverage.

It contains only functions for use by Cypress tests.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 970f80298..ca5eaee6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,7 @@ install:
   - 'if [ "$CYPRESS" = "1" ]; then npm install cypress@3.8.3; fi'
 before_script:
   - commonlib/bin/gettext-makemo FixMyStreet
-  - 'if [ "$COVERAGE_PART" != "0" ]; then export HARNESS_PERL_SWITCHES="-MDevel::Cover=+ignore,local/lib/perl5,commonlib,perllib/Catalyst/[^A],perllib/Email,^t"; fi'
+  - 'if [ "$COVERAGE_PART" != "0" ]; then export HARNESS_PERL_SWITCHES="-MDevel::Cover=+ignore,local/lib/perl5,commonlib,perllib/Catalyst/[^A],perllib/Email,Test.pm,^t"; fi'
 script:
   - 'if [ "$CYPRESS" = "0" ] && [ "$COVERAGE_PART" = "0" ]; then script/test --jobs 3 t; fi'
   - 'if [ "$COVERAGE_PART" = "1" ]; then script/test --jobs 3 `find t/app/controller -name "*.t"`; fi'
-- 
cgit v1.2.3


From 399b8a783a1833098ab8401087d8a6609ac6d515 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 1 Oct 2020 17:56:29 +0100
Subject: Record whether report made on desktop or mobile.

---
 .cypress/cypress/integration/simple_spec.js                 |  3 +++
 CHANGELOG.md                                                |  1 +
 perllib/FixMyStreet/App/Controller/Report/New.pm            | 12 +++++++++---
 perllib/FixMyStreet/App/Controller/Test.pm                  |  3 +++
 t/app/controller/report_new.t                               |  2 +-
 templates/web/base/report/form/submit.html                  |  2 ++
 templates/web/base/report/form/user_loggedout_by_email.html |  2 +-
 templates/web/base/report/new/form_report.html              |  1 +
 templates/web/base/report/new/form_user_loggedin.html       |  2 +-
 templates/web/base/report/new/login_success_form.html       |  2 +-
 templates/web/base/report/new/oauth_email_form.html         |  2 +-
 templates/web/base/report/update/form_user_loggedin.html    |  4 +++-
 templates/web/zurich/report/new/fill_in_details_form.html   |  5 ++++-
 web/cobrands/fixmystreet/fixmystreet.js                     |  1 +
 14 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 templates/web/base/report/form/submit.html

diff --git a/.cypress/cypress/integration/simple_spec.js b/.cypress/cypress/integration/simple_spec.js
index e2b776d21..074bf72bd 100644
--- a/.cypress/cypress/integration/simple_spec.js
+++ b/.cypress/cypress/integration/simple_spec.js
@@ -20,6 +20,9 @@ describe('Clicking the map', function() {
         cy.get('#map_sidebar').should('contain', 'check and confirm your details');
         cy.get('#map_sidebar').parents('form').submit();
         cy.get('body').should('contain', 'Thank you for reporting this issue');
+        cy.visit('http://fixmystreet.localhost:3001/_test/setup/simple-service-check').then(function(w) {
+            expect(w.document.documentElement.innerText).to.equal('desktop');
+        });
     });
 });
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aa628795..cbdd0663f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
         - Allow inspectors to change report asset.
         - Staff users can use HTML tags in updates. #3143
         - Response templates can include HTML tags. #3143
+        - Record whether report made on desktop or mobile.
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index d676e2856..037e1992a 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -29,8 +29,8 @@ Create a new report, or complete a partial one.
 
 submit_problem: true if a problem has been submitted, at all.
 submit_sign_in: true if the sign in button has been clicked by logged out user.
-submit_register: true if the register/confirm by email button has been clicked
-by logged out user.
+submit_register(_mobile): true if the register/confirm by email button has been clicked
+by logged out user, or submit button clicked by logged in user.
 
 =head2 location (required)
 
@@ -1046,7 +1046,13 @@ sub process_report : Private {
     $report->detail( $detail );
 
     # mobile device type
-    $report->service( $params{service} ) if $params{service};
+    if ($params{service}) {
+        $report->service($params{service});
+    } elsif ($c->get_param('submit_register_mobile')) {
+        $report->service('mobile');
+    } elsif ($c->get_param('submit_register')) {
+        $report->service('desktop');
+    }
 
     # set these straight from the params
     $report->category( _ $params{category} ) if $params{category};
diff --git a/perllib/FixMyStreet/App/Controller/Test.pm b/perllib/FixMyStreet/App/Controller/Test.pm
index 19a8c5321..ce54f004f 100644
--- a/perllib/FixMyStreet/App/Controller/Test.pm
+++ b/perllib/FixMyStreet/App/Controller/Test.pm
@@ -61,6 +61,9 @@ sub setup : Path('/_test/setup') : Args(1) {
         });
         $category->update;
         $c->response->body("OK");
+    } elsif ($test eq 'simple-service-check') {
+        my $problem = FixMyStreet::DB->resultset("Problem")->search(undef, { order_by => { -desc => 'id' } })->first;
+        $c->response->body($problem->service);
     }
 }
 
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index b0c93c332..77eb4fefb 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -149,7 +149,7 @@ foreach my $test (
 
         $mech->submit_form_ok(
             {
-                button      => 'submit_register',
+                button      => 'submit_register_mobile',
                 with_fields => {
                     title         => 'Test Report',
                     detail        => 'Test report details.',
diff --git a/templates/web/base/report/form/submit.html b/templates/web/base/report/form/submit.html
new file mode 100644
index 000000000..950bed965
--- /dev/null
+++ b/templates/web/base/report/form/submit.html
@@ -0,0 +1,2 @@
+<input class="desk-only btn btn--primary btn--block btn--final js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
+<input class="mob-only btn btn--primary btn--block btn--final js-submit_register" type="submit" name="submit_register_mobile" value="[% loc('Submit') %]">
diff --git a/templates/web/base/report/form/user_loggedout_by_email.html b/templates/web/base/report/form/user_loggedout_by_email.html
index 2e41deaea..3446fd767 100644
--- a/templates/web/base/report/form/user_loggedout_by_email.html
+++ b/templates/web/base/report/form/user_loggedout_by_email.html
@@ -87,7 +87,7 @@
 
     [% PROCESS 'auth/form_extra.html' %]
 
-    <input class="btn btn--primary btn--block btn--final js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
+    [% PROCESS 'report/form/submit.html' %]
 
 </div>
 <!-- /user_loggedout_by_email.html -->
diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index 3b28d4aa7..33dd5769e 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -89,5 +89,6 @@
     <input type="hidden" id="single_body_only" name="single_body_only" value="">
     <input type="hidden" id="do_not_send" name="do_not_send" value="">
     <input type="hidden" name="submit_problem" value="1">
+    <input type="hidden" id="form_service" name="service" value="">
 </div>
 <!-- /report/new/form_report.html -->
diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html
index 515f3842a..9215e7d59 100644
--- a/templates/web/base/report/new/form_user_loggedin.html
+++ b/templates/web/base/report/new/form_user_loggedin.html
@@ -74,5 +74,5 @@
     </div>
 [% END %]
 
-<input class="btn btn--primary btn--block btn--final js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
+[% PROCESS 'report/form/submit.html' %]
 <!-- /report/new/form_user_loggedin.html -->
diff --git a/templates/web/base/report/new/login_success_form.html b/templates/web/base/report/new/login_success_form.html
index 32c414bda..7ef896910 100644
--- a/templates/web/base/report/new/login_success_form.html
+++ b/templates/web/base/report/new/login_success_form.html
@@ -14,6 +14,6 @@
         [% PROCESS "report/form/user_loggedout.html" type='report' object=report %]
       [% END %]
       [% PROCESS 'report/new/form_report.html' %]
-      <input class="btn btn--primary btn--block btn--final js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
+      [% PROCESS 'report/form/submit.html' %]
     </div>
 </fieldset>
diff --git a/templates/web/base/report/new/oauth_email_form.html b/templates/web/base/report/new/oauth_email_form.html
index a0adbe563..126f93409 100644
--- a/templates/web/base/report/new/oauth_email_form.html
+++ b/templates/web/base/report/new/oauth_email_form.html
@@ -17,6 +17,6 @@
 
         <input type="hidden" name="oauth_need_email" value="1">
         [% PROCESS 'report/new/form_report.html' %]
-        <input class="btn btn--primary btn--block btn--final js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
+        [% PROCESS 'report/form/submit.html' %]
     </div>
 </fieldset>
diff --git a/templates/web/base/report/update/form_user_loggedin.html b/templates/web/base/report/update/form_user_loggedin.html
index 8d55737d2..02e7de51f 100644
--- a/templates/web/base/report/update/form_user_loggedin.html
+++ b/templates/web/base/report/update/form_user_loggedin.html
@@ -38,5 +38,7 @@
     <label class="inline" for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label>
 </div>
 
-<div class="clearfix"><input class="btn btn--primary btn--block btn--final js-submit_register" type="submit" name="submit_register" value="[% loc('Post') %]"></div>
+<div class="clearfix">
+    [% PROCESS 'report/form/submit.html' %]
+</div>
 <!-- /report/update/form_user_loggedin.html -->
diff --git a/templates/web/zurich/report/new/fill_in_details_form.html b/templates/web/zurich/report/new/fill_in_details_form.html
index 8d840c43e..c7ad0fb96 100644
--- a/templates/web/zurich/report/new/fill_in_details_form.html
+++ b/templates/web/zurich/report/new/fill_in_details_form.html
@@ -70,7 +70,10 @@
 
                 <div class="form-txt-submit-box">
                     [%# class of submit_sign_in so name can be optional, name of submit_register so it doesn't try and sign us in %]
-                    <p><input class="green-btn js-submit_sign_in" type="submit" name="submit_register" value="[% loc('Submit') %]">
+                    <p>
+                    <input class="desk-only green-btn js-submit_sign_in" type="submit" name="submit_register" value="[% loc('Submit') %]">
+                    <input class="mob-only green-btn js-submit_sign_in" type="submit" name="submit_register_mobile" value="[% loc('Submit') %]">
+                    </p>
                 </div>
 
         </div>
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 9c6ce83ed..15856f4ce 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -659,6 +659,7 @@ $.extend(fixmystreet.set_up, {
         } else {
             fixmystreet.resize_to.desktop_page();
         }
+        $('#form_service').val(type);
         last_type = type;
     }).resize();
   },
-- 
cgit v1.2.3


From bf90bf71fbac2c8e1be96646715182f876eccd57 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 2 Oct 2020 14:14:17 +0100
Subject: =?UTF-8?q?Don=E2=80=99t=20strip=20all=20spaces=20from=20Open311?=
 =?UTF-8?q?=20categories.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If a category’s send method is Open311, only strip spaces from the
ends of the code. We are aware of active Open311 servers that have
codes with spaces in the middle.
---
 CHANGELOG.md                                       | 1 +
 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm | 6 +++++-
 t/app/controller/admin/bodies.t                    | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aa628795..a9f118021 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
         - Fix a few obscure asset layer changing issues.
         - Fix multiple disable messages for dropdown answers
         - Do not trigger duplicate check when checking stoppers
+        - Do not strip spaces from middle of Open311 category codes. #3167
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
index f88ad0051..670336c14 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
@@ -252,8 +252,12 @@ sub update_contact : Private {
     }
 
     my $email = $c->get_param('email');
-    $email =~ s/\s+//g;
     my $send_method = $c->get_param('send_method') || $contact->body->send_method || "";
+    if ($send_method eq 'Open311') {
+        $email =~ s/^\s+|\s+$//g;
+    } else {
+        $email =~ s/\s+//g;
+    }
     my $email_unchanged = $contact->email && $email && $contact->email eq $email;
     my $cobrand = $contact->body->get_cobrand_handler;
     my $cobrand_valid = $cobrand && $cobrand->call_hook(validate_contact_email => $email);
diff --git a/t/app/controller/admin/bodies.t b/t/app/controller/admin/bodies.t
index 75db6f87c..b63cacd9d 100644
--- a/t/app/controller/admin/bodies.t
+++ b/t/app/controller/admin/bodies.t
@@ -231,9 +231,10 @@ subtest 'check open311 devolved editing' => sub {
     $mech->content_contains("name=\"category\"\n    size=\"30\" value=\"test category\"\n    required>", 'Can edit as now devolved');
     $mech->submit_form_ok( { with_fields => {
         send_method => '',
-        email => 'open311-code',
+        email => 'open311 code',
         note => 'Removing email send method',
     } } );
+    $mech->content_contains('open311 code');
     $mech->content_contains('Values updated');
 };
 
-- 
cgit v1.2.3


From 7135fb0076664cdc13d2af537a2a00b37d61fa54 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 2 Oct 2020 18:51:29 +0100
Subject: Record service as Open311 for pulled-in reports.

---
 perllib/Open311/GetServiceRequests.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/perllib/Open311/GetServiceRequests.pm b/perllib/Open311/GetServiceRequests.pm
index eea7c0f26..7f98bbc4a 100644
--- a/perllib/Open311/GetServiceRequests.pm
+++ b/perllib/Open311/GetServiceRequests.pm
@@ -185,6 +185,7 @@ sub create_problems {
                 send_method_used => 'Open311',
                 category => $contact,
                 send_questionnaire => 0,
+                service => 'Open311',
                 non_public => $non_public,
             }
         );
-- 
cgit v1.2.3


From 541bb773ba95e147ababdf015ea83356aeda54b2 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 6 Oct 2020 09:57:18 +0100
Subject: [UK] Prevent duplicate extra fields when blank.

If a report had an existing, but empty, extra field that was looked up
on the server when being sent by Open311, the looked up information
would be added as an additional extra field, rather than replacing the
blank one.
---
 perllib/FixMyStreet/Cobrand/Bexley.pm           | 8 ++++----
 perllib/FixMyStreet/Cobrand/Bromley.pm          | 3 ++-
 perllib/FixMyStreet/Cobrand/EastSussex.pm       | 2 +-
 perllib/FixMyStreet/Cobrand/Greenwich.pm        | 2 +-
 perllib/FixMyStreet/Cobrand/Hackney.pm          | 2 +-
 perllib/FixMyStreet/Cobrand/Northamptonshire.pm | 2 +-
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm      | 2 +-
 perllib/FixMyStreet/Cobrand/Peterborough.pm     | 4 ++--
 perllib/FixMyStreet/Cobrand/Rutland.pm          | 2 +-
 perllib/FixMyStreet/Cobrand/Westminster.pm      | 6 +++---
 perllib/FixMyStreet/Roles/ConfirmOpen311.pm     | 6 ++----
 perllib/FixMyStreet/SendReport/Open311.pm       | 2 +-
 12 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bexley.pm b/perllib/FixMyStreet/Cobrand/Bexley.pm
index 3f52c42b0..215b9d2cb 100644
--- a/perllib/FixMyStreet/Cobrand/Bexley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bexley.pm
@@ -85,7 +85,7 @@ sub open311_config {
 }
 
 sub open311_extra_data_include {
-    my ($self, $row, $h, $extra, $contact) = @_;
+    my ($self, $row, $h, $contact) = @_;
 
     my $open311_only;
     if ($contact->email =~ /^Confirm/) {
@@ -99,7 +99,7 @@ sub open311_extra_data_include {
 
         if (!$row->get_extra_field_value('site_code')) {
             if (my $ref = $self->lookup_site_code($row, 'NSG_REF')) {
-                push @$extra, { name => 'site_code', value => $ref, description => 'Site code' };
+                $row->update_extra_field({ name => 'site_code', value => $ref, description => 'Site code' });
             }
         }
     } elsif ($contact->email =~ /^Uniform/) {
@@ -108,7 +108,7 @@ sub open311_extra_data_include {
         # WFS service at the point we're sending the report over Open311.
         if (!$row->get_extra_field_value('uprn')) {
             if (my $ref = $self->lookup_site_code($row, 'UPRN')) {
-                push @$extra, { name => 'uprn', description => 'UPRN', value => $ref };
+                $row->update_extra_field({ name => 'uprn', description => 'UPRN', value => $ref });
             }
         }
     } else { # Symology
@@ -117,7 +117,7 @@ sub open311_extra_data_include {
         # WFS service at the point we're sending the report over Open311.
         if (!$row->get_extra_field_value('NSGRef')) {
             if (my $ref = $self->lookup_site_code($row, 'NSG_REF')) {
-                push @$extra, { name => 'NSGRef', description => 'NSG Ref', value => $ref };
+                $row->update_extra_field({ name => 'NSGRef', description => 'NSG Ref', value => $ref });
             }
         }
     }
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index dd8282fa2..c8da01226 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -172,10 +172,11 @@ sub open311_config {
 }
 
 sub open311_extra_data_include {
-    my ($self, $row, $h, $extra) = @_;
+    my ($self, $row, $h) = @_;
 
     my $title = $row->title;
 
+    my $extra = $row->get_extra_fields;
     foreach (@$extra) {
         next unless $_->{value};
         $title .= ' | ID: ' . $_->{value} if $_->{name} eq 'feature_id';
diff --git a/perllib/FixMyStreet/Cobrand/EastSussex.pm b/perllib/FixMyStreet/Cobrand/EastSussex.pm
index 04394f776..b2fd58dc1 100644
--- a/perllib/FixMyStreet/Cobrand/EastSussex.pm
+++ b/perllib/FixMyStreet/Cobrand/EastSussex.pm
@@ -7,7 +7,7 @@ use warnings;
 sub council_area_id { return 2224; }
 
 sub open311_extra_data {
-    my ($self, $row, $h, $extra, $contact) = @_;
+    my ($self, $row, $h, $contact) = @_;
 
     $h->{es_original_detail} = $row->detail;
 
diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm
index de7dd5d96..4cc4e4163 100644
--- a/perllib/FixMyStreet/Cobrand/Greenwich.pm
+++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm
@@ -45,7 +45,7 @@ sub reports_per_page { return 20; }
 sub admin_user_domain { 'royalgreenwich.gov.uk' }
 
 sub open311_extra_data_include {
-    my ($self, $row, $h, $extra) = @_;
+    my ($self, $row, $h) = @_;
 
     # Greenwich doesn't have category metadata to fill this
     return [
diff --git a/perllib/FixMyStreet/Cobrand/Hackney.pm b/perllib/FixMyStreet/Cobrand/Hackney.pm
index 4c035f926..b8f92f1ea 100644
--- a/perllib/FixMyStreet/Cobrand/Hackney.pm
+++ b/perllib/FixMyStreet/Cobrand/Hackney.pm
@@ -67,7 +67,7 @@ sub open311_config {
 }
 
 sub open311_extra_data {
-    my ($self, $row, $h, $extra, $contact) = @_;
+    my ($self, $row, $h, $contact) = @_;
 
     my $open311_only = [
         { name => 'report_url',
diff --git a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm
index 791e2f83f..2543f701d 100644
--- a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm
@@ -92,7 +92,7 @@ sub open311_config {
 }
 
 sub open311_extra_data_include {
-    my ($self, $row, $h, $extra) = @_;
+    my ($self, $row, $h) = @_;
 
     return [
         { name => 'report_url',
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 63f114c27..0f34ff09f 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -123,7 +123,7 @@ sub open311_config {
 }
 
 sub open311_extra_data_include {
-    my ($self, $row, $h, $extra) = @_;
+    my ($self, $row, $h) = @_;
 
     return [
         { name => 'external_id', value => $row->id },
diff --git a/perllib/FixMyStreet/Cobrand/Peterborough.pm b/perllib/FixMyStreet/Cobrand/Peterborough.pm
index cb7da18af..9fe6dbbec 100644
--- a/perllib/FixMyStreet/Cobrand/Peterborough.pm
+++ b/perllib/FixMyStreet/Cobrand/Peterborough.pm
@@ -44,9 +44,9 @@ sub geocoder_munge_results {
 sub admin_user_domain { "peterborough.gov.uk" }
 
 around open311_extra_data_include => sub {
-    my ($orig, $self, $row, $h, $extra) = @_;
+    my ($orig, $self, $row, $h) = @_;
 
-    my $open311_only = $self->$orig($row, $h, $extra);
+    my $open311_only = $self->$orig($row, $h);
     foreach (@$open311_only) {
         if ($_->{name} eq 'description') {
             my ($ref) = grep { $_->{name} =~ /pcc-Skanska-csc-ref/i } @{$row->get_extra_fields};
diff --git a/perllib/FixMyStreet/Cobrand/Rutland.pm b/perllib/FixMyStreet/Cobrand/Rutland.pm
index 557cf83a9..bc8eff6d2 100644
--- a/perllib/FixMyStreet/Cobrand/Rutland.pm
+++ b/perllib/FixMyStreet/Cobrand/Rutland.pm
@@ -30,7 +30,7 @@ sub open311_config {
 }
 
 sub open311_extra_data_include {
-    my ($self, $row, $h, $extra) = @_;
+    my ($self, $row, $h) = @_;
 
     return [
         { name => 'external_id', value => $row->id },
diff --git a/perllib/FixMyStreet/Cobrand/Westminster.pm b/perllib/FixMyStreet/Cobrand/Westminster.pm
index 40ae9f6c6..e00a7c092 100644
--- a/perllib/FixMyStreet/Cobrand/Westminster.pm
+++ b/perllib/FixMyStreet/Cobrand/Westminster.pm
@@ -79,14 +79,14 @@ sub open311_config {
 }
 
 sub open311_extra_data_include {
-    my ($self, $row, $h, $extra) = @_;
+    my ($self, $row, $h) = @_;
 
     # Reports made via the app probably won't have a USRN because we don't
     # display the road layer. Instead we'll look up the closest asset from the
     # asset service at the point we're sending the report over Open311.
     if (!$row->get_extra_field_value('USRN')) {
         if (my $ref = $self->lookup_site_code($row, 'USRN')) {
-            push @$extra, { name => 'USRN', value => $ref };
+            $row->update_extra_field({ name => 'USRN', value => $ref });
         }
     }
 
@@ -96,7 +96,7 @@ sub open311_extra_data_include {
     my ($uprn_field) = grep { $_->{name} eq 'UPRN' } @$fields;
     if ( $uprn_field && !$uprn_field->{value} ) {
         if (my $ref = $self->lookup_site_code($row, 'UPRN')) {
-            push @$extra, { name => 'UPRN', value => $ref };
+            $row->update_extra_field({ name => 'UPRN', value => $ref });
         }
     }
 
diff --git a/perllib/FixMyStreet/Roles/ConfirmOpen311.pm b/perllib/FixMyStreet/Roles/ConfirmOpen311.pm
index 6787ba3f4..1663844a2 100644
--- a/perllib/FixMyStreet/Roles/ConfirmOpen311.pm
+++ b/perllib/FixMyStreet/Roles/ConfirmOpen311.pm
@@ -14,7 +14,7 @@ sub open311_config {
 }
 
 sub open311_extra_data_include {
-    my ($self, $row, $h, $extra) = @_;
+    my ($self, $row, $h) = @_;
 
     my $open311_only = [
         { name => 'report_url',
@@ -31,9 +31,7 @@ sub open311_extra_data_include {
     # service at the point we're sending the report over Open311.
     if (!$row->get_extra_field_value('site_code')) {
         if (my $site_code = $self->lookup_site_code($row)) {
-            push @$extra,
-                { name => 'site_code',
-                value => $site_code };
+            $row->update_extra_field({ name => 'site_code', value => $site_code });
         }
     }
 
diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm
index 5c4407094..e51bd76c9 100644
--- a/perllib/FixMyStreet/SendReport/Open311.pm
+++ b/perllib/FixMyStreet/SendReport/Open311.pm
@@ -41,7 +41,7 @@ sub send {
 
         # Try and fill in some ones that we've been asked for, but not asked the user for
         my $extra = $row->get_extra_fields();
-        my ($include, $exclude) = $cobrand->call_hook(open311_extra_data => $row, $h, $extra, $contact);
+        my ($include, $exclude) = $cobrand->call_hook(open311_extra_data => $row, $h, $contact);
 
         my $original_extra = [ @$extra ];
         push @$extra, @$include if $include;
-- 
cgit v1.2.3


From f32e0900dd8c0a97c2b2214c973394e1fda2cb0e Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 5 Oct 2020 16:35:22 +0100
Subject: [Peterborough] Add USRN, nearest address to CSV.

---
 perllib/FixMyStreet/Cobrand/Peterborough.pm | 22 ++++++++++++++++++++++
 t/cobrand/peterborough.t                    | 22 +++++++++++++++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Peterborough.pm b/perllib/FixMyStreet/Cobrand/Peterborough.pm
index cb7da18af..16c3a01e4 100644
--- a/perllib/FixMyStreet/Cobrand/Peterborough.pm
+++ b/perllib/FixMyStreet/Cobrand/Peterborough.pm
@@ -98,4 +98,26 @@ around 'open311_config' => sub {
     $self->$orig($row, $h, $params);
 };
 
+sub dashboard_export_problems_add_columns {
+    my ($self, $csv) = @_;
+
+    $csv->add_csv_columns(
+        usrn => 'USRN',
+        nearest_address => 'Nearest address',
+    );
+
+    $csv->csv_extra_data(sub {
+        my $report = shift;
+
+        my $address = '';
+        $address = $report->geocode->{resourceSets}->[0]->{resources}->[0]->{name}
+            if $report->geocode;
+
+        return {
+            usrn => $report->get_extra_field_value('site_code'),
+            nearest_address => $address,
+        };
+    });
+}
+
 1;
diff --git a/t/cobrand/peterborough.t b/t/cobrand/peterborough.t
index 5b461d4f2..f7e45f190 100644
--- a/t/cobrand/peterborough.t
+++ b/t/cobrand/peterborough.t
@@ -117,13 +117,19 @@ subtest "extra bartec params are sent to open311" => sub {
             geocode => {
                 resourceSets => [ {
                     resources => [ {
+                        name => '12 A Street, XX1 1SZ',
                         address => {
                             addressLine => '12 A Street',
                             postalCode => 'XX1 1XZ'
                         }
                     } ]
                 } ]
-            }
+            },
+            extra => {
+                _fields => [
+                    { name => 'site_code', value => '12345', },
+                ],
+            },
         } );
 
         my $test_data = FixMyStreet::Script::Reports::send();
@@ -139,5 +145,19 @@ subtest "extra bartec params are sent to open311" => sub {
     };
 };
 
+subtest 'Dashboard CSV extra columns' => sub {
+    my $staffuser = $mech->create_user_ok('counciluser@example.com', name => 'Council User',
+        from_body => $peterborough, password => 'password');
+    $mech->log_in_ok( $staffuser->email );
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+        ALLOWED_COBRANDS => 'peterborough',
+    }, sub {
+        $mech->get_ok('/dashboard?export=1');
+    };
+    $mech->content_contains('"Reported As",USRN,"Nearest address"');
+    $mech->content_contains('peterborough,,12345,"12 A Street, XX1 1SZ"');
+};
+
 
 done_testing;
-- 
cgit v1.2.3


From 043bce556a17545c2c26386d8368f47ba8f541e6 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Wed, 7 Oct 2020 12:06:54 +0100
Subject: Show all category history even if category renamed

---
 CHANGELOG.md                                       | 1 +
 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm | 3 +--
 t/app/controller/admin/bodies.t                    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b31e4cf95..6bc23c6a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
         - Fix multiple disable messages for dropdown answers
         - Do not trigger duplicate check when checking stoppers
         - Do not strip spaces from middle of Open311 category codes. #3167
+        - Show all category history even if category renamed.
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
index 670336c14..f1a6f938b 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
@@ -151,8 +151,7 @@ sub category : Chained('body') : PathPart('') {
 
     my $history = $c->model('DB::ContactsHistory')->search(
         {
-            body_id => $c->stash->{body_id},
-            category => $c->stash->{contact}->category
+            contact_id => $c->stash->{contact}->id,
         },
         {
             order_by => ['contacts_history_id']
diff --git a/t/app/controller/admin/bodies.t b/t/app/controller/admin/bodies.t
index b63cacd9d..542c3f4c0 100644
--- a/t/app/controller/admin/bodies.t
+++ b/t/app/controller/admin/bodies.t
@@ -111,6 +111,7 @@ subtest 'check contact renaming' => sub {
     $mech->get('/admin/body/' . $body->id . '/test%20category');
     is $mech->res->code, 404;
     $mech->get_ok('/admin/body/' . $body->id . '/testing%20category');
+    $mech->content_contains('<td><strong>test2@example.com</strong></td>');
     $report->discard_changes;
     is $report->category, 'testing category';
     $mech->submit_form_ok( { with_fields => { category => 'test category' } } );
-- 
cgit v1.2.3


From 2d87d6bf7c7fa4eae0e098586a0efe04c5d866fe Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 8 Oct 2020 11:31:21 +0100
Subject: Fix email alert on initial update template.

A report's confirmation timestamp uses current_timestamp, and so
includes microseconds. An initial update text, to fit in with the
Open311 handling of updates, uses a DateTime object, which does not.
This means if a report is created when logged in, the initial update
can have a timestamp earlier than the report, and so is not alerted on.
---
 CHANGELOG.md                                     | 1 +
 perllib/FixMyStreet/App/Controller/Report/New.pm | 5 ++++-
 t/app/controller/report_new_update.t             | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bc23c6a6..ac1958e86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
         - Do not trigger duplicate check when checking stoppers
         - Do not strip spaces from middle of Open311 category codes. #3167
         - Show all category history even if category renamed.
+        - Fix email alert on initial update template.
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 037e1992a..3b42085ff 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -1736,7 +1736,10 @@ sub create_related_things : Private {
         my $request = {
             service_request_id => $problem->id,
             update_id => 'auto-internal',
-            comment_time => DateTime->now,
+            # Add a second so it is definitely later than problem confirmed timestamp,
+            # which uses current_timestamp (and thus microseconds) whilst this update
+            # is rounded down to the nearest second
+            comment_time => DateTime->now->add( seconds => 1 ),
             status => 'open',
             description => $description,
         };
diff --git a/t/app/controller/report_new_update.t b/t/app/controller/report_new_update.t
index cbb31cea4..e20975c3a 100644
--- a/t/app/controller/report_new_update.t
+++ b/t/app/controller/report_new_update.t
@@ -1,4 +1,5 @@
 use FixMyStreet::TestMech;
+use FixMyStreet::Script::Alerts;
 
 # disable info logs for this test run
 FixMyStreet::App->log->disable('info');
@@ -43,6 +44,9 @@ subtest "test report creation with initial auto-update" => sub {
     is $comment->user->id, $comment_user->id;
     is $comment->external_id, 'auto-internal';
     is $comment->name, 'Glos Council';
+
+    FixMyStreet::Script::Alerts::send();
+    my $email = $mech->get_email;
 };
 
 done_testing;
-- 
cgit v1.2.3


From fc4071d089a61de05bbc88dbd8849fa92fa4b72e Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 9 Oct 2020 09:57:24 +0100
Subject: do not cache the service worker

As the contents of the service worker vary depending on if the user is
logged in don't cache it.
---
 CHANGELOG.md                                  | 1 +
 perllib/FixMyStreet/App/Controller/Offline.pm | 1 +
 t/app/controller/offline.t                    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac1958e86..e2914f303 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
         - Do not strip spaces from middle of Open311 category codes. #3167
         - Show all category history even if category renamed.
         - Fix email alert on initial update template.
+        - Do not cache the service worker
     - Admin improvements:
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
diff --git a/perllib/FixMyStreet/App/Controller/Offline.pm b/perllib/FixMyStreet/App/Controller/Offline.pm
index adb3de14d..af05c585f 100644
--- a/perllib/FixMyStreet/App/Controller/Offline.pm
+++ b/perllib/FixMyStreet/App/Controller/Offline.pm
@@ -22,6 +22,7 @@ Offline pages Catalyst Controller - service worker handling
 
 sub service_worker : Path("/service-worker.js") {
     my ($self, $c) = @_;
+    $c->res->headers->header('Cache-Control' => 'max-age=0');
     $c->res->content_type('application/javascript');
 }
 
diff --git a/t/app/controller/offline.t b/t/app/controller/offline.t
index 876475264..d48af676f 100644
--- a/t/app/controller/offline.t
+++ b/t/app/controller/offline.t
@@ -54,6 +54,7 @@ FixMyStreet::override_config {
 
 subtest 'service worker' => sub {
     $mech->get_ok('/service-worker.js');
+    is $mech->res->header('Cache-Control'), 'max-age=0', 'service worker is not cached';
     $mech->content_contains('translation_strings');
     $mech->content_contains('offline/fallback');
 };
-- 
cgit v1.2.3


From 3909c8655d118402c798653d188515d7dc406b03 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 8 Oct 2020 11:59:55 +0100
Subject: Always show body name on updates even if anonymous

---
 perllib/FixMyStreet/DB/Result/Comment.pm     | 8 ++++++--
 templates/web/base/report/_update_state.html | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index a20c336a5..76e8d3185 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -267,9 +267,13 @@ sub meta_line {
 
     my $meta = '';
 
-    if ($self->anonymous or !$self->name) {
+    my $contributed_as = $self->get_extra_metadata('contributed_as') || '';
+    my $staff = $self->user->from_body || $self->get_extra_metadata('is_body_user') || $self->get_extra_metadata('is_superuser');
+    my $anon = $self->anonymous || !$self->name;
+
+    if ($anon && (!$staff || $contributed_as eq 'anonymous_user' || $contributed_as eq 'another_user')) {
         $meta = sprintf( _( 'Posted anonymously at %s' ), Utils::prettify_dt( $self->confirmed ) )
-    } elsif ($self->user->from_body || $self->get_extra_metadata('is_body_user') || $self->get_extra_metadata('is_superuser') ) {
+    } elsif ($staff) {
         my $user_name = FixMyStreet::Template::html_filter($self->user->name);
         my $body;
         if ($self->get_extra_metadata('is_superuser')) {
diff --git a/templates/web/base/report/_update_state.html b/templates/web/base/report/_update_state.html
index ecac68850..d484dcb05 100644
--- a/templates/web/base/report/_update_state.html
+++ b/templates/web/base/report/_update_state.html
@@ -12,7 +12,7 @@
 
 <p class="meta-2">
     [% INCLUDE meta_line %]
-  [% IF c.user_exists AND c.user.id == update.user_id AND !update.anonymous %]
+  [% IF c.user_exists AND c.user.id == update.user_id AND !update.anonymous AND NOT (c.user.from_body OR c.user.is_superuser) %]
     <small>(<a href="/my/anonymize?update=[% update.id | uri %]" class="js-hide-name">[% loc('Hide your name?') %]</a>)</small>
   [% END %]
   [% mlog = update.latest_moderation_log_entry(); IF mlog %]
-- 
cgit v1.2.3


From a91ee9b19d21754f91bed26118b7cd9a2b2cc6d4 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 8 Oct 2020 12:00:17 +0100
Subject: [Bexley] Different message for anonymous updates.

---
 perllib/FixMyStreet/Cobrand/Bexley.pm    |  8 ++++++++
 perllib/FixMyStreet/DB/Result/Comment.pm |  3 ++-
 t/cobrand/bexley.t                       | 12 +++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bexley.pm b/perllib/FixMyStreet/Cobrand/Bexley.pm
index 215b9d2cb..2c05439be 100644
--- a/perllib/FixMyStreet/Cobrand/Bexley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bexley.pm
@@ -221,4 +221,12 @@ sub _is_out_of_hours {
     return 0;
 }
 
+sub update_anonymous_message {
+    my ($self, $update) = @_;
+    my $t = Utils::prettify_dt( $update->confirmed );
+
+    my $staff = $update->user->from_body || $update->get_extra_metadata('is_body_user') || $update->get_extra_metadata('is_superuser');
+    return sprintf('Posted anonymously by a non-staff user at %s', $t) if !$staff;
+}
+
 1;
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index 76e8d3185..82476ba10 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -272,7 +272,8 @@ sub meta_line {
     my $anon = $self->anonymous || !$self->name;
 
     if ($anon && (!$staff || $contributed_as eq 'anonymous_user' || $contributed_as eq 'another_user')) {
-        $meta = sprintf( _( 'Posted anonymously at %s' ), Utils::prettify_dt( $self->confirmed ) )
+        $meta = $cobrand->call_hook(update_anonymous_message => $self);
+        $meta ||= sprintf( _( 'Posted anonymously at %s' ), Utils::prettify_dt( $self->confirmed ) )
     } elsif ($staff) {
         my $user_name = FixMyStreet::Template::html_filter($self->user->name);
         my $body;
diff --git a/t/cobrand/bexley.t b/t/cobrand/bexley.t
index 8ce6c45f2..46a25d923 100644
--- a/t/cobrand/bexley.t
+++ b/t/cobrand/bexley.t
@@ -147,7 +147,7 @@ FixMyStreet::override_config {
 
     subtest 'resend is disabled in admin' => sub {
         my $user = $mech->log_in_ok('super@example.org');
-        $user->update({ from_body => $body, is_superuser => 1 });
+        $user->update({ from_body => $body, is_superuser => 1, name => 'Staff User' });
         $mech->get_ok('/admin/report_edit/' . $report->id);
         $mech->content_contains('View report on site');
         $mech->content_lacks('Resend report');
@@ -202,6 +202,16 @@ FixMyStreet::override_config {
         ], 'Request had multiple photos';
     };
 
+    subtest 'anonymous update message' => sub {
+        my $report = FixMyStreet::DB->resultset("Problem")->first;
+        my $staffuser = $mech->create_user_ok('super@example.org');
+        $mech->create_comment_for_problem($report, $report->user, 'Commenter', 'Normal update', 't', 'confirmed', 'confirmed');
+        $mech->create_comment_for_problem($report, $staffuser, 'Staff user', 'Staff update', 'f', 'confirmed', 'confirmed');
+        $mech->get_ok('/report/' . $report->id);
+        $mech->content_contains('Posted by <strong>London Borough of Bexley</strong>');
+        $mech->content_contains('Posted anonymously by a non-staff user');
+    };
+
 };
 
 subtest 'nearest road returns correct road' => sub {
-- 
cgit v1.2.3


From 5554f089315fd65429d0143c33a5a61c1bed5138 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 9 Oct 2020 17:50:53 +0100
Subject: [Docs] Improve text on staff creating as others.

---
 docs/_includes/admin-tasks-content.md | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index 0fdc259e9..234565587 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -147,20 +147,22 @@ recognition of your staff role.
 
 <div class="admin-task" markdown="1" id="create-reports-behalf-user">
 
-### Creating reports on behalf of another user/ the council
+### Creating reports/ updates on behalf of another user/ the council
 
 <span class="admin-task__permissions">Permissions required: User must be marked
-as staff; one or more of ‘Create reports/updates on a user's behalf’, ‘Create
-reports/updates as anonymous user’ and ‘Create reports/updates as the council’
-must be ticked.</span>
-
-If a resident makes a report by phone or in person, staff members with the appropriate
-permissions can add it to FixMyStreet on their behalf. The report may bear the resident’s name; or
-it may be anonymous (i.e. the report-maker’s name is not published on the site, but will still be
-available in the admin interface). Alternatively, reports can be made as if from the council itself.
-In such cases, staff should make a new report just as a member of the public would — see ‘[The
+as staff; optionally, one or more of ‘Create reports/updates on a user's
+behalf’, ‘Create reports/updates as anonymous user’ and ‘Create reports/updates
+as the council’ can be ticked.</span>
+
+If a resident makes a report or update by phone or in person, staff members
+with the appropriate permissions can add it to FixMyStreet on their behalf. The
+report will be anonymous on the site, but the resident’s name will still be
+available in the admin interface. Reports can also be made as if from the
+council.
+
+Staff should make a new report just as a member of the public would — see ‘[The
 citizen’s experience](/pro-manual/citizens-experience/)'. Those with the appropriate permissions will see a dropdown box in
-the report-making interface, labeled ‘Report As’. Select ‘the council’, ‘yourself’, ‘anonymous’ or
+the report-making interface, labeled ‘Report As’. Select either the council, ‘yourself’, ‘anonymous’ or
 ‘another user’.
 
 If a user has the ‘Default to creating reports/update as the council’
@@ -168,6 +170,12 @@ permission then the dropdown will default to reporting as the council.
 Staff with the ’Markup problem details’ permission will also default to
 reporting as the council.
 
+When a staff member makes an update on the site, it will not be publicly
+displayed with the staff member’s name, but the name of the body to which the
+user is attached. Staff members with the ‘See user detail for reports created
+as the council’ permission will be able to see the staff user’s name on the
+report or update, but other staff and the public will not.
+
 </div>
 
 
-- 
cgit v1.2.3


From 470d978db885e3ff95e7a8632a94a60b09cef127 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 12 Oct 2020 13:26:42 +0100
Subject: Include extra fields in submit emails.

---
 CHANGELOG.md                                                  |  1 +
 perllib/FixMyStreet/Cobrand/Bexley.pm                         |  3 ---
 templates/email/default/submit.html                           |  8 ++++++++
 templates/email/default/submit.txt                            |  5 +++++
 .../fixmystreet.com/bathnes/submit-street-light-fault.html    |  2 --
 .../fixmystreet.com/bathnes/submit-street-light-fault.txt     |  2 --
 templates/email/fixmystreet.com/submit.html                   | 11 ++++++++---
 templates/email/fixmystreet.com/submit.txt                    |  5 ++++-
 templates/email/hounslow/submit.html                          |  3 ---
 templates/email/hounslow/submit.txt                           |  2 --
 templates/email/oxfordshire/submit.html                       |  3 ---
 templates/email/oxfordshire/submit.txt                        |  2 --
 templates/email/tfl/submit.html                               |  3 ---
 templates/email/tfl/submit.txt                                |  2 --
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2914f303..70dd5771d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
         - Response templates can include HTML tags. #3143
         - Record whether report made on desktop or mobile.
         - Do not display deleted priorities in inspect form. #3195
+        - Include extra fields in submit emails.
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
diff --git a/perllib/FixMyStreet/Cobrand/Bexley.pm b/perllib/FixMyStreet/Cobrand/Bexley.pm
index 2c05439be..063a225b7 100644
--- a/perllib/FixMyStreet/Cobrand/Bexley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bexley.pm
@@ -198,9 +198,6 @@ sub open311_post_send {
 
     $self->open311_config($row, $h, {}, $contact); # Populate NSGRef again if needed
 
-    my $extra_data = join "; ", map { "$_->{description}: $_->{value}" } @{$row->get_extra_fields};
-    $h->{additional_information} = $extra_data;
-
     $sender->send($row, $h);
 }
 
diff --git a/templates/email/default/submit.html b/templates/email/default/submit.html
index 0fed5770f..e08a31b5a 100644
--- a/templates/email/default/submit.html
+++ b/templates/email/default/submit.html
@@ -49,6 +49,14 @@ of a local problem that they believe might require your attention.</p>
     <h2 style="[% h2_style %]">[% report.title | html %]</h2>
     <p style="[% secondary_p_style %]">[% report.category | html %]</p>
     <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
+  [% IF report.get_extra_fields %]
+    <p style="[% secondary_p_style %]">
+      [%~ FOR field IN report.get_extra_fields %][% IF field.value %]
+      [% field.description %]: [% field.value %]
+      [% IF NOT loop.last %]<br>[% END %]
+      [%~ END %][% END %]
+    </p>
+  [% END %]
     <p style="[% secondary_p_style %]">
       <strong>Location:</strong>
       <a href="[% osm_url %]" title="View OpenStreetMap of this location">
diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt
index f08e723a8..b380825e4 100644
--- a/templates/email/default/submit.txt
+++ b/templates/email/default/submit.txt
@@ -25,6 +25,11 @@ Subject: [% report.title %]
 
 Details: [% report.detail %]
 
+[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
+[% field.description %]: [% field.value %]
+
+[% END %][% END ~%]
+
 Latitude: [% report.latitude %]
 
 Longitude: [% report.longitude %]
diff --git a/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.html b/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.html
index 8af8ea1b0..61aa9af34 100644
--- a/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.html
+++ b/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.html
@@ -48,8 +48,6 @@
 <td>[% url %]</td>
 </tr>
 </table>
-[% additional_information %]
-
 
 <h2>Location Details</h2>
 
diff --git a/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.txt b/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.txt
index a860c0a34..20a2aeb4f 100644
--- a/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.txt
+++ b/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.txt
@@ -24,8 +24,6 @@ Title: [% title %]
 
 Description: [% detail %]
 
-[% additional_information %]
-
 [% url %]
 
 Location Details
diff --git a/templates/email/fixmystreet.com/submit.html b/templates/email/fixmystreet.com/submit.html
index f8b2db0dc..1d40f1eb6 100644
--- a/templates/email/fixmystreet.com/submit.html
+++ b/templates/email/fixmystreet.com/submit.html
@@ -49,9 +49,14 @@ of a local problem that they believe might require your attention.</p>
     <h2 style="[% h2_style %]">[% report.title | html %]</h2>
     <p style="[% secondary_p_style %]"><strong>Category:</strong> [% report.category | html %]</p>
     <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
-    [%~ IF additional_information %]
-    <p style="[% secondary_p_style %]">[% additional_information %]</p>
-    [%~ END %]
+  [% IF report.get_extra_fields %]
+    <p style="[% secondary_p_style %]">
+      [%~ FOR field IN report.get_extra_fields %][% IF field.value %]
+        [% field.description %]: [% field.value %]
+        [% IF NOT loop.last %]<br>[% END %]
+      [%~ END %][% END %]
+    </p>
+  [% END %]
     <p style="[% secondary_p_style %]">
       <strong>Location:</strong>
       <br>Easting/Northing
diff --git a/templates/email/fixmystreet.com/submit.txt b/templates/email/fixmystreet.com/submit.txt
index c22d83713..3b3c0980f 100644
--- a/templates/email/fixmystreet.com/submit.txt
+++ b/templates/email/fixmystreet.com/submit.txt
@@ -25,7 +25,10 @@ Subject: [% report.title %]
 
 Details: [% report.detail %]
 
-[% additional_information %]
+[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
+[% field.description %]: [% field.value %]
+
+[% END %][% END ~%]
 
 Easting/Northing
 [%- " (IE)" IF coordsyst == "I" -%]
diff --git a/templates/email/hounslow/submit.html b/templates/email/hounslow/submit.html
index 5b9f2e255..a22f15243 100644
--- a/templates/email/hounslow/submit.html
+++ b/templates/email/hounslow/submit.html
@@ -52,9 +52,6 @@ of a local problem that they believe might require your attention.</p>
     [% END %]
     <p style="[% secondary_p_style %]"><strong>Category:</strong> [% report.category | html %]</p>
     <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
-    [%~ IF additional_information %]
-    <p style="[% secondary_p_style %]">[% additional_information %]</p>
-    [%~ END %]
     <p style="[% secondary_p_style %]">
       <strong>Location:</strong>
       <br>Easting/Northing
diff --git a/templates/email/hounslow/submit.txt b/templates/email/hounslow/submit.txt
index 3d9518e53..bbf23326b 100644
--- a/templates/email/hounslow/submit.txt
+++ b/templates/email/hounslow/submit.txt
@@ -25,8 +25,6 @@ Subject: [% report.title %]
 
 Details: [% report.detail %]
 
-[% additional_information %]
-
 Easting/Northing
 [%- " (IE)" IF coordsyst == "I" -%]
 : [% easting %]/[% northing %]
diff --git a/templates/email/oxfordshire/submit.html b/templates/email/oxfordshire/submit.html
index d26f3d44e..428436523 100644
--- a/templates/email/oxfordshire/submit.html
+++ b/templates/email/oxfordshire/submit.html
@@ -49,9 +49,6 @@ of a local problem that they believe might require your attention.</p>
     <h2 style="[% h2_style %]">[% report.title | html %]</h2>
     <p style="[% secondary_p_style %]"><strong>Category:</strong> [% report.category | html %]</p>
     <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
-    [%~ IF additional_information %]
-    <p style="[% secondary_p_style %]">[% additional_information %]</p>
-    [%~ END %]
     <p style="[% secondary_p_style %]">
       <strong>Location:</strong>
       <br>Easting/Northing
diff --git a/templates/email/oxfordshire/submit.txt b/templates/email/oxfordshire/submit.txt
index 90de2e60c..faa39e2b4 100644
--- a/templates/email/oxfordshire/submit.txt
+++ b/templates/email/oxfordshire/submit.txt
@@ -25,8 +25,6 @@ Subject: [% report.title %]
 
 Details: [% report.detail %]
 
-[% additional_information %]
-
 [%- IF report.get_extra_field_value('feature_id') %]
 Asset id: [% report.get_extra_field_value('feature_id') %]
 [%- END %]
diff --git a/templates/email/tfl/submit.html b/templates/email/tfl/submit.html
index a1bd8f134..2bce514d0 100644
--- a/templates/email/tfl/submit.html
+++ b/templates/email/tfl/submit.html
@@ -58,9 +58,6 @@ of a local problem that they believe might require your attention.</p>
       <p style="[% secondary_p_style %]"><strong>Signal site number:</strong> [% report.get_extra_field_value('site') | html %]</p>
     [% END %]
     <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
-    [%~ IF additional_information %]
-    <p style="[% secondary_p_style %]">[% additional_information %]</p>
-    [%~ END %]
     <p style="[% secondary_p_style %]">
       <strong>Location:</strong>
       <br>Easting/Northing
diff --git a/templates/email/tfl/submit.txt b/templates/email/tfl/submit.txt
index b6af867ff..6c1f323b0 100644
--- a/templates/email/tfl/submit.txt
+++ b/templates/email/tfl/submit.txt
@@ -31,8 +31,6 @@ Subject: [% report.title %]
 
 Details: [% report.detail %]
 
-[% additional_information %]
-
 Easting/Northing
 [%- " (IE)" IF coordsyst == "I" -%]
 : [% easting %]/[% northing %]
-- 
cgit v1.2.3


From 19deaf332d2843e3b4337f3e2047bce47e4a7cd1 Mon Sep 17 00:00:00 2001
From: Chris Mytton <chrism@mysociety.org>
Date: Fri, 15 May 2020 17:42:06 +0100
Subject: [Oxfordshire] Add instruct defect functionality back in

In the past Oxfordshire had a way for inspectors to "instruct a defect",
which generated a CSV which got emailed to Oxfordshire with a list of
defects.

They now want to bring this functionality back, but instead of emailing
a CSV they want it to call an API.

As a first step towards that goal, this change adds back some of the
instruct defect functionality that was removed in 68e18ff.
---
 .cypress/cypress/integration/oxfordshire.js        | 25 +++++++++++++++
 bin/browser-tests                                  | 16 ++++++++--
 bin/fixmystreet.com/fixture                        |  3 ++
 perllib/FixMyStreet/App/Controller/Report.pm       | 10 +++++-
 t/app/controller/report_inspect.t                  | 37 +++++++++++++++++++++-
 templates/web/base/report/_inspect.html            |  3 ++
 .../web/oxfordshire/report/inspect/_inspected.html |  7 ++++
 .../oxfordshire/report/inspect/_raise_defect.html  | 11 +++++++
 web/cobrands/fixmystreet/staff.js                  | 13 ++++++++
 9 files changed, 121 insertions(+), 4 deletions(-)
 create mode 100644 .cypress/cypress/integration/oxfordshire.js
 create mode 100644 templates/web/oxfordshire/report/inspect/_inspected.html
 create mode 100644 templates/web/oxfordshire/report/inspect/_raise_defect.html

diff --git a/.cypress/cypress/integration/oxfordshire.js b/.cypress/cypress/integration/oxfordshire.js
new file mode 100644
index 000000000..f235802e6
--- /dev/null
+++ b/.cypress/cypress/integration/oxfordshire.js
@@ -0,0 +1,25 @@
+describe("Oxfordshire cobrand", function() {
+  it("allows inspectors to instruct defects", function() {
+    cy.server();
+    cy.request({
+      method: 'POST',
+      url: 'http://oxfordshire.localhost:3001/auth',
+      form: true,
+      body: { username: 'inspector-instructor@example.org', password_sign_in: 'password' }
+    });
+    cy.visit('http://oxfordshire.localhost:3001/report/1');
+    cy.contains('Oxfordshire');
+
+    cy.get('#report_inspect_form').should('be.visible');
+    cy.get('#js-inspect-action-scheduled').should('not.be.visible');
+    cy.get('#raise_defect_yes').should('not.have.attr', 'required');
+
+    cy.get('#report_inspect_form select[name=state]').select('Action scheduled');
+    cy.get('#js-inspect-action-scheduled').should('be.visible');
+    cy.get('#raise_defect_yes').should('have.attr', 'required', 'required');
+
+    cy.get('#report_inspect_form select[name=state]').select('No further action');
+    cy.get('#js-inspect-action-scheduled').should('not.be.visible');
+    cy.get('#raise_defect_yes').should('not.have.attr', 'required');
+  });
+});
diff --git a/bin/browser-tests b/bin/browser-tests
index e0b9bedfe..bfbe4e51d 100755
--- a/bin/browser-tests
+++ b/bin/browser-tests
@@ -11,7 +11,19 @@ my ($cobrand, $coords, $area_id, $name, $mapit_url, $coverage);
 
 BEGIN {
     $config_file = 'conf/general.yml-example';
-    $cobrand = [ 'borsetshire', 'fixmystreet', 'northamptonshire', 'bathnes', 'buckinghamshire', 'hounslow', 'isleofwight', 'peterborough', 'tfl', 'hackney' ];
+    $cobrand = [qw(
+        bathnes
+        borsetshire
+        buckinghamshire
+        fixmystreet
+        hackney
+        hounslow
+        isleofwight
+        northamptonshire
+        oxfordshire
+        peterborough
+        tfl
+    )];
     $coords = '51.532851,-2.284277';
     $area_id = 2608;
     $name = 'Borsetshire';
@@ -190,7 +202,7 @@ browser-tests [running options] [fixture options] [cypress options]
    --help           this help message
 
  Fixture option:
-   --cobrand        Cobrand(s) to use, default is fixmystreet,northamptonshire,bathnes,buckinghamshire,isleofwight,peterborough,tfl,hackney
+   --cobrand        Cobrand(s) to use, default is fixmystreet,northamptonshire,bathnes,buckinghamshire,isleofwight,peterborough,tfl,hackney,oxfordshire
    --coords         Default co-ordinates for created reports
    --area_id        Area ID to use for created body
    --name           Name to use for created body
diff --git a/bin/fixmystreet.com/fixture b/bin/fixmystreet.com/fixture
index e8dd3f364..59de8e222 100755
--- a/bin/fixmystreet.com/fixture
+++ b/bin/fixmystreet.com/fixture
@@ -103,6 +103,7 @@ if ($opt->test_fixtures) {
         { area_id => 2636, categories => [ 'Potholes', 'Private', 'Extra' ], name => 'Isle of Wight Council' },
         { area_id => 2566, categories => [ 'Fallen branch', 'Light Out', 'Light Dim', 'Fallen Tree', 'Damaged Tree' ], name => 'Peterborough City Council' },
         { area_id => 2498, categories => [ 'Incorrect timetable', 'Glass broken', 'Mobile Crane Operation' ], name => 'TfL' },
+        { area_id => 2237, categories => [ 'Flytipping', 'Roads', 'Parks' ], name => 'Oxfordshire County Council' },
     ) {
         $bodies->{$_->{area_id}} = FixMyStreet::DB::Factory::Body->find_or_create($_);
         my $cats = join(', ', @{$_->{categories}});
@@ -279,6 +280,7 @@ $priority->add_to_contacts($body->contacts->first);
 say "Created users, all with password 'password':";
 my %users;
 my $perms_inspector = ['report_inspect', 'planned_reports'];
+my $perms_inspector_with_instruct = [@$perms_inspector, 'report_instruct'];
 my $perms_cs = [
     'contribute_as_body', 'contribute_as_another_user',
     'moderate', 'view_body_contribute_details',
@@ -290,6 +292,7 @@ my $perms_cs_full = [
 ];
 foreach (
     { name => 'Inspector Gadget', email => 'inspector@example.org', email_verified => 1, body => $body, permissions => $perms_inspector },
+    { name => 'Inspector Instructor', email => 'inspector-instructor@example.org', email_verified => 1, body => $body, permissions => $perms_inspector_with_instruct },
     { name => 'Harriet Helpful', email_verified => 1, email => 'cs@example.org', body => $body, permissions => $perms_cs },
     { name => 'Andrew Agreeable', email_verified => 1, email => 'cs_full@example.org', body => $body, permissions => $perms_cs_full },
     { name => 'Super User', email_verified => 1, email => 'super@example.org', body => $body, permissions => [
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 98c4aba17..1e5751588 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -467,7 +467,7 @@ sub inspect : Private {
                 }
             }
 
-            if ( $c->get_param('include_update') ) {
+            if ( $c->get_param('include_update') or $c->get_param('raise_defect') ) {
                 $update_text = Utils::cleanup_text( $c->get_param('public_update'), { allow_multiline => 1 } );
                 if (!$update_text) {
                     $valid = 0;
@@ -512,6 +512,14 @@ sub inspect : Private {
                 };
                 $c->user->create_alert($problem->id, $options);
             }
+
+            # If the state has been changed to action scheduled and they've said
+            # they want to raise a defect, consider the report to be inspected.
+            if ($problem->state eq 'action scheduled' && $c->get_param('raise_defect') && !$problem->get_extra_metadata('inspected')) {
+                $update_params{extra} = { 'defect_raised' => 1 };
+                $problem->set_extra_metadata( inspected => 1 );
+                $c->forward( '/admin/log_edit', [ $problem->id, 'problem', 'inspected' ] );
+            }
         }
 
         $problem->non_public($c->get_param('non_public') ? 1 : 0);
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index c10fe7f94..367327c16 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -246,7 +246,7 @@ FixMyStreet::override_config {
         $user->update;
     };
 
-    subtest "test update is required when instructing" => sub {
+    subtest "test public update is required if include_update is checked" => sub {
         $report->update;
         $report->comments->delete_all;
         $mech->get_ok("/report/$report_id");
@@ -913,6 +913,41 @@ FixMyStreet::override_config {
         $contact2->unset_extra_metadata('assigned_users_only');
         $contact2->update;
     };
+
+    subtest 'instruct defect' => sub {
+        $user->user_body_permissions->create({ body => $oxon, permission_type => 'report_instruct' });
+        $mech->get_ok("/report/$report2_id");
+        $mech->submit_form_ok({ button => 'save', with_fields => {
+            public_update => "This is a public update.", include_update => "1",
+            state => 'action scheduled', raise_defect => 1,
+        } });
+        $report2->discard_changes;
+        is $report2->get_extra_metadata('inspected'), 1, 'report marked as inspected';
+        $mech->get_ok("/report/$report2_id");
+        my $meta = $mech->extract_update_metas;
+        like $meta->[0], qr/State changed to: Action scheduled/, 'First update mentions action scheduled';
+        like $meta->[1], qr/Posted by .*defect raised/, 'Update mentions defect raised';
+        my $log_entry = $report2->inspection_log_entry;
+        is $log_entry->object_id, $report2_id, 'Log entry has correct ID';
+        is $log_entry->object_type, 'problem', 'Log entry has correct type';
+        is $log_entry->action, 'inspected', 'Log entry has correct action';
+    };
+
+    subtest "test update is required when instructing defect" => sub {
+        $report2->unset_extra_metadata('inspected');
+        $report2->update;
+        $report2->inspection_log_entry->delete;
+        $report2->comments->delete_all;
+        $mech->get_ok("/report/$report2_id");
+        $mech->submit_form_ok({ button => 'save', with_fields => {
+            public_update => "", include_update => "0",
+            state => 'action scheduled', raise_defect => 1,
+        } });
+        is_deeply $mech->page_errors, [ "Please provide a public update for this report." ], 'errors match';
+        $report2->discard_changes;
+        is $report2->comments->count, 0, "Update wasn't created";
+        is $report2->get_extra_metadata('inspected'), undef, 'report not marked as inspected';
+    };
 };
 
 done_testing();
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 30848b5d4..f7d8cc056 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -34,6 +34,7 @@
             <label for="state">[% loc('State') %]</label>
             [% INCLUDE 'report/inspect/state_groups_select.html' %]
           </p>
+          [% TRY %][% INCLUDE 'report/inspect/_raise_defect.html' %][% CATCH file %][% END %]
           <div id="js-duplicate-reports" class="[% "hidden" UNLESS problem.duplicate_of %]">
             <input type="hidden" name="duplicate_of" value="[% problem.duplicate_of.id %]">
             <p class="[% "hidden" UNLESS problem.duplicate_of %]"><strong>[% loc('Duplicate of') %]</strong></p>
@@ -70,6 +71,8 @@
           [% INCLUDE 'report/inspect/public_update.html' %]
         [% END %]
 
+        [% TRY %][% INCLUDE 'report/inspect/_inspected.html' %][% CATCH file %][% END %]
+
         <p>
           <input type="hidden" name="token" value="[% csrf_token %]" />
           [% IF permissions.planned_reports %]
diff --git a/templates/web/oxfordshire/report/inspect/_inspected.html b/templates/web/oxfordshire/report/inspect/_inspected.html
new file mode 100644
index 000000000..58d6c1528
--- /dev/null
+++ b/templates/web/oxfordshire/report/inspect/_inspected.html
@@ -0,0 +1,7 @@
+[% IF problem.get_extra_metadata('inspected') %]
+[% IF problem.whensent %]
+  <p>[% loc("<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on.") %]</p>
+[% ELSE %]
+  <p>[% loc("<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on.") %]</p>
+[% END %]
+[% END %]
diff --git a/templates/web/oxfordshire/report/inspect/_raise_defect.html b/templates/web/oxfordshire/report/inspect/_raise_defect.html
new file mode 100644
index 000000000..5783def48
--- /dev/null
+++ b/templates/web/oxfordshire/report/inspect/_raise_defect.html
@@ -0,0 +1,11 @@
+[% IF permissions.report_instruct AND NOT problem.get_extra_metadata('inspected') %]
+<div id="js-inspect-action-scheduled" class="[% "hidden" UNLESS problem.state == 'action scheduled' %]">
+  <p>[% loc('Do you want to automatically raise a defect?') %]</p>
+  <p class="segmented-control segmented-control--radio">
+      <input type="radio" name="raise_defect" id="raise_defect_yes" value="1">
+      <label class="btn" for="raise_defect_yes">[% loc('Yes') %]</label>
+      <input type="radio" name="raise_defect" id="raise_defect_no" value="0">
+      <label class="btn" for="raise_defect_no">[% loc('No') %]</label>
+  </p>
+</div>
+[% END %]
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index 4bbc0b11d..ec85dbb8d 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -1,4 +1,16 @@
 fixmystreet.staff_set_up = {
+  action_scheduled_raise_defect: function() {
+    $("#report_inspect_form").find('[name=state]').on('change', function() {
+        if ($(this).val() !== "action scheduled") {
+            $("#js-inspect-action-scheduled").addClass("hidden");
+            $('#raise_defect_yes').prop('required', false);
+        } else {
+            $("#js-inspect-action-scheduled").removeClass("hidden");
+            $('#raise_defect_yes').prop('required', true);
+        }
+    });
+  },
+
   list_item_actions: function() {
     $('#js-reports-list').on('click', ':submit', function(e) {
       e.preventDefault();
@@ -423,6 +435,7 @@ $(fixmystreet).on('display:report', function() {
     fixmystreet.staff_set_up.response_templates();
     if ($("#report_inspect_form").length) {
         fixmystreet.staff_set_up.report_page_inspect();
+        fixmystreet.staff_set_up.action_scheduled_raise_defect();
     }
 });
 
-- 
cgit v1.2.3


From e008a0b1ddd45e9afed4198a32b20d6c4f5c6d66 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 30 Jul 2020 12:25:20 +0100
Subject: [Oxfordshire] Send flag and other data with defect

If the update being sent is raising a defect, include USRN-based and
location data.
---
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm | 29 ++++++++++++++++++++
 perllib/FixMyStreet/Cobrand/UKCouncils.pm  |  6 ++---
 t/cobrand/oxfordshire.t                    | 43 ++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 0f34ff09f..34e21ddfc 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -155,6 +155,35 @@ sub open311_post_send {
     $row->detail($self->{ox_original_detail});
 }
 
+sub open311_munge_update_params {
+    my ($self, $params, $comment, $body) = @_;
+
+    if ($comment->get_extra_metadata('defect_raised')) {
+        my $p = $comment->problem;
+        my ($e, $n) = $p->local_coords;
+        my $usrn = $p->get_extra_field_value('usrn');
+        if (!$usrn) {
+            my $cfg = {
+                url => 'https://tilma.mysociety.org/mapserver/oxfordshire',
+                typename => "OCCRoads",
+                srsname => 'urn:ogc:def:crs:EPSG::27700',
+                accept_feature => sub { 1 },
+                filter => "<Filter xmlns:gml=\"http://www.opengis.net/gml\"><DWithin><PropertyName>SHAPE_GEOMETRY</PropertyName><gml:Point><gml:coordinates>$e,$n</gml:coordinates></gml:Point><Distance units='m'>20</Distance></DWithin></Filter>",
+            };
+            my $features = $self->_fetch_features($cfg);
+            my $feature = $self->_nearest_feature($cfg, $e, $n, $features);
+            if ($feature) {
+                my $props = $feature->{properties};
+                $usrn = Utils::trim_text($props->{TYPE1_2_USRN});
+            }
+        }
+        $params->{'attribute[usrn]'} = $usrn;
+        $params->{'attribute[raise_defect]'} = 1;
+        $params->{'attribute[easting]'} = $e;
+        $params->{'attribute[northing]'} = $n;
+    }
+}
+
 sub should_skip_sending_update {
     my ($self, $update ) = @_;
 
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index f472876ef..0e8341d57 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -425,7 +425,7 @@ sub _nearest_feature {
 
     # We have a list of features, and we want to find the one closest to the
     # report location.
-    my $site_code = '';
+    my $chosen = '';
     my $nearest;
 
     # We shouldn't receive anything aside from these geometry types, but belt and braces.
@@ -452,14 +452,14 @@ sub _nearest_feature {
             for (my $i=0; $i<@$coordinates-1; $i++) {
                 my $distance = $self->_distanceToLine($x, $y, $coordinates->[$i], $coordinates->[$i+1]);
                 if ( !defined $nearest || $distance < $nearest ) {
-                    $site_code = $feature->{properties}->{$cfg->{property}};
+                    $chosen = $feature;
                     $nearest = $distance;
                 }
             }
         }
     }
 
-    return $site_code;
+    return $cfg->{property} && $chosen ? $chosen->{properties}->{$cfg->{property}} : $chosen;
 }
 
 sub contact_name {
diff --git a/t/cobrand/oxfordshire.t b/t/cobrand/oxfordshire.t
index cfa98254f..b5e51e808 100644
--- a/t/cobrand/oxfordshire.t
+++ b/t/cobrand/oxfordshire.t
@@ -4,6 +4,7 @@ use CGI::Simple;
 use FixMyStreet::TestMech;
 use FixMyStreet::Script::Alerts;
 use FixMyStreet::Script::Reports;
+use Open311;
 my $mech = FixMyStreet::TestMech->new;
 
 my $oxon = $mech->create_body_ok(2237, 'Oxfordshire County Council');
@@ -178,6 +179,48 @@ FixMyStreet::override_config {
         };
     }
 
+    subtest 'extra data sent with defect update' => sub {
+        my $comment = FixMyStreet::DB->resultset('Comment')->first;
+        $comment->set_extra_metadata(defect_raised => 1);
+        $comment->update;
+        $comment->problem->external_id('hey');
+        $comment->problem->update;
+
+        my $cbr = Test::MockModule->new('FixMyStreet::Cobrand::Oxfordshire');
+        $cbr->mock('_fetch_features', sub {
+            my ($self, $cfg, $x, $y) = @_;
+            [ {
+                type => 'Feature',
+                geometry => { type => 'LineString', coordinates => [ [ 1, 2 ], [ 3, 4 ] ] },
+                properties => { TYPE1_2_USRN => 13579 },
+            } ];
+        });
+        my $test_res = HTTP::Response->new();
+        $test_res->code(200);
+        $test_res->message('OK');
+        $test_res->content('<?xml version="1.0" encoding="utf-8"?><service_request_updates><request_update><update_id>248</update_id></request_update></service_request_updates>');
+
+        my $o = Open311->new(
+            fixmystreet_body => $oxon,
+            test_mode => 1,
+            test_get_returns => { 'servicerequestupdates.xml' => $test_res },
+        );
+
+        $o->post_service_request_update($comment);
+        my $cgi = CGI::Simple->new($o->test_req_used->content);
+        is $cgi->param('attribute[usrn]'), 13579, 'USRN sent with update';
+        is $cgi->param('attribute[raise_defect]'), 1, 'Defect flag sent with update';
+
+        # Now set a USRN on the problem (found at submission)
+        $comment->problem->push_extra_fields({ name => 'usrn', value => '12345' });
+        $comment->problem->update;
+
+        $o->post_service_request_update($comment);
+        $cgi = CGI::Simple->new($o->test_req_used->content);
+        is $cgi->param('attribute[usrn]'), 12345, 'USRN sent with update';
+        is $cgi->param('attribute[raise_defect]'), 1, 'Defect flag sent with update';
+    };
+
 };
 
 done_testing();
-- 
cgit v1.2.3


From 90d23fc7b21f4391aeb92418e212195a18d72d5e Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 11 Aug 2020 15:46:06 +0100
Subject: [Oxfordshire] Extra questions for raising defect.

---
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm         | 14 ++++
 t/app/controller/report_inspect.t                  |  2 +
 t/cobrand/oxfordshire.t                            |  5 ++
 .../oxfordshire/report/inspect/_raise_defect.html  | 74 +++++++++++++++++++++-
 4 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 34e21ddfc..ab0bfe563 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -181,6 +181,10 @@ sub open311_munge_update_params {
         $params->{'attribute[raise_defect]'} = 1;
         $params->{'attribute[easting]'} = $e;
         $params->{'attribute[northing]'} = $n;
+
+        foreach (qw(defect_item_category defect_item_type defect_item_detail defect_location_description)) {
+            $params->{"attribute[$_]"} = $p->get_extra_metadata($_);
+        }
     }
 }
 
@@ -197,6 +201,16 @@ sub should_skip_sending_update {
     return 0;
 }
 
+
+sub report_inspect_update_extra {
+    my ( $self, $problem ) = @_;
+
+    foreach (qw(defect_item_category defect_item_type defect_item_detail defect_location_description)) {
+        my $value = $self->{c}->get_param($_);
+        $problem->set_extra_metadata($_ => $value) if $value;
+    }
+}
+
 sub on_map_default_status { return 'open'; }
 
 sub admin_user_domain { 'oxfordshire.gov.uk' }
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index 367327c16..d5eaed2c1 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -920,10 +920,12 @@ FixMyStreet::override_config {
         $mech->submit_form_ok({ button => 'save', with_fields => {
             public_update => "This is a public update.", include_update => "1",
             state => 'action scheduled', raise_defect => 1,
+            defect_item_category => 'Kerbing',
         } });
         $report2->discard_changes;
         is $report2->get_extra_metadata('inspected'), 1, 'report marked as inspected';
         $mech->get_ok("/report/$report2_id");
+        $mech->content_like(qr/Defect category<\/dt>\s*<dd>Kerbing/);
         my $meta = $mech->extract_update_metas;
         like $meta->[0], qr/State changed to: Action scheduled/, 'First update mentions action scheduled';
         like $meta->[1], qr/Posted by .*defect raised/, 'Update mentions defect raised';
diff --git a/t/cobrand/oxfordshire.t b/t/cobrand/oxfordshire.t
index b5e51e808..8a1ad1429 100644
--- a/t/cobrand/oxfordshire.t
+++ b/t/cobrand/oxfordshire.t
@@ -184,6 +184,10 @@ FixMyStreet::override_config {
         $comment->set_extra_metadata(defect_raised => 1);
         $comment->update;
         $comment->problem->external_id('hey');
+        $comment->problem->set_extra_metadata(defect_location_description => 'Location');
+        $comment->problem->set_extra_metadata(defect_item_category => 'Kerbing');
+        $comment->problem->set_extra_metadata(defect_item_type => 'Damaged');
+        $comment->problem->set_extra_metadata(defect_item_detail => '1 kerb unit or 1 linear m');
         $comment->problem->update;
 
         my $cbr = Test::MockModule->new('FixMyStreet::Cobrand::Oxfordshire');
@@ -210,6 +214,7 @@ FixMyStreet::override_config {
         my $cgi = CGI::Simple->new($o->test_req_used->content);
         is $cgi->param('attribute[usrn]'), 13579, 'USRN sent with update';
         is $cgi->param('attribute[raise_defect]'), 1, 'Defect flag sent with update';
+        is $cgi->param('attribute[defect_item_category]'), 'Kerbing';
 
         # Now set a USRN on the problem (found at submission)
         $comment->problem->push_extra_fields({ name => 'usrn', value => '12345' });
diff --git a/templates/web/oxfordshire/report/inspect/_raise_defect.html b/templates/web/oxfordshire/report/inspect/_raise_defect.html
index 5783def48..b2cdf7487 100644
--- a/templates/web/oxfordshire/report/inspect/_raise_defect.html
+++ b/templates/web/oxfordshire/report/inspect/_raise_defect.html
@@ -1,11 +1,79 @@
-[% IF permissions.report_instruct AND NOT problem.get_extra_metadata('inspected') %]
+[% IF permissions.report_instruct %]
+
+[% IF problem.get_extra_metadata('inspected') AND NOT errors %]
+
+<dl>
+    <dt>Defect category</dt>
+    <dd>[% problem.get_extra_metadata('defect_item_category') %]</dd>
+
+    <dt>Defect type</dt>
+    <dd>[% problem.get_extra_metadata('defect_item_type') %]</dd>
+
+    <dt>Defect detail</dt>
+    <dd>[% problem.get_extra_metadata('defect_item_detail') %]</dd>
+
+    <dt>Location description</dt>
+    <dd>[% problem.get_extra_metadata('defect_location_description') %]</dd>
+</dl>
+
+[% ELSE %]
+
 <div id="js-inspect-action-scheduled" class="[% "hidden" UNLESS problem.state == 'action scheduled' %]">
+
   <p>[% loc('Do you want to automatically raise a defect?') %]</p>
   <p class="segmented-control segmented-control--radio">
-      <input type="radio" name="raise_defect" id="raise_defect_yes" value="1">
+      <input type="radio" name="raise_defect" id="raise_defect_yes" value="1" data-show=".js-inspect-defect-yes">
       <label class="btn" for="raise_defect_yes">[% loc('Yes') %]</label>
-      <input type="radio" name="raise_defect" id="raise_defect_no" value="0">
+      <input type="radio" name="raise_defect" id="raise_defect_no" value="0" data-hide=".js-inspect-defect-yes">
       <label class="btn" for="raise_defect_no">[% loc('No') %]</label>
   </p>
+
+    <div class="js-inspect-defect-yes hidden-js">
+
+        <p>Please fill in the below:</p>
+
+        <label for="defect_item_category">Defect category</label>
+        <select id="defect_item_category" name="defect_item_category" class="form-control" required>
+            <option value="">-- Pick a category --</option>
+            <option data-show=".defect-non-kerb-options" data-hide=".defect-kerb-options">Minor Carriageway</option>
+            <option data-show=".defect-non-kerb-options" data-hide=".defect-kerb-options">Footway/ Cycleway</option>
+            <option data-show=".defect-kerb-options" data-hide=".defect-non-kerb-options">Kerbing</option>
+        </select>
+
+        <label for="defect_item_type">Defect type</label>
+        <select id="defect_item_type" name="defect_item_type" class="form-control" required>
+            <option value="">-- Pick a type --</option>
+            <optgroup class="defect-non-kerb-options" label="Minor Carriageway/ Footway/ Cycleway">
+                <option>Sweep &amp; Fill</option>
+            </optgroup>
+            <optgroup class="defect-kerb-options" label="Kerbing">
+                <option>Damaged</option>
+                <option>Loose</option>
+                <option>Misaligned Single Units or Uneven Run of Units</option>
+                <option>Missing</option>
+            </optgroup>
+        </select>
+
+        <label for="defect_item_detail">Defect detail</label>
+        <select id="defect_item_detail" name="defect_item_detail" class="form-control" required>
+            <option value="">-- Pick a detail --</option>
+            <optgroup class="defect-non-kerb-options" label="Minor Carriageway/ Footway/ Cycleway">
+                <option>Pothole Sweep &amp; Fill 0-1m&sup2;</option>
+                <option>Pothole Cluster Sweep &amp; Fill 1-2m&sup2;</option>
+            </optgroup>
+            <optgroup class="defect-kerb-options" label="Kerbing">
+                <option>1 kerb unit or 1 linear m</option>
+                <option>Greater than 1 kerb unit or 1 linear m</option>
+            </optgroup>
+        </select>
+
+        <label for="defect_location_description">Location description</label>
+        <textarea rows="2" id="defect_location_description" name="defect_location_description" class="form-control"></textarea>
+
+    </div>
+
 </div>
+
+[% END %]
+
 [% END %]
-- 
cgit v1.2.3


From f4a9c33b3deeab5b17721ff42b54cad6a4713317 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 8 Oct 2020 16:33:24 +0100
Subject: [Oxfordshire] Traffic Management out of base.

---
 perllib/FixMyStreet/Cobrand/Default.pm                |  8 --------
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm            |  8 --------
 perllib/FixMyStreet/DB/Result/Problem.pm              | 11 -----------
 t/app/controller/report_inspect.t                     | 19 +++----------------
 templates/web/base/report/_inspect.html               |  2 --
 templates/web/base/report/_item.html                  |  4 ----
 templates/web/base/report/inspect/extra_details.html  | 10 ----------
 .../web/oxfordshire/report/inspect/_inspected.html    |  7 -------
 .../web/oxfordshire/report/inspect/_raise_defect.html | 12 ++++++++++++
 9 files changed, 15 insertions(+), 66 deletions(-)
 delete mode 100644 templates/web/oxfordshire/report/inspect/_inspected.html

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 2dfb0d7b1..e58bceb2a 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -1286,14 +1286,6 @@ sub category_extra_hidden {
     return 0;
 }
 
-sub traffic_management_options {
-    return [
-        _("Yes"),
-        _("No"),
-    ];
-}
-
-
 =item display_days_ago_threshold
 
 Used to control whether a relative 'n days ago' or absolute date is shown
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index ab0bfe563..8a188d96a 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -215,14 +215,6 @@ sub on_map_default_status { return 'open'; }
 
 sub admin_user_domain { 'oxfordshire.gov.uk' }
 
-sub traffic_management_options {
-    return [
-        "Signs and Cones",
-        "Stop and Go Boards",
-        "High Speed Roads",
-    ];
-}
-
 sub admin_pages {
     my $self = shift;
 
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index cd5e876b4..ceb41b40f 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -1125,17 +1125,6 @@ has duplicates => (
     },
 );
 
-has traffic_management_options => (
-    is => 'ro',
-    lazy => 1,
-    default => sub {
-        my $self = shift;
-        my $cobrand = $self->get_cobrand_logged;
-        $cobrand = $cobrand->call_hook(get_body_handler_for_problem => $self) || $cobrand;
-        return $cobrand->traffic_management_options;
-    },
-);
-
 has inspection_log_entry => (
     is => 'ro',
     lazy => 1,
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index d5eaed2c1..3f267a086 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -60,7 +60,6 @@ FixMyStreet::override_config {
         $mech->content_lacks('Save changes');
         $mech->content_lacks('Private');
         $mech->content_lacks('Priority');
-        $mech->content_lacks('Traffic management');
         $mech->content_lacks('Change asset');
         $mech->content_lacks('/admin/report_edit/'.$report_id.'">admin</a>)');
 
@@ -70,7 +69,6 @@ FixMyStreet::override_config {
         $mech->content_contains('Save changes');
         $mech->content_lacks('Change asset');
         $mech->content_lacks('Priority');
-        $mech->content_lacks('Traffic management');
         $mech->content_lacks('/admin/report_edit/'.$report_id.'">admin</a>)');
 
         $user->user_body_permissions->create({ body => $oxon, permission_type => 'report_edit_priority' });
@@ -79,7 +77,6 @@ FixMyStreet::override_config {
         $mech->content_contains('Save changes');
         $mech->content_contains('Priority');
         $mech->content_lacks('Change asset');
-        $mech->content_lacks('Traffic management');
         $mech->content_lacks('/admin/report_edit/'.$report_id.'">admin</a>)');
 
         $user->user_body_permissions->create({ body => $oxon, permission_type => 'report_inspect' });
@@ -87,7 +84,6 @@ FixMyStreet::override_config {
         $mech->content_contains('Save changes');
         $mech->content_contains('Private');
         $mech->content_contains('Priority');
-        $mech->content_contains('Traffic management');
         $mech->content_contains('Change asset');
         $mech->content_lacks('/admin/report_edit/'.$report_id.'">admin</a>)');
     };
@@ -210,14 +206,14 @@ FixMyStreet::override_config {
         $user->user_body_permissions->create({ body => $oxon, permission_type => 'report_inspect' });
 
         $mech->get_ok("/report/$report_id");
-        $mech->submit_form_ok({ button => 'save', with_fields => { traffic_information => 'Yes', state => 'Action scheduled', include_update => undef } });
+        $mech->submit_form_ok({ button => 'save', with_fields => { detailed_information => 'Info', state => 'Action scheduled', include_update => undef } });
         $report->discard_changes;
         my $alert = FixMyStreet::DB->resultset('Alert')->find(
             { user => $user, alert_type => 'new_updates', confirmed => 1, }
         );
 
         is $report->state, 'action scheduled', 'report state changed';
-        is $report->get_extra_metadata('traffic_information'), 'Yes', 'report data changed';
+        is $report->get_extra_metadata('detailed_information'), 'Info', 'report data changed';
         ok defined( $alert ) , 'sign up for alerts';
     };
 
@@ -703,15 +699,6 @@ FixMyStreet::override_config {
         return $perms;
     });
 
-    subtest "Oxfordshire-specific traffic management options are shown" => sub {
-        $report->update({ state => 'confirmed' });
-        $mech->get_ok("/report/$report_id");
-        $mech->submit_form_ok({ button => 'save', with_fields => { traffic_information => 'Signs and Cones', state => 'Action scheduled', include_update => undef } });
-        $report->discard_changes;
-        is $report->state, 'action scheduled', 'report state changed';
-        is $report->get_extra_metadata('traffic_information'), 'Signs and Cones', 'report data changed';
-    };
-
     subtest "admin link present on inspect page on cobrand" => sub {
         my $report_edit_permission = $user->user_body_permissions->create({
             body => $oxon, permission_type => 'report_edit' });
@@ -745,7 +732,6 @@ FixMyStreet::override_config {
           priority => $rp->id,
           include_update => '1',
           detailed_information => 'XXX164XXXxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
-          traffic_information => '',
           photo1 => '',
           photo2 => '',
           photo3 => '',
@@ -919,6 +905,7 @@ FixMyStreet::override_config {
         $mech->get_ok("/report/$report2_id");
         $mech->submit_form_ok({ button => 'save', with_fields => {
             public_update => "This is a public update.", include_update => "1",
+            traffic_information => 'Signs and cones',
             state => 'action scheduled', raise_defect => 1,
             defect_item_category => 'Kerbing',
         } });
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index f7d8cc056..1877640b4 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -71,8 +71,6 @@
           [% INCLUDE 'report/inspect/public_update.html' %]
         [% END %]
 
-        [% TRY %][% INCLUDE 'report/inspect/_inspected.html' %][% CATCH file %][% END %]
-
         <p>
           <input type="hidden" name="token" value="[% csrf_token %]" />
           [% IF permissions.planned_reports %]
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index 9a5168986..f25d5d2a1 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -95,10 +95,6 @@ END;
                 <h4>[% loc('Priority') %]</h4>
                 <p>[% problem.response_priority.name OR '-' %]</p>
             </div>
-            <div>
-                <h4>[% loc('Traffic management required?') %]</h4>
-                <p>[% problem.get_extra_metadata('traffic_information') %]</p>
-            </div>
             <div>
                 <h4>[% loc('Extra details') %]</h4>
                 <p>[% problem.get_extra_metadata('detailed_information') | html %]</p>
diff --git a/templates/web/base/report/inspect/extra_details.html b/templates/web/base/report/inspect/extra_details.html
index 66e464cef..621ae3688 100644
--- a/templates/web/base/report/inspect/extra_details.html
+++ b/templates/web/base/report/inspect/extra_details.html
@@ -9,15 +9,5 @@
 </p>
 
 [% IF permissions.report_inspect %]
-    <p>
-        <label for="traffic_information">[% loc('Traffic management required?') %]</label>
-        [% traffic_info = problem.get_extra_metadata('traffic_information') %]
-        <select id="traffic_information" name="traffic_information" class="form-control">
-            <option value=""[% ' selected' IF NOT traffic_info %]>-</option>
-            [% FOREACH option IN problem.traffic_management_options %]
-                <option value='[% option %]'[% ' selected' IF traffic_info == option %]>[% option %]</option>
-            [% END %]
-        </select>
-    </p>
     [% INCLUDE 'report/inspect/_extra_details_field.html' %]
 [% END %]
diff --git a/templates/web/oxfordshire/report/inspect/_inspected.html b/templates/web/oxfordshire/report/inspect/_inspected.html
deleted file mode 100644
index 58d6c1528..000000000
--- a/templates/web/oxfordshire/report/inspect/_inspected.html
+++ /dev/null
@@ -1,7 +0,0 @@
-[% IF problem.get_extra_metadata('inspected') %]
-[% IF problem.whensent %]
-  <p>[% loc("<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on.") %]</p>
-[% ELSE %]
-  <p>[% loc("<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on.") %]</p>
-[% END %]
-[% END %]
diff --git a/templates/web/oxfordshire/report/inspect/_raise_defect.html b/templates/web/oxfordshire/report/inspect/_raise_defect.html
index b2cdf7487..87224a4e2 100644
--- a/templates/web/oxfordshire/report/inspect/_raise_defect.html
+++ b/templates/web/oxfordshire/report/inspect/_raise_defect.html
@@ -14,6 +14,9 @@
 
     <dt>Location description</dt>
     <dd>[% problem.get_extra_metadata('defect_location_description') %]</dd>
+
+    <dt>Traffic management required?</dt>
+    <dd>[% problem.get_extra_metadata('traffic_information') %]</dd>
 </dl>
 
 [% ELSE %]
@@ -67,6 +70,15 @@
             </optgroup>
         </select>
 
+        <label for="traffic_information">[% loc('Traffic management required?') %]</label>
+        [% traffic_info = problem.get_extra_metadata('traffic_information') %]
+        <select id="traffic_information" name="traffic_information" class="form-control">
+            <option value=""[% ' selected' IF NOT traffic_info %]>-</option>
+            [% FOREACH option IN ['Signs and Cones', 'Stop and Go Boards'] %]
+                <option value='[% option %]'[% ' selected' IF traffic_info == option %]>[% option %]</option>
+            [% END %]
+        </select>
+
         <label for="defect_location_description">Location description</label>
         <textarea rows="2" id="defect_location_description" name="defect_location_description" class="form-control"></textarea>
 
-- 
cgit v1.2.3


From a3f5f5cf353074f9a1b97e28366f1f22cc57d3ce Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 8 Oct 2020 16:33:47 +0100
Subject: [Oxfordshire] Construct extra details for defect.

---
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm         |  9 ++++++
 t/cobrand/oxfordshire.t                            |  3 ++
 .../report/inspect/_extra_details_field.html       | 35 ++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 templates/web/oxfordshire/report/inspect/_extra_details_field.html

diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 8a188d96a..97174e1ce 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -181,6 +181,15 @@ sub open311_munge_update_params {
         $params->{'attribute[raise_defect]'} = 1;
         $params->{'attribute[easting]'} = $e;
         $params->{'attribute[northing]'} = $n;
+        my $details = $comment->user->email . ' ';
+        if (my $traffic = $p->get_extra_metadata('traffic_information')) {
+            $details .= 'TM1 ' if $traffic eq 'Signs and Cones';
+            $details .= 'TM2 ' if $traffic eq 'Stop and Go Boards';
+        }
+        (my $type = $p->get_extra_metadata('defect_item_type')) =~ s/ .*//;
+        $details .= $type eq 'Sweep' ? 'S&F' : $type;
+        $details .= ' ' . ($p->get_extra_metadata('detailed_information') || '');
+        $params->{'attribute[extra_details]'} = $details;
 
         foreach (qw(defect_item_category defect_item_type defect_item_detail defect_location_description)) {
             $params->{"attribute[$_]"} = $p->get_extra_metadata($_);
diff --git a/t/cobrand/oxfordshire.t b/t/cobrand/oxfordshire.t
index 8a1ad1429..a1c842e2d 100644
--- a/t/cobrand/oxfordshire.t
+++ b/t/cobrand/oxfordshire.t
@@ -188,6 +188,8 @@ FixMyStreet::override_config {
         $comment->problem->set_extra_metadata(defect_item_category => 'Kerbing');
         $comment->problem->set_extra_metadata(defect_item_type => 'Damaged');
         $comment->problem->set_extra_metadata(defect_item_detail => '1 kerb unit or 1 linear m');
+        $comment->problem->set_extra_metadata(traffic_information => 'Signs and Cones');
+        $comment->problem->set_extra_metadata(detailed_information => '100x100');
         $comment->problem->update;
 
         my $cbr = Test::MockModule->new('FixMyStreet::Cobrand::Oxfordshire');
@@ -215,6 +217,7 @@ FixMyStreet::override_config {
         is $cgi->param('attribute[usrn]'), 13579, 'USRN sent with update';
         is $cgi->param('attribute[raise_defect]'), 1, 'Defect flag sent with update';
         is $cgi->param('attribute[defect_item_category]'), 'Kerbing';
+        is $cgi->param('attribute[extra_details]'), $user2->email . ' TM1 Damaged 100x100';
 
         # Now set a USRN on the problem (found at submission)
         $comment->problem->push_extra_fields({ name => 'usrn', value => '12345' });
diff --git a/templates/web/oxfordshire/report/inspect/_extra_details_field.html b/templates/web/oxfordshire/report/inspect/_extra_details_field.html
new file mode 100644
index 000000000..5fc7b0086
--- /dev/null
+++ b/templates/web/oxfordshire/report/inspect/_extra_details_field.html
@@ -0,0 +1,35 @@
+<p>
+    <label for="detailed_information">[% loc('Extra details') %]</label>
+    [% IF max_detailed_info_length %]
+    <span id="detailed_information_length">
+        [% tprintf(loc('%d characters maximum'), max_detailed_info_length) %]
+    </span>
+    [% END %]
+    <span class="js-inspect-defect-yes hidden-js">
+        <br>[% c.user.email %] <span id="js-defect-prefix"></span> &hellip;
+    </span>
+    <textarea rows="2" name="detailed_information" id="detailed_information" class="form-control"
+        [% IF max_detailed_info_length %]data-max-length="[% max_detailed_info_length %]"[% END %]>[% problem.get_extra_metadata('detailed_information') | html %]</textarea>
+</p>
+
+<script nonce="[% csp_nonce %]">
+(function(){
+    function update_prefix() {
+        var prefix = document.getElementById('js-defect-prefix');
+        var text = '';
+        var traffic = document.getElementById('traffic_information');
+        if (traffic.selectedIndex) {
+            text += 'TM' + traffic.selectedIndex + ' ';
+        }
+        var type = document.getElementById('defect_item_type');
+        type = type.options[type.selectedIndex].value;
+        type = type.split(' ')[0];
+        text += (type == 'Sweep') ? 'S&F' : type;
+        text += ' ';
+        prefix.textContent = text;
+    }
+
+    document.getElementById('traffic_information').addEventListener('change', update_prefix);
+    document.getElementById('defect_item_type').addEventListener('change', update_prefix);
+})();
+</script>
-- 
cgit v1.2.3


From ea73bc7c2053bf0db3f7ce47bbd1722e79771ba8 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 8 Oct 2020 16:45:22 +0100
Subject: [Oxfordshire] Update dropdown when only one item.

---
 .../web/oxfordshire/report/inspect/_raise_defect.html    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/templates/web/oxfordshire/report/inspect/_raise_defect.html b/templates/web/oxfordshire/report/inspect/_raise_defect.html
index 87224a4e2..d6e05d3b5 100644
--- a/templates/web/oxfordshire/report/inspect/_raise_defect.html
+++ b/templates/web/oxfordshire/report/inspect/_raise_defect.html
@@ -86,6 +86,22 @@
 
 </div>
 
+<script nonce="[% csp_nonce %]">
+(function(){
+    var item = document.getElementById('defect_item_category');
+    item.addEventListener('change', function(){
+        var opt = item.options[item.selectedIndex].value;
+        if (opt !== 'Kerbing') {
+            var type = document.getElementById('defect_item_type');
+            type.selectedIndex = 1;
+            var event = document.createEvent("Event");
+            event.initEvent("change", true, false);
+            type.dispatchEvent(event);
+        }
+    });
+})();
+</script>
+
 [% END %]
 
 [% END %]
-- 
cgit v1.2.3


From ae686e9f8f16841d2cfcf00dd674503756d69536 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 11 Sep 2020 13:28:03 +0100
Subject: [TfL] Update which states are enabled.

Re-enable action scheduled, and disable investigating. Action scheduled
is going to be used to mark reports which should be automatically
closed, and they do not wish to use the investigating state.
---
 perllib/FixMyStreet/Cobrand/TfL.pm | 2 +-
 t/cobrand/tfl.t                    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm
index 6bc516366..9cf8910f9 100644
--- a/perllib/FixMyStreet/Cobrand/TfL.pm
+++ b/perllib/FixMyStreet/Cobrand/TfL.pm
@@ -209,7 +209,7 @@ sub around_nearby_filter {
 
 sub state_groups_inspect {
     my $rs = FixMyStreet::DB->resultset("State");
-    my @open = grep { $_ !~ /^(planned|action scheduled|for triage)$/ } FixMyStreet::DB::Result::Problem->open_states;
+    my @open = grep { $_ !~ /^(planned|investigating|for triage)$/ } FixMyStreet::DB::Result::Problem->open_states;
     my @closed = grep { $_ ne 'closed' } FixMyStreet::DB::Result::Problem->closed_states;
     [
         [ $rs->display('confirmed'), \@open ],
diff --git a/t/cobrand/tfl.t b/t/cobrand/tfl.t
index cf1ec1c41..3aabb07db 100644
--- a/t/cobrand/tfl.t
+++ b/t/cobrand/tfl.t
@@ -454,7 +454,8 @@ subtest 'Inspect form state choices' => sub {
     my $id = $report->id;
     $mech->get_ok("/report/$id");
     $mech->content_lacks('for triage');
-    $mech->content_lacks('action scheduled');
+    $mech->content_lacks('planned');
+    $mech->content_lacks('investigating');
 };
 
 subtest "change category, report resent to new location" => sub {
-- 
cgit v1.2.3


From 98cc29c15b98a26f75adabb1c07acdd9513b4446 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 10 Sep 2020 14:49:42 +0100
Subject: [TfL] script to automatically close reports

Closes reports that meet the following criteria:
 * status is action scheduled
 * in a category with a fixed - council auto response template
 * over n days in action scheduled state (n is an argument)

Reports matching these criteria are marked as fixed - council and the
relevant response template text is added as a comment.

Fixes mysociety/fixmystreet-commercial#1955
---
 bin/tfl/auto-close-reports                  |  48 +++++++
 perllib/FixMyStreet/Script/TfL/AutoClose.pm | 129 +++++++++++++++++
 t/script/tfl/autoclose.t                    | 216 ++++++++++++++++++++++++++++
 3 files changed, 393 insertions(+)
 create mode 100755 bin/tfl/auto-close-reports
 create mode 100644 perllib/FixMyStreet/Script/TfL/AutoClose.pm
 create mode 100644 t/script/tfl/autoclose.t

diff --git a/bin/tfl/auto-close-reports b/bin/tfl/auto-close-reports
new file mode 100755
index 000000000..00d310811
--- /dev/null
+++ b/bin/tfl/auto-close-reports
@@ -0,0 +1,48 @@
+#!/usr/bin/env perl
+
+# Closes reports that meet the following criteria:
+#  * status is action scheduled
+#  * in a category with a fixed - council auto response template
+#  * over n days in action scheduled state (n is an argument)
+#
+# Reports matching these criteria are marked as fixed - council and the
+# relevant response template text is added as a comment.
+
+use warnings;
+use v5.14;
+use utf8;
+
+BEGIN {
+    use File::Basename qw(dirname);
+    use File::Spec;
+    my $d = dirname(File::Spec->rel2abs($0));
+    require "$d/../../setenv.pl";
+}
+
+use FixMyStreet;
+use Getopt::Long;
+use FixMyStreet::Script::TfL::AutoClose;
+
+my %h;
+GetOptions(\%h, 'verbose|v', 'days|d', 'help|h', 'commit|c');
+pod2usage(0) if $h{help};
+
+FixMyStreet::Script::TfL::AutoClose->new(%h)->close;
+
+__END__
+
+=head1 NAME
+
+auto-close-reports - set action_scheduled reports to fixed
+
+=head1 SYNOPSIS
+
+auto-close-reports --commit
+
+ Options:
+   --commit      Actually close any reports
+   --days        Number of days before autoclosing
+   --verbose     Output how many reports have been closed
+   --help        This help message
+
+=cut
diff --git a/perllib/FixMyStreet/Script/TfL/AutoClose.pm b/perllib/FixMyStreet/Script/TfL/AutoClose.pm
new file mode 100644
index 000000000..687a29e7f
--- /dev/null
+++ b/perllib/FixMyStreet/Script/TfL/AutoClose.pm
@@ -0,0 +1,129 @@
+package FixMyStreet::Script::TfL::AutoClose;
+
+use v5.14;
+
+use Moo;
+use CronFns;
+use FixMyStreet;
+use FixMyStreet::Cobrand;
+use FixMyStreet::DB;
+use Types::Standard qw(InstanceOf Maybe);
+
+has commit => ( is => 'ro', default => 0 );
+
+has verbose => ( is => 'ro', default => 0 );
+
+has body => (
+    is => 'lazy',
+    isa => Maybe[InstanceOf['FixMyStreet::DB::Result::Body']],
+    default => sub {
+        my $body = FixMyStreet::DB->resultset('Body')->find({ name => 'TfL' });
+        return $body;
+    }
+);
+
+has days => (
+    is => 'ro',
+    default => 28
+);
+
+sub close {
+    my $self = shift;
+
+    die "Can't find body\n" unless $self->body;
+    warn "DRY RUN: use --commit to close reports\n" unless $self->commit;
+    my $categories = $self->categories;
+    $self->close_reports($categories);
+}
+
+has newest => (
+    is => 'lazy',
+    isa => InstanceOf['DateTime'],
+    default => sub {
+        my $self = shift;
+        my $days = $self->days * -1;
+        my $date = DateTime->now->add( days => $days )->truncate( to => 'day' );
+        return $date;
+    }
+);
+
+# get list of cateories that have a response template for the fixed
+# state marked as auto-response.
+sub categories {
+    my $self = shift;
+
+    my $templates = FixMyStreet::DB->resultset('ResponseTemplate')->search({
+        state => 'fixed - council',
+        auto_response => 1,
+        body_id => $self->body->id,
+    });
+
+    my %categories;
+    for my $template ( $templates->all ) {
+        map { $categories{$_->category} = $template; } $template->contacts->all;
+    }
+
+    return \%categories;
+}
+
+# find reports in relevant categories that have been set to action
+# scheduled for 30 days.
+sub close_reports {
+    my ($self, $categories) = @_;
+
+    my $dtf = FixMyStreet::DB->schema->storage->datetime_parser;
+
+    my $reports = FixMyStreet::DB->resultset('Problem')->search({
+        category => { -in => [ keys %$categories ] },
+        'me.state' => 'action scheduled',
+        bodies_str => $self->body->id,
+        'comments.state' => 'confirmed',
+        'comments.problem_state' => 'action scheduled',
+    },
+    {
+        group_by => 'me.id',
+        join => [ 'comments' ],
+        having => \[ 'MIN(comments.confirmed) < ?', $dtf->format_datetime($self->newest) ]
+    });
+
+    my $count = 0;
+    for my $r ( $reports->all ) {
+        my $comments = FixMyStreet::DB->resultset('Comment')->search(
+            { problem_id => $r->id },
+            { order_by => 'confirmed' }
+        );
+        my $earliest;
+        while ( my $c = $comments->next ) {
+            if ( $c->problem_state ne 'action scheduled' ) {
+                $earliest = undef;
+                next;
+            }
+            $earliest = $c->confirmed unless defined $earliest;
+        }
+        next unless defined $earliest && $earliest < $self->newest;
+        if ($self->commit) {
+            $r->update({
+                state => 'fixed - council',
+                lastupdate => \'current_timestamp',
+            });
+            my $c = FixMyStreet::DB->resultset('Comment')->new(
+                {
+                    problem => $r,
+                    text => $categories->{$r->category}->text,
+                    state => 'confirmed',
+                    problem_state => 'fixed - council',
+                    user => $self->body->comment_user,
+                    confirmed => \'current_timestamp'
+                }
+            );
+            $c->insert;
+        }
+        $count++;
+    }
+
+    say "$count reports closed" if $self->verbose;
+
+    return 1;
+}
+
+1;
diff --git a/t/script/tfl/autoclose.t b/t/script/tfl/autoclose.t
new file mode 100644
index 000000000..91f46867c
--- /dev/null
+++ b/t/script/tfl/autoclose.t
@@ -0,0 +1,216 @@
+use FixMyStreet::TestMech;
+use DateTime;
+use Test::Output;
+
+use_ok 'FixMyStreet::Script::TfL::AutoClose';
+
+my $close = FixMyStreet::Script::TfL::AutoClose->new( commit => 1 );
+my $no_commit = FixMyStreet::Script::TfL::AutoClose->new();
+my $mech = FixMyStreet::TestMech->new;
+
+
+my $area_id = 2651;
+my $body = $mech->create_body_ok($area_id, 'TfL');
+my $body_user = $mech->create_user_ok('tfl@example.com', name => 'TfL', from_body => $body);
+$body->update( { comment_user_id => $body_user->id } );
+my $c1 = $mech->create_contact_ok(category => 'Potholes', body_id => $body->id, email => 'p');
+my $c2 = $mech->create_contact_ok(category => 'Graffiti', body_id => $body->id, email => 'g');
+my $c3 = $mech->create_contact_ok(category => 'Flytipping', body_id => $body->id, email => 'f');
+my $t1 = FixMyStreet::DB->resultset('ResponseTemplate')->create({
+    body_id => $body->id, title => "Not auto closed", text => "Text 1 ⛄", state => "fixed - council" }
+);
+my $t2 = FixMyStreet::DB->resultset('ResponseTemplate')->create({
+    body_id => $body->id, title => "Auto closed", text => "Text 2", state => "fixed - council", auto_response => 1
+});
+my $t3 = FixMyStreet::DB->resultset('ResponseTemplate')->create({
+    body_id => $body->id, title => "Investigating", text => "Text 3", state => "investigating", auto_response => 1
+});
+$t1->add_to_contacts($c1);
+$t2->add_to_contacts($c2);
+$t3->add_to_contacts($c3);
+
+is_deeply keys %{ $close->categories }, ("Graffiti"), "fetches correct category list";
+
+my $now = DateTime->now;
+
+my %problems;
+for my $p (
+    {
+        category => 'Grafitti',
+        state => 'in progress',
+        test => 'category_not_state',
+        date => $now->clone->add( days => -30 ),
+    },
+    {
+        category => 'Grafitti',
+        state => 'action scheduled',
+        test => 'category_state',
+        date => $now->clone->add( days => -30 ),
+    },
+    {
+        category => 'Potholes',
+        state => 'action scheduled',
+        test => 'not_category_state',
+        date => $now->clone->add( days => -30 ),
+    },
+    {
+        category => 'Grafitti',
+        state => 'action scheduled',
+        test => 'category_state_not_old',
+        date => $now->clone->add( days => -20 ),
+    }
+) {
+    my $k = delete $p->{test};
+    my $d = delete $p->{date};
+    $p->{confirmed} = $d;
+    $p->{lastupdate} = $d;
+    ($problems{$k}) = $mech->create_problems_for_body( 1, $body->id, 'Title', $p);
+    my $c = FixMyStreet::DB->resultset('Comment')->create({
+        problem => $problems{$k},
+        text => 'comment',
+        state => 'confirmed',
+        problem_state => $p->{state},
+        user => $body_user,
+        confirmed => $p->{lastupdate}
+    });
+    is $problems{$k}->comments->count, 1, "comment added";
+}
+
+subtest "check that nothing saved without commit arg" => sub {
+    ok $no_commit->close_reports({ 'Grafitti' => $t2 }), "close reports ran";
+    $_->discard_changes for values %problems;
+
+    is $problems{category_not_state}->state, 'in progress', 'ignores incorrect state';
+    is $problems{category_state}->state, 'action scheduled', 'not updated to fixed';
+    is $problems{not_category_state}->state, 'action scheduled', 'ignores incorrect category';
+    is $problems{category_state_not_old}->state, 'action scheduled', 'ignores newer reports';
+
+    is $problems{category_state}->comments->count, 1, "no comment added";
+};
+
+subtest "check that reports are updated" => sub {
+    ok $close->close_reports({ 'Grafitti' => $t2 }), "close reports ran";
+
+    $_->discard_changes for values %problems;
+
+    is $problems{category_not_state}->state, 'in progress', 'ignores incorrect state';
+    is $problems{category_state}->state, 'fixed - council', 'updates to fixed';
+    is $problems{not_category_state}->state, 'action scheduled', 'ignores incorrect category';
+    is $problems{category_state_not_old}->state, 'action scheduled', 'ignores newer reports';
+
+    my $comment = ( $problems{category_state}->comments->search({}, { order_by => 'id' })->all )[-1];
+    is $comment->text, "Text 2", "correct template used when closing";
+};
+
+subtest "check that days argument works" => sub {
+    my $close_newer = FixMyStreet::Script::TfL::AutoClose->new( days => 19, commit => 1 );
+    ok $close_newer->close_reports({ 'Grafitti' => $t2 }), "close reports ran";
+
+    $problems{category_state_not_old}->discard_changes;
+    is $problems{category_state_not_old}->state, 'fixed - council', 'updates to fixed';
+};
+
+subtest 'check that uses oldest comment for time' => sub {
+    my $latest = $now->clone->add( days => -20 );
+    my $oldest = $now->clone->add( days => -30 );
+    my ($p) = $mech->create_problems_for_body( 1, $body->id, 'Title', {
+        category => 'Grafitti',
+        state => 'action scheduled',
+        user => $body_user,
+        lastupdate => $latest,
+        confirmed => $latest,
+    });
+
+    my $first = FixMyStreet::DB->resultset('Comment')->create({
+        problem => $p,
+        problem_state => 'investigating',
+        text => 'comment',
+        state => 'confirmed',
+        user => $body_user,
+        confirmed => $oldest
+    });
+
+    FixMyStreet::DB->resultset('Comment')->create({
+        problem => $p,
+        text => 'comment',
+        state => 'confirmed',
+        problem_state => 'action scheduled',
+        user => $body_user,
+        confirmed => $latest
+    });
+
+    ok $close->close_reports({ 'Grafitti' => $t2 }), "close reports ran";
+
+    $p->discard_changes;
+    is $p->state, 'action scheduled', 'ignores comments with wrong state';
+
+
+    $first->update( { problem_state => 'action scheduled' });
+    ok $close->close_reports({ 'Grafitti' => $t2 }), "close reports ran";
+
+    $p->discard_changes;
+    is $p->state, 'fixed - council', 'updates to fixed';
+};
+
+subtest 'check that changing state accounted for' => sub {
+    my $latest = $now->clone->add( days => -20 );
+    my $oldest = $now->clone->add( days => -30 );
+    my ($p) = $mech->create_problems_for_body( 1, $body->id, 'Title', {
+        category => 'Grafitti',
+        state => 'action scheduled',
+        user => $body_user,
+        lastupdate => $latest,
+        confirmed => $latest,
+    });
+
+    my $investigating = FixMyStreet::DB->resultset('Comment')->create({
+        problem => $p,
+        problem_state => 'investigating',
+        text => 'comment',
+        state => 'confirmed',
+        user => $body_user,
+        confirmed => $latest
+    });
+
+    FixMyStreet::DB->resultset('Comment')->create({
+        problem => $p,
+        text => 'comment',
+        state => 'confirmed',
+        problem_state => 'action scheduled',
+        user => $body_user,
+        confirmed => $oldest
+    });
+
+    FixMyStreet::DB->resultset('Comment')->create({
+        problem => $p,
+        text => 'comment',
+        state => 'confirmed',
+        problem_state => 'action scheduled',
+        user => $body_user,
+        confirmed => $now
+    });
+
+    ok $close->close_reports({ 'Grafitti' => $t2 }), "close reports ran";
+
+    $p->discard_changes;
+    is $p->state, 'action scheduled', 'change of state resets time';
+
+
+    $investigating->update( { problem_state => 'action scheduled' });
+    ok $close->close_reports({ 'Grafitti' => $t2 }), "close reports ran";
+
+    $p->discard_changes;
+    is $p->state, 'fixed - council', 'updates to fixed';
+};
+subtest 'check verbose works' => sub {
+    my $verbose = FixMyStreet::Script::TfL::AutoClose->new( commit => 1, verbose => 1 );
+    stdout_is { $close->close_reports({ 'Grafitti' => $t2 }) } "", "No message displayed with verbose";
+    stdout_is { $verbose->close_reports({ 'Grafitti' => $t2 }) } "0 reports closed\n", "Message displayed with verbose";
+};
+
+subtest 'check dry run warning displayed' => sub {
+    stderr_is { $no_commit->close() } "DRY RUN: use --commit to close reports\n", "Dry run warning message displayed without commit";
+    stderr_is { $close->close() } "", "No warning displayed with commit";
+};
+
+done_testing;
-- 
cgit v1.2.3


From c419e88385f287f6f593f28a0ec0e8a9ae8b0bd4 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 6 Oct 2020 13:42:38 +0100
Subject: [TfL] Include move to action scheduled in export.

---
 perllib/FixMyStreet/Cobrand/TfL.pm |  1 +
 perllib/FixMyStreet/Reporting.pm   | 14 ++++++++++++++
 t/cobrand/tfl.t                    |  8 ++++++++
 3 files changed, 23 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm
index 9cf8910f9..b04841c39 100644
--- a/perllib/FixMyStreet/Cobrand/TfL.pm
+++ b/perllib/FixMyStreet/Cobrand/TfL.pm
@@ -254,6 +254,7 @@ sub dashboard_export_problems_add_columns {
         reassigned_at => "Reassigned at",
         reassigned_by => "Reassigned by",
     );
+    $csv->splice_csv_column('fixed', action_scheduled => 'Action scheduled');
 
     if ($csv->category) {
         my @contacts = $csv->body->contacts->search(undef, { order_by => [ 'category' ] } )->all;
diff --git a/perllib/FixMyStreet/Reporting.pm b/perllib/FixMyStreet/Reporting.pm
index 4573d78fc..efd12718c 100644
--- a/perllib/FixMyStreet/Reporting.pm
+++ b/perllib/FixMyStreet/Reporting.pm
@@ -58,6 +58,19 @@ sub modify_csv_header {
     ]);
 }
 
+sub splice_csv_column {
+    my ($self, $before, $column, $header) = @_;
+
+    for (my $i = 0; $i < @{$self->csv_columns}; $i++) {
+        my $col = $self->csv_columns->[$i];
+        if ($col eq $before) {
+            splice @{$self->csv_columns}, $i, 0, $column;
+            splice @{$self->csv_headers}, $i, 0, $header;
+            last;
+        }
+    }
+}
+
 sub add_csv_columns {
     my $self = shift;
     for (my $i = 0; $i < @_; $i += 2) {
@@ -255,6 +268,7 @@ sub generate_csv {
                 next unless $comment->state eq 'confirmed';
                 next if $problem_state eq 'confirmed';
                 $hashref->{acknowledged} //= $comment->confirmed;
+                $hashref->{action_scheduled} //= $problem_state eq 'action scheduled' ? $comment->confirmed : undef;
                 $hashref->{fixed} //= $fixed_states->{ $problem_state } || $comment->mark_fixed ?
                     $comment->confirmed : undef;
                 if ($closed_states->{ $problem_state }) {
diff --git a/t/cobrand/tfl.t b/t/cobrand/tfl.t
index 3aabb07db..142c7c14e 100644
--- a/t/cobrand/tfl.t
+++ b/t/cobrand/tfl.t
@@ -425,6 +425,7 @@ subtest 'Dashboard CSV extra columns' => sub {
     $mech->get_ok('/dashboard?export=1&category=Bus+stops');
     $mech->content_contains('Category,Subcategory');
     $mech->content_contains('Query,Borough');
+    $mech->content_contains(',Acknowledged,"Action scheduled",Fixed');
     $mech->content_contains(',"Safety critical","Delivered to","Closure email at","Reassigned at","Reassigned by","Is the pole leaning?"');
     $mech->content_contains('"Bus things","Bus stops"');
     $mech->content_contains('"BR1 3UH",Bromley,');
@@ -442,10 +443,17 @@ subtest 'Dashboard CSV extra columns' => sub {
         admin_user => $staffuser->name,
         user => $staffuser,
     });
+    FixMyStreet::DB->resultset('Comment')->create({
+        problem => $report, user => $report->user, anonymous => 't', text => 'Update text',
+        problem_state => 'action scheduled', state => 'confirmed', mark_fixed => 0,
+        confirmed => $dt,
+    });
     $mech->get_ok('/dashboard?export=1');
     $mech->content_contains('Query,Borough');
+    $mech->content_contains(',Acknowledged,"Action scheduled",Fixed');
     $mech->content_contains(',"Safety critical","Delivered to","Closure email at","Reassigned at","Reassigned by"');
     $mech->content_contains('(anonymous ' . $report->id . ')');
+    $mech->content_contains($dt . ',,,confirmed,51.4021');
     $mech->content_contains(',,,yes,busstops@example.com,,' . $dt . ',"Council User"');
 };
 
-- 
cgit v1.2.3


From 8bc63484571af04f98c60817fbef4721577d7c23 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 13 Oct 2020 14:13:04 +0100
Subject: Do not test all of t if a state is provided.

Otherwise running with --state=failed does not do as you would expect.
---
 perllib/FixMyStreet/TestAppProve.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/TestAppProve.pm b/perllib/FixMyStreet/TestAppProve.pm
index ec245e72c..d977c0a94 100644
--- a/perllib/FixMyStreet/TestAppProve.pm
+++ b/perllib/FixMyStreet/TestAppProve.pm
@@ -111,7 +111,7 @@ sub run {
     $prove->process_args(@ARGV);
 
     # If no arguments, test everything
-    $prove->argv(['t']) unless @{$prove->argv};
+    $prove->argv(['t']) unless @{$prove->argv} || @state;
     # verbose if we have a single file
     $prove->verbose(1) if @{$prove->argv} and -f $prove->argv->[-1] && !$ENV{CI};
     # we always want to recurse
-- 
cgit v1.2.3


From 6dffdeb335030fa7f2ccf7ce70713bef9894cfea Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Wed, 14 Oct 2020 07:29:03 +0100
Subject: [Hackney] Test warnfix.

---
 t/cobrand/hackney.t | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/t/cobrand/hackney.t b/t/cobrand/hackney.t
index 8022d562a..bdfcceef8 100644
--- a/t/cobrand/hackney.t
+++ b/t/cobrand/hackney.t
@@ -132,6 +132,9 @@ subtest "sends branded alert emails" => sub {
     FixMyStreet::override_config {
         MAPIT_URL => 'http://mapit.uk/',
         ALLOWED_COBRANDS => ['hackney','fixmystreet'],
+        COBRAND_FEATURES => {
+            do_not_reply_email => { hackney => 'fms-hackney-DO-NOT-REPLY@hackney-example.com' },
+        },
     }, sub {
         FixMyStreet::Script::Alerts::send();
     };
-- 
cgit v1.2.3


From 3227d1b61693022f6cf0efa790449182efb25784 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 15 Oct 2020 21:57:06 +0100
Subject: Fix issue with unicode in extra in alert emails.

---
 perllib/FixMyStreet/Template.pm | 2 ++
 t/app/controller/alert_new.t    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/perllib/FixMyStreet/Template.pm b/perllib/FixMyStreet/Template.pm
index bc087de9a..afb977ac9 100644
--- a/perllib/FixMyStreet/Template.pm
+++ b/perllib/FixMyStreet/Template.pm
@@ -175,6 +175,7 @@ sub email_sanitize_text : Fn('email_sanitize_text') {
 
     my $text = $update->{item_text};
     my $extra = $update->{item_extra};
+    utf8::encode($extra) if $extra;
     $extra = $extra ? RABX::wire_rd(new IO::String($extra)) : {};
 
     my $staff = $extra->{is_superuser} || $extra->{is_body_user};
@@ -234,6 +235,7 @@ sub email_sanitize_html : Fn('email_sanitize_html') {
 
     my $text = $update->{item_text};
     my $extra = $update->{item_extra};
+    utf8::encode($extra) if $extra;
     $extra = $extra ? RABX::wire_rd(new IO::String($extra)) : {};
 
     my $staff = $extra->{is_superuser} || $extra->{is_body_user};
diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 31d8c52ed..562b173c8 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -1,3 +1,4 @@
+use utf8;
 use FixMyStreet::TestMech;
 use FixMyStreet::Script::Alerts;
 
@@ -880,6 +881,7 @@ subtest 'check staff updates can include sanitized HTML' => sub {
 
     my $update1 = $mech->create_comment_for_problem($report, $user2, 'Staff User', '<p>This is some update text with <strong>HTML</strong> and *italics*.</p> <ul><li>Even a list</li><li>Which might work</li><li>In the <a href="https://www.fixmystreet.com/">text</a> part</li></ul> <script>not allowed</script>', 't', 'confirmed', undef, { confirmed  => $r_dt->clone->add( minutes => 8 ) });
     $update1->set_extra_metadata(is_body_user => $user2->from_body->id);
+    $update1->set_extra_metadata(something_unicodey => "The cafɇ is here");
     $update1->update;
 
     $mech->create_comment_for_problem($report, $user3, 'Updater User', 'Public users <i>cannot</i> use HTML. <script>not allowed</script>', 't', 'confirmed', undef, { confirmed  => $r_dt->clone->add( minutes => 9 ) });
-- 
cgit v1.2.3


From 28d0ad3148b2fa3cbdc4017d24ddc548ec8a7e30 Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Thu, 21 May 2020 13:33:45 +0100
Subject: [Bromley] Switch out header font

Bromley's live site doesn't seem to have Gill Sans anywhere any more
---
 web/cobrands/bromley/_fonts.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/cobrands/bromley/_fonts.scss b/web/cobrands/bromley/_fonts.scss
index b54d10542..cf3b85148 100644
--- a/web/cobrands/bromley/_fonts.scss
+++ b/web/cobrands/bromley/_fonts.scss
@@ -7,4 +7,4 @@
 }
 $body-font: Arial,'Helvetica Neue',Helvetica,sans-serif;
 $meta-font: $body-font;
-$heading-font: 'Gill Sans condensed', 'Gill Sans','Trebuchet MS',Calibri,sans-serif;
+$heading-font: $body-font;
-- 
cgit v1.2.3


From ea71d01e3f7ef9cb7be4e671aa8e23c01ebe84f7 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 21 Aug 2020 12:28:21 +0100
Subject: [Bromley] Main text links bold.

---
 web/cobrands/bromley/base.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss
index 3791f1d16..1db6d98a7 100644
--- a/web/cobrands/bromley/base.scss
+++ b/web/cobrands/bromley/base.scss
@@ -74,6 +74,15 @@ a:active {
   color: $link-visited-color;
 }
 
+// Want main text links to be bold
+.content a {
+    font-weight: bold;
+}
+// Except in list items
+.item-list a {
+    font-weight: normal;
+}
+
 // The map page header looks a bit high for some reason
 .big-green-banner {
   top: 0;
-- 
cgit v1.2.3


From 65b2893f9c2512e51d66885a393b77f84efa8330 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 23 Oct 2020 07:26:00 +0100
Subject: [Bromley] Waste notification endpoint.

---
 perllib/FixMyStreet/App/Controller/Waste.pm | 92 +++++++++++++++++++++++++++++
 t/cobrand/bromley.t                         | 62 +++++++++++++++++++
 2 files changed, 154 insertions(+)
 create mode 100644 perllib/FixMyStreet/App/Controller/Waste.pm

diff --git a/perllib/FixMyStreet/App/Controller/Waste.pm b/perllib/FixMyStreet/App/Controller/Waste.pm
new file mode 100644
index 000000000..3cdd9fd42
--- /dev/null
+++ b/perllib/FixMyStreet/App/Controller/Waste.pm
@@ -0,0 +1,92 @@
+package FixMyStreet::App::Controller::Waste;
+use Moose;
+use namespace::autoclean;
+
+BEGIN { extends 'Catalyst::Controller' }
+
+use utf8;
+use Open311::GetServiceRequestUpdates;
+
+sub receive_echo_event_notification : Path('/waste/echo') : Args(0) {
+    my ($self, $c) = @_;
+    $c->stash->{format} = 'xml';
+    $c->response->header(Content_Type => 'application/soap+xml');
+
+    require SOAP::Lite;
+
+    $c->detach('soap_error', [ 'Invalid method', 405 ]) unless $c->req->method eq 'POST';
+
+    my $echo = $c->cobrand->feature('echo');
+    $c->detach('soap_error', [ 'Missing config', 500 ]) unless $echo;
+
+    # Make sure we log entire request for debugging
+    $c->detach('soap_error', [ 'Missing body' ]) unless $c->req->body;
+    my $soap = join('', $c->req->body->getlines);
+    $c->log->info($soap);
+
+    my $body = $c->cobrand->body;
+    $c->detach('soap_error', [ 'Bad jurisdiction' ]) unless $body;
+
+    my $env = SOAP::Deserializer->deserialize($soap);
+
+    my $header = $env->header;
+    $c->detach('soap_error', [ 'Missing SOAP header' ]) unless $header;
+    my $action = $header->{Action};
+    $c->detach('soap_error', [ 'Incorrect Action' ]) unless $action && $action eq $echo->{receive_action};
+    $header = $header->{Security};
+    $c->detach('soap_error', [ 'Missing Security header' ]) unless $header;
+    my $token = $header->{UsernameToken};
+    $c->detach('soap_error', [ 'Authentication failed' ])
+        unless $token && $token->{Username} eq $echo->{receive_username} && $token->{Password} eq $echo->{receive_password};
+
+    # Still want to say it is okay, even if we did nothing with it
+    $c->forward('soap_ok');
+}
+
+sub soap_error : Private {
+    my ($self, $c, $comment, $code) = @_;
+    $code ||= 400;
+    $c->response->status($code);
+    my $type = $code == 500 ? 'Server' : 'Client';
+    $c->response->body(SOAP::Serializer->fault($type, "Bad request: $comment", soap_header()));
+}
+
+sub soap_ok : Private {
+    my ($self, $c) = @_;
+    $c->response->status(200);
+    my $method = SOAP::Data->name("NotifyEventUpdatedResponse")->attr({
+        xmlns => "http://www.twistedfish.com/xmlns/echo/api/v1"
+    });
+    $c->response->body(SOAP::Serializer->envelope(method => $method, soap_header()));
+}
+
+sub soap_header {
+    my $attr = "http://www.twistedfish.com/xmlns/echo/api/v1";
+    my $action = "NotifyEventUpdatedResponse";
+    my $header = SOAP::Header->name("Action")->attr({
+        xmlns => 'http://www.w3.org/2005/08/addressing',
+        'soap:mustUnderstand' => 1,
+    })->value("$attr/ReceiverService/$action");
+
+    my $dt = DateTime->now();
+    my $dt2 = $dt->clone->add(minutes => 5);
+    my $w3c = DateTime::Format::W3CDTF->new;
+    my $header2 = SOAP::Header->name("Security")->attr({
+        'soap:mustUnderstand' => 'true',
+        'xmlns' => 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'
+    })->value(
+        \SOAP::Header->name(
+            "Timestamp" => \SOAP::Header->value(
+                SOAP::Header->name('Created', $w3c->format_datetime($dt)),
+                SOAP::Header->name('Expires', $w3c->format_datetime($dt2)),
+            )
+        )->attr({
+            xmlns => "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd",
+        })
+    );
+    return ($header, $header2);
+}
+
+__PACKAGE__->meta->make_immutable;
+
+1;
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index d26b10709..e6fa8e115 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -242,4 +242,66 @@ subtest 'check heatmap page' => sub {
     };
 };
 
+package SOAP::Result;
+sub result { return $_[0]->{result}; }
+sub new { my $c = shift; bless { @_ }, $c; }
+
+package main;
+
+subtest 'updating of waste reports' => sub {
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => 'bromley',
+        COBRAND_FEATURES => {
+            echo => { bromley => {
+                receive_action => 'action',
+                receive_username => 'un',
+                receive_password => 'password',
+            } },
+            waste => { bromley => 1 }
+        },
+    }, sub {
+        FixMyStreet::App->log->disable('info');
+
+        $mech->get('/waste/echo');
+        is $mech->res->code, 405, 'Cannot GET';
+
+        $mech->post('/waste/echo', Content_Type => 'text/xml');
+        is $mech->res->code, 400, 'No body';
+
+        my $in = '<Envelope><Header><Action>bad-action</Action></Header><Body></Body></Envelope>';
+        $mech->post('/waste/echo', Content_Type => 'text/xml', Content => $in);
+        is $mech->res->code, 400, 'Bad action';
+
+        $in = '<Envelope><Header><Action>action</Action><Security><UsernameToken><Username></Username><Password></Password></UsernameToken></Security></Header><Body></Body></Envelope>';
+        $mech->post('/waste/echo', Content_Type => 'text/xml', Content => $in);
+        is $mech->res->code, 400, 'Bad auth';
+
+        $in = <<EOF;
+<?xml version="1.0" encoding="UTF-8"?>
+<Envelope>
+  <Header>
+    <Action>action</Action>
+    <Security><UsernameToken><Username>un</Username><Password>password</Password></UsernameToken></Security>
+  </Header>
+  <Body>
+    <NotifyEventUpdated>
+      <event>
+        <Guid>waste-15005-XXX</Guid>
+        <EventTypeId>2104</EventTypeId>
+        <EventStateId>15006</EventStateId>
+        <ResolutionCodeId>207</ResolutionCodeId>
+      </event>
+    </NotifyEventUpdated>
+  </Body>
+</Envelope>
+EOF
+
+        $mech->post('/waste/echo', Content_Type => 'text/xml', Content => $in);
+        is $mech->res->code, 200, 'OK response, even though event does not exist';
+        is $report->comments->count, 2, 'No new update';
+
+        FixMyStreet::App->log->enable('info');
+    };
+};
+
 done_testing();
-- 
cgit v1.2.3


From 9150a5f72725d58055f9b5e60d339a781f9440f1 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 16 Oct 2020 15:11:50 +0100
Subject: allow bulk removal of staff status from users

Bulk option to remove body, roles and permisions, and disable login in
admin for users.

Fixes mysociety/fixmystreet-commercial#2025
---
 CHANGELOG.md                                      |  1 +
 docs/_includes/admin-tasks-content.md             | 14 +++++++
 perllib/FixMyStreet/App/Controller/Admin/Users.pm | 30 +++++++++-----
 t/app/controller/admin/users.t                    | 49 +++++++++++++++++++++++
 templates/web/base/admin/users/index.html         |  6 +++
 5 files changed, 91 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70dd5771d..e53c176fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@
         - Record whether report made on desktop or mobile.
         - Do not display deleted priorities in inspect form. #3195
         - Include extra fields in submit emails.
+        - can remove staff status from users in bulk
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index 234565587..410caf272 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -528,6 +528,20 @@ maintenance) to a staff user by editing the user and checking the relevant categ
 staff user, when logged in, will then only see reports within those categories. This is useful where a
 staff user only deals with reports of a specific type.
 
+#### Removing staff status from accounts
+
+To remove the staff status from an account visit the user page and
+uncheck the ‘staff’ checkbox. To prevent a user from logging in uncheck
+the ‘email verified’ checkbox.
+
+You can do this in bulk on the Users screen by selecting the checkbox
+next to the user's name on the users page, selecting the ‘Remove staff
+permission’ checkbox and clicking submit.
+
+Note that if a user has access to the email address associated with an
+account they can re-enable their account, but will not have staff
+permissions.
+
 #### Removing accounts
 
 To remove an account, the Administrator-level member of staff should make contact with
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Users.pm b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
index a05e737ab..7ebfb9bbd 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Users.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
@@ -29,17 +29,29 @@ sub index :Path : Args(0) {
 
     if ($c->req->method eq 'POST') {
         my @uids = $c->get_param_list('uid');
-        my @role_ids = $c->get_param_list('roles');
         my $user_rs = FixMyStreet::DB->resultset("User")->search({ id => \@uids });
-        foreach my $user ($user_rs->all) {
-            $user->admin_user_body_permissions->delete;
-            $user->user_roles->search({
-                role_id => { -not_in => \@role_ids },
-            })->delete;
-            foreach my $role (@role_ids) {
-                $user->user_roles->find_or_create({
-                    role_id => $role,
+        if ( $c->get_param('remove-staff') ) {
+            foreach my $user ($user_rs->all) {
+                $user->update({
+                    from_body => undef,
+                    email_verified => 0,
+                    phone_verified => 0,
                 });
+                $user->user_roles->delete;
+                $user->admin_user_body_permissions->delete;
+            }
+        } else {
+            my @role_ids = $c->get_param_list('roles');
+            foreach my $user ($user_rs->all) {
+                $user->admin_user_body_permissions->delete;
+                $user->user_roles->search({
+                    role_id => { -not_in => \@role_ids },
+                })->delete;
+                foreach my $role (@role_ids) {
+                    $user->user_roles->find_or_create({
+                        role_id => $role,
+                    });
+                }
             }
         }
         $c->stash->{status_message} = _('Updated!');
diff --git a/t/app/controller/admin/users.t b/t/app/controller/admin/users.t
index a3bd4a784..6f3971149 100644
--- a/t/app/controller/admin/users.t
+++ b/t/app/controller/admin/users.t
@@ -6,6 +6,8 @@ my $user = $mech->create_user_ok('test@example.com', name => 'Test User');
 my $original_user_id = $user->id; # For log later
 my $user2 = $mech->create_user_ok('test2@example.com', name => 'Test User 2');
 my $user3 = $mech->create_user_ok('test3@example.com', name => 'Test User 3');
+my $user4 = $mech->create_user_ok('test4@example.com', name => 'Test User 4');
+my $user5 = $mech->create_user_ok('test5@example.com', name => 'Test User 5');
 
 my $superuser = $mech->create_user_ok('superuser@example.com', name => 'Super User', is_superuser => 1);
 
@@ -13,6 +15,21 @@ my $oxfordshire = $mech->create_body_ok(2237, 'Oxfordshire County Council');
 my $haringey = $mech->create_body_ok(2509, 'Haringey Borough Council');
 my $southend = $mech->create_body_ok(2607, 'Southend-on-Sea Borough Council');
 
+$user4->from_body( $oxfordshire->id );
+$user4->update;
+$user4->user_body_permissions->create( {
+    body => $oxfordshire,
+    permission_type => 'user_edit',
+} );
+$user5->from_body( $oxfordshire->id );
+$user5->update;
+my $occ_role = $user5->roles->create({
+    body => $oxfordshire,
+    name => 'Role A',
+    permissions => ['moderate', 'user_edit'],
+});
+$user5->add_to_roles($occ_role);
+
 $mech->log_in_ok( $superuser->email );
 
 subtest 'search abuse' => sub {
@@ -97,6 +114,38 @@ subtest 'user assign role' => sub {
     is $user->roles->count, 1;
 };
 
+subtest 'remove users from staff' => sub {
+    is $user4->from_body->id, $oxfordshire->id, 'user4 has a body';
+    is $user4->email_verified, 1, 'user4 email is verified';
+    is $user4->user_body_permissions->count, 1, 'user4 has permissions';
+    is $user5->from_body->id, $oxfordshire->id, 'user5 has a body';
+    is $user5->email_verified, 1, 'user5 email is verified';
+    is $user5->user_roles->count, 1, 'user5 has a role';
+
+    $mech->get_ok('/admin/users');
+    $mech->content_contains($user4->email);
+    $mech->content_contains($user5->email);
+
+    $mech->submit_form_ok({ with_fields => { uid => $user4->id, 'remove-staff' => 'remove-staff'} });
+    $mech->content_lacks($user4->email);
+    $mech->content_contains($user5->email);
+    $user4->discard_changes;
+    $user5->discard_changes;
+    is $user4->from_body, undef, 'user4 removed from body';
+    is $user4->email_verified, 0, 'user4 email unverified';
+    is $user4->user_body_permissions->count, 0, 'no user4 permissions';
+    is $user5->from_body->id, $oxfordshire->id, 'user5 has a body';
+    is $user5->email_verified, 1, 'user5 email is verified';
+    is $user5->user_roles->count, 1, 'user5 has a role';
+
+    $mech->submit_form_ok({ with_fields => { uid => $user5->id, 'remove-staff' => 'remove-staff'} });
+    $mech->content_lacks($user5->email);
+    $user5->discard_changes;
+    is $user5->from_body, undef, 'user5 has no body';
+    is $user5->email_verified, 0, 'user5 email unverified';
+    is $user5->user_roles->count, 0, 'no user5 roles';
+};
+
 subtest 'search does not show user from another council' => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ 'oxfordshire' ],
diff --git a/templates/web/base/admin/users/index.html b/templates/web/base/admin/users/index.html
index e573c10fe..dbd32f3a1 100644
--- a/templates/web/base/admin/users/index.html
+++ b/templates/web/base/admin/users/index.html
@@ -80,6 +80,12 @@
   [% END %]
 </select>
 [% END %]
+<p>
+    <label for="remove-staff">
+        [% loc("Remove staff permissions") %]
+        <input type="checkbox" id="remove-staff" name="remove-staff" value="remove-staff">
+    </label>
+</p>
 <p><input class="btn" type="submit" value="[% loc('Save changes') %]">
 </form>
 
-- 
cgit v1.2.3


From c5f80e9cd8a896ff469acfa9a90f69a5a7b5243e Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 23 Oct 2020 11:02:24 +0100
Subject: [Docs] Update Gemfile.lock to current GitHub pages

---
 docs/Gemfile.lock | 81 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 34 deletions(-)

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index c99d41c26..995dc2e3e 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -16,38 +16,39 @@ GEM
     colorator (1.1.0)
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.6)
-    dnsruby (1.61.3)
-      addressable (~> 2.5)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.1.7)
+    dnsruby (1.61.4)
+      simpleidn (~> 0.1)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (1.0.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
+      ruby2_keywords
+    ffi (1.13.1)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (206)
+    github-pages (209)
       github-pages-health-check (= 1.16.1)
-      jekyll (= 3.8.7)
+      jekyll (= 3.9.0)
       jekyll-avatar (= 0.7.0)
       jekyll-coffeescript (= 1.1.1)
       jekyll-commonmark-ghpages (= 0.1.6)
       jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.13.0)
+      jekyll-feed (= 0.15.1)
       jekyll-gist (= 1.5.0)
       jekyll-github-metadata (= 2.13.0)
-      jekyll-mentions (= 1.5.1)
+      jekyll-mentions (= 1.6.0)
       jekyll-optional-front-matter (= 0.3.2)
       jekyll-paginate (= 1.1.0)
       jekyll-readme-index (= 0.3.0)
-      jekyll-redirect-from (= 0.15.0)
+      jekyll-redirect-from (= 0.16.0)
       jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.4.1)
+      jekyll-remote-theme (= 0.4.2)
       jekyll-sass-converter (= 1.5.2)
       jekyll-seo-tag (= 2.6.1)
       jekyll-sitemap (= 1.4.0)
@@ -55,7 +56,7 @@ GEM
       jekyll-theme-architect (= 0.1.1)
       jekyll-theme-cayman (= 0.1.1)
       jekyll-theme-dinky (= 0.1.1)
-      jekyll-theme-hacker (= 0.1.1)
+      jekyll-theme-hacker (= 0.1.2)
       jekyll-theme-leap-day (= 0.1.1)
       jekyll-theme-merlot (= 0.1.1)
       jekyll-theme-midnight (= 0.1.1)
@@ -66,13 +67,14 @@ GEM
       jekyll-theme-tactile (= 0.1.1)
       jekyll-theme-time-machine (= 0.1.1)
       jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.11.1)
-      kramdown (= 1.17.0)
+      jemoji (= 0.12.0)
+      kramdown (= 2.3.0)
+      kramdown-parser-gfm (= 1.1.0)
       liquid (= 4.0.3)
       mercenary (~> 0.3)
       minima (= 2.5.1)
       nokogiri (>= 1.10.4, < 2.0)
-      rouge (= 3.19.0)
+      rouge (= 3.23.0)
       terminal-table (~> 1.4)
     github-pages-health-check (1.16.1)
       addressable (~> 2.3)
@@ -80,20 +82,20 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 3.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.12.3)
+    html-pipeline (2.14.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.7)
+    jekyll (3.9.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 0.7)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (>= 1.17, < 3)
       liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
@@ -113,14 +115,14 @@ GEM
       rouge (>= 2.0, < 4.0)
     jekyll-default-layout (0.1.4)
       jekyll (~> 3.0)
-    jekyll-feed (0.13.0)
+    jekyll-feed (0.15.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
     jekyll-github-metadata (2.13.0)
       jekyll (>= 3.4, < 5.0)
       octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.5.1)
+    jekyll-mentions (1.6.0)
       html-pipeline (~> 2.3)
       jekyll (>= 3.7, < 5.0)
     jekyll-optional-front-matter (0.3.2)
@@ -128,14 +130,15 @@ GEM
     jekyll-paginate (1.1.0)
     jekyll-readme-index (0.3.0)
       jekyll (>= 3.0, < 5.0)
-    jekyll-redirect-from (0.15.0)
+    jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
     jekyll-relative-links (0.6.1)
       jekyll (>= 3.3, < 5.0)
-    jekyll-remote-theme (0.4.1)
+    jekyll-remote-theme (0.4.2)
       addressable (~> 2.0)
       jekyll (>= 3.5, < 5.0)
-      rubyzip (>= 1.3.0)
+      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
+      rubyzip (>= 1.3.0, < 3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.6.1)
@@ -152,8 +155,8 @@ GEM
     jekyll-theme-dinky (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.1)
-      jekyll (~> 3.5)
+    jekyll-theme-hacker (0.1.2)
+      jekyll (> 3.5, < 5.0)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-leap-day (0.1.1)
       jekyll (~> 3.5)
@@ -187,11 +190,14 @@ GEM
       jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.11.1)
+    jemoji (0.12.0)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    kramdown (1.17.0)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     liquid (4.0.3)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -202,11 +208,11 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.14.1)
+    minitest (5.14.2)
     multipart-post (2.1.1)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    octokit (4.18.0)
+    octokit (4.19.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
@@ -215,9 +221,11 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.19.0)
+    rexml (3.2.4)
+    rouge (3.23.0)
     ruby-enum (0.8.0)
       i18n
+    ruby2_keywords (0.0.2)
     rubyzip (2.3.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
@@ -228,6 +236,8 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
+    simpleidn (0.1.1)
+      unf (~> 0.1.4)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
@@ -235,8 +245,11 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
-- 
cgit v1.2.3


From cfda101b3006f12280a41adc4b28ca555b867556 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 23 Oct 2020 14:28:38 +0100
Subject: prevent editing of category names with hardcoded flag

If a category has hardcoded set to 1 in it's extra metadata then prevent
the name being edited in the admin. This is to avoid issues where the
name of the category is used in e.g. layers or other configuration and
changing it breaks things.

Also includes admin interface for setting this that is restricted to
super users only.

Fixes mysociety/fixmystreet-commercial#1992
---
 CHANGELOG.md                                       |  1 +
 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm |  7 +++
 perllib/FixMyStreet/DB/Result/Contact.pm           |  4 ++
 t/app/controller/admin/bodies.t                    | 65 ++++++++++++++++++++++
 templates/web/base/admin/bodies/contact-form.html  |  7 +++
 5 files changed, 84 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e53c176fe..852d5bb17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@
         - Do not display deleted priorities in inspect form. #3195
         - Include extra fields in submit emails.
         - can remove staff status from users in bulk
+        - super users can mark category names as hard coded
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
index f1a6f938b..31a717a9c 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm
@@ -283,6 +283,13 @@ sub update_contact : Private {
             $contact->unset_extra_metadata($_);
         }
     }
+    if ( $c->user->is_superuser ) {
+        if ( $c->get_param('hardcoded') ) {
+            $contact->set_extra_metadata( hardcoded => 1 );
+        } else {
+            $contact->unset_extra_metadata('hardcoded');
+        }
+    }
     if ( my @group = $c->get_param_list('group') ) {
         @group = grep { $_ } @group;
         if (scalar @group == 0) {
diff --git a/perllib/FixMyStreet/DB/Result/Contact.pm b/perllib/FixMyStreet/DB/Result/Contact.pm
index 5cf3302dd..69f8886eb 100644
--- a/perllib/FixMyStreet/DB/Result/Contact.pm
+++ b/perllib/FixMyStreet/DB/Result/Contact.pm
@@ -191,12 +191,16 @@ sub sent_by_open311 {
 
 # We do not want to allow editing of a category's name
 # if it's Open311, unless it's marked as protected
+# Also prevent editing of hardcoded categories
 sub category_uneditable {
     my $self = shift;
     return 1 if
         $self->in_storage
         && !$self->get_extra_metadata('open311_protect')
         && $self->sent_by_open311;
+    return 1 if
+        $self->in_storage
+        && $self->get_extra_metadata('hardcoded');
     return 0;
 }
 
diff --git a/t/app/controller/admin/bodies.t b/t/app/controller/admin/bodies.t
index 542c3f4c0..811ac4362 100644
--- a/t/app/controller/admin/bodies.t
+++ b/t/app/controller/admin/bodies.t
@@ -15,6 +15,10 @@ my $mech = FixMyStreet::TestMech->new;
 my $superuser = $mech->create_user_ok('superuser@example.com', name => 'Super User', is_superuser => 1);
 $mech->log_in_ok( $superuser->email );
 my $body = $mech->create_body_ok(2650, 'Aberdeen City Council');
+my $body2 = $mech->create_body_ok(2237, 'Oxfordshire County Council');
+
+my $user = $mech->create_user_ok('user@example.com', name => 'OCC User', from_body => $body2);
+$user->user_body_permissions->create({ body => $body2, permission_type => 'category_edit' });
 
 # This override is wrapped around ALL the /admin/body tests
 FixMyStreet::override_config {
@@ -117,6 +121,8 @@ subtest 'check contact renaming' => sub {
     $mech->submit_form_ok( { with_fields => { category => 'test category' } } );
 };
 
+
+
 subtest 'check contact updating' => sub {
     $mech->get_ok('/admin/body/' . $body->id . '/test%20category');
     $mech->content_like(qr{test2\@example.com</strong>[^<]*</td>[^<]*<td>unconfirmed}s);
@@ -442,4 +448,63 @@ subtest 'check update disallowed message' => sub {
     };
 };
 
+subtest 'check hardcoded contact renaming' => sub {
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.uk/',
+        'ALLOWED_COBRANDS' => [ 'oxfordshire' ],
+    }, sub {
+        my $contact = FixMyStreet::DB->resultset('Contact')->create(
+            {
+                body_id => $body2->id,
+                category => 'protected category',
+                state => 'confirmed',
+                editor => $0,
+                whenedited => \'current_timestamp',
+                note => 'protected contact',
+                email => 'protected@example.org',
+            }
+        );
+        $contact->set_extra_metadata( 'hardcoded', 1 );
+        $contact->update;
+        $mech->get_ok('/admin/body/' . $body2->id .'/protected%20category');
+        $mech->content_contains( 'name="hardcoded"' );
+        $mech->content_like( qr'value="protected category"[^>]*readonly's );
+        $mech->submit_form_ok( { with_fields => { category => 'non protected category', note => 'rename category' } } );
+        $mech->content_contains( 'protected category' );
+        $mech->content_lacks( 'non protected category' );
+        $mech->get('/admin/body/' . $body2->id . '/non%20protected%20category');
+        is $mech->res->code, 404;
+
+        $mech->get_ok('/admin/body/' . $body2->id .'/protected%20category');
+        $mech->submit_form_ok( { with_fields => { hardcoded => 0, note => 'remove hardcoding'  } } );
+        $mech->get_ok('/admin/body/' . $body2->id .'/protected%20category');
+        $mech->content_unlike( qr'value="protected category"[^>]*readonly's );
+        $mech->submit_form_ok( { with_fields => { category => 'non protected category', note => 'rename category'  } } );
+        $mech->content_contains( 'non protected category' );
+        $mech->get_ok('/admin/body/' . $body2->id . '/non%20protected%20category');
+        $mech->get('/admin/body/' . $body2->id . '/protected%20category');
+        is $mech->res->code, 404;
+
+        $contact->discard_changes;
+        $contact->set_extra_metadata( 'hardcoded', 1 );
+        $contact->update;
+
+        $mech->log_out_ok( $superuser->email );
+        $mech->log_in_ok( $user->email );
+        $mech->get_ok('/admin/body/' . $body2->id . '/non%20protected%20category');
+        $mech->content_lacks( 'name="hardcoded"' );
+        $user->update( { is_superuser => 1 } );
+        $mech->get_ok('/admin/body/' . $body2->id . '/non%20protected%20category');
+        $mech->content_contains('name="hardcoded"' );
+        $user->update( { is_superuser => 0 } );
+        $mech->submit_form_ok( { with_fields => { hardcoded => 0, note => 'remove hardcoding'  } } );
+        $mech->content_lacks( 'name="hardcoded"' );
+
+        $contact->discard_changes;
+        is $contact->get_extra_metadata('hardcoded'), 1, "non superuser can't remove hardcoding";
+
+        $mech->log_out_ok( $user->email );
+    };
+};
+
 done_testing();
diff --git a/templates/web/base/admin/bodies/contact-form.html b/templates/web/base/admin/bodies/contact-form.html
index e1fd2054a..fab485a2f 100644
--- a/templates/web/base/admin/bodies/contact-form.html
+++ b/templates/web/base/admin/bodies/contact-form.html
@@ -89,6 +89,13 @@
       </p>
     [% END %]
 
+    [% IF c.user.is_superuser %]
+      <p class="form-check">
+          <input type="checkbox" name="hardcoded" value="1" id="hardcoded"[% ' checked' IF contact.get_extra_metadata('hardcoded') %]>
+          <label for="hardcoded">[% loc("Protect this category from being re-named") %]</label>
+      </p>
+    [% END %]
+
     <p class="form-check">
         <input type="checkbox" name="assigned_users_only" value="1" id="assigned_users_only" [% ' checked' IF contact.extra.assigned_users_only %]>
         <label for="assigned_users_only">[% loc('Frontend staff access only to users assigned to this category') %]</label>
-- 
cgit v1.2.3


From 6571c867e3b59adab6f114e256af5e0c72da0bb5 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 21 Oct 2020 14:36:56 +0100
Subject: =?UTF-8?q?[Cheshire=20East]=20Don=E2=80=99t=20show=20description?=
 =?UTF-8?q?=20of=20fetched=20reports?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 perllib/FixMyStreet/Cobrand/CheshireEast.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/CheshireEast.pm b/perllib/FixMyStreet/Cobrand/CheshireEast.pm
index ae537b635..2a0423b7c 100644
--- a/perllib/FixMyStreet/Cobrand/CheshireEast.pm
+++ b/perllib/FixMyStreet/Cobrand/CheshireEast.pm
@@ -110,4 +110,7 @@ sub council_rss_alert_options {
     return ( \@options, undef );
 }
 
+# Make sure fetched report description isn't shown.
+sub filter_report_description { "" }
+
 1;
-- 
cgit v1.2.3


From 4b5252e0671cb9636b141009ea27daebf9f70c42 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Wed, 28 Oct 2020 14:58:04 +0000
Subject: [UK] Pro user guide, link to online version from print version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Spotted by Louise H. URL was broken, and link wasn’t even a link.

Even though this is a print view, it still seems silly not to make the
link work. Added benefit is that if you print to PDF, most browsers
will make the link clickable in the PDF too.
---
 docs/_layouts/pro-print.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_layouts/pro-print.html b/docs/_layouts/pro-print.html
index 4437007f4..cda9c1129 100644
--- a/docs/_layouts/pro-print.html
+++ b/docs/_layouts/pro-print.html
@@ -4,7 +4,7 @@ layout: pro
 
 <div class="user-guide-cover">
   <h1 class="user-guide-title">FixMyStreet Pro User Guide</h1>
-  <p>Available from http://fixmystreet.com/pro/user-guide</p>
+  <p>Available from <a href="https://www.fixmystreet.com/pro-manual/">fixmystreet.com/pro-manual</a></p>
 </div>
 
 {% assign sorted_pages = (site.pages | where: "user-guide" , "true" | sort:"order" ) %}
@@ -17,4 +17,4 @@ layout: pro
 
 </div>
 
-{% endfor %}
\ No newline at end of file
+{% endfor %}
-- 
cgit v1.2.3


From e37e3af3656b4545e638494c3ada61e37df7ee0a Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 23 Oct 2020 10:31:52 +0100
Subject: [Borsetshire] Move sign-in button code inline.

This should fix a race condition on Travis where the button is clicked
before the JavaScript on the button has registered.
---
 templates/web/borsetshire/auth/_general_top.html | 34 ++++++++++++++++++++++++
 web/cobrands/borsetshire/js.js                   | 21 +--------------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/templates/web/borsetshire/auth/_general_top.html b/templates/web/borsetshire/auth/_general_top.html
index 3ab3c39bc..5067772fe 100644
--- a/templates/web/borsetshire/auth/_general_top.html
+++ b/templates/web/borsetshire/auth/_general_top.html
@@ -1,3 +1,5 @@
+<div class="hidden-nojs">
+
 <p>
 Click on one of the buttons below to log in as one of the four
 different types of user we’ve set up on this demo site:
@@ -21,3 +23,35 @@ different types of user we’ve set up on this demo site:
 <p>
 Or sign in as normal, with an email address and password:
 </p>
+
+</div>
+
+<script nonce="[% csp_nonce %]">
+(function(){
+
+    fixmystreet.borsetshire = fixmystreet.borsetshire || {};
+    fixmystreet.borsetshire.set_redirect = function(form) {
+        var e = form.username.value;
+        if (e == 'inspector@example.org') {
+            form.r.value = 'my/planned';
+        } else if (e == 'cs@example.org') {
+            form.r.value = 'reports';
+        } else if (e == 'super@example.org') {
+            form.r.value = 'admin';
+        }
+    };
+
+    function set_up_button() {
+        var form = document.forms.general_auth;
+        form.username.value = this.getAttribute('data-email');
+        form.password_sign_in.value = 'password';
+        fixmystreet.borsetshire.set_redirect(form);
+        form.submit();
+    }
+
+    [].forEach.call(document.querySelectorAll('#demo-user-list button'), function(b) {
+        b.addEventListener('click', set_up_button);
+    });
+
+})();
+</script>
diff --git a/web/cobrands/borsetshire/js.js b/web/cobrands/borsetshire/js.js
index 2888a9548..6c0da398e 100644
--- a/web/cobrands/borsetshire/js.js
+++ b/web/cobrands/borsetshire/js.js
@@ -4,27 +4,8 @@
         return;
     }
 
-    function set_redirect(form) {
-        var e = form.username.value;
-        if (e == 'inspector@example.org') {
-            form.r.value = 'my/planned';
-        } else if (e == 'cs@example.org') {
-            form.r.value = 'reports';
-        } else if (e == 'super@example.org') {
-            form.r.value = 'admin';
-        }
-    }
-
-    $('#demo-user-list button').click(function(){
-        var form = document.forms.general_auth;
-        form.username.value = $(this).data('email');
-        form.password_sign_in.value = 'password';
-        set_redirect(form);
-        form.submit();
-    });
-
     $('form[name=general_auth]').on('submit', function() {
-        set_redirect(this);
+        fixmystreet.borsetshire.set_redirect(this);
     });
 
 })();
-- 
cgit v1.2.3


From 94a5eba33a069bd7e67347060630e1874cca37de Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 23 Oct 2020 10:51:49 +0100
Subject: [Cypress] Exclude asset domain from tests.

---
 .cypress/cypress.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cypress/cypress.json b/.cypress/cypress.json
index 6075057a3..d37509eec 100644
--- a/.cypress/cypress.json
+++ b/.cypress/cypress.json
@@ -1,7 +1,7 @@
 {
   "baseUrl": "http://fixmystreet.localhost:3001",
   "projectId": "y8vvs1",
-  "blacklistHosts": ["gaze.mysociety.org", "*.openstreetmap.org", "portal.roadworks.org", "tilma.mysociety.org", "tilma.staging.mysociety.org"],
+  "blacklistHosts": ["gaze.mysociety.org", "*.openstreetmap.org", "portal.roadworks.org", "tilma.mysociety.org", "tilma.staging.mysociety.org", "isharemaps.bathnes.gov.uk"],
   "env": {
      "postcode": "BS10 5EE"
   },
-- 
cgit v1.2.3


From c57204dda3ea73733b9a483fe1c05ee044c11764 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 23 Oct 2020 10:55:22 +0100
Subject: [Cypress] Have full login on temperamental tests.

These tests sometimes fail on Travis; e.g. fetching /report/1 returns a
non-logged in version of the page, or the Inspector login works but you
are still logged in as the previous user. See if we can stabilise it by
doing a full login rather than a cy.request() one, and logging out / in
rather than going directly to re-login.
---
 .cypress/cypress/integration/borsetshire.js |  4 +++-
 .cypress/cypress/integration/duplicates.js  | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.cypress/cypress/integration/borsetshire.js b/.cypress/cypress/integration/borsetshire.js
index c2a2710fb..e3529a9aa 100644
--- a/.cypress/cypress/integration/borsetshire.js
+++ b/.cypress/cypress/integration/borsetshire.js
@@ -8,7 +8,9 @@ it('logs in without fuss', function() {
     cy.contains('Customer service').click();
     cy.url().should('include', '/reports');
 
-    cy.visit('http://borsetshire.localhost:3001/auth');
+    cy.contains('Your account').click();
+    cy.contains('Sign out').click();
+    cy.contains('Sign in').click();
     cy.contains('Inspector').click();
     cy.url().should('include', '/my/planned');
 
diff --git a/.cypress/cypress/integration/duplicates.js b/.cypress/cypress/integration/duplicates.js
index c0e0d8004..c014e0593 100644
--- a/.cypress/cypress/integration/duplicates.js
+++ b/.cypress/cypress/integration/duplicates.js
@@ -51,12 +51,12 @@ describe('Duplicate tests', function() {
     });
 
     it('lets an inspector see duplicate reports coming from /reports', function() {
-      cy.request({
-        method: 'POST',
-        url: 'http://borsetshire.localhost:3001/auth?r=/my',
-        form: true,
-        body: { username: 'admin@example.org', password_sign_in: 'password' }
-      });
+      cy.visit('http://borsetshire.localhost:3001/auth');
+      cy.get('[name=username]').type('admin@example.org');
+      cy.contains('Sign in with a password').click();
+      cy.get('[name=password_sign_in]').type('password');
+      cy.get('[name=sign_in_by_password]').last().click();
+      cy.url().should('include', '/my');
       cy.visit('http://borsetshire.localhost:3001/reports');
       cy.get('[href$="/report/1"]:last').click();
       cy.get('#report_inspect_form #state').select('Duplicate');
-- 
cgit v1.2.3


From e08f14c4501f315b46c2a45b2f63b572ab650691 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 2 Nov 2020 09:25:08 +0000
Subject: [Highways England] Expand across non-DBFO roads.

---
 perllib/FixMyStreet/SendReport/Email/Highways.pm            | 8 +++-----
 t/app/sendreport/email/highways.t                           | 2 +-
 templates/web/highwaysengland/report/new/roads_message.html | 7 +++----
 web/cobrands/highwaysengland/assets.js                      | 6 +++---
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/perllib/FixMyStreet/SendReport/Email/Highways.pm b/perllib/FixMyStreet/SendReport/Email/Highways.pm
index 2bcd120d3..918ac896d 100644
--- a/perllib/FixMyStreet/SendReport/Email/Highways.pm
+++ b/perllib/FixMyStreet/SendReport/Email/Highways.pm
@@ -12,11 +12,9 @@ sub build_recipient_list {
     my $contact = $self->fetch_category($body, $row) or return;
     my $email = $contact->email;
     my $area_name = $row->get_extra_field_value('area_name') || '';
-    if ($area_name eq 'Area 7') {
-        my $a7email = FixMyStreet->config('COBRAND_FEATURES') || {};
-        $a7email = $a7email->{open311_email}->{highwaysengland}->{area_seven};
-        $email = $a7email if $a7email;
-    }
+    my $area_email = FixMyStreet->config('COBRAND_FEATURES') || {};
+    $area_email = $area_email->{open311_email}->{highwaysengland}->{$area_name};
+    $email = $area_email if $area_email;
 
     @{$self->to} = map { [ $_, $body->name ] } split /,/, $email;
     return 1;
diff --git a/t/app/sendreport/email/highways.t b/t/app/sendreport/email/highways.t
index b9a71f23f..22913a7e6 100644
--- a/t/app/sendreport/email/highways.t
+++ b/t/app/sendreport/email/highways.t
@@ -34,7 +34,7 @@ is $e->build_recipient_list($row), 1, 'correct recipient list count';
 is_deeply $e->to, [ [ 'highways@example.com', 'Highways England' ] ], 'correct To line';
 
 FixMyStreet::override_config {
-    COBRAND_FEATURES => { open311_email => { highwaysengland => { area_seven => 'a7@example.com' } } }
+    COBRAND_FEATURES => { open311_email => { highwaysengland => { 'Area 7' => 'a7@example.com' } } }
 }, sub {
     $row->set_extra_fields( { name => 'area_name', value => 'Area 7' } );
     is $e->build_recipient_list($row), 1, 'correct recipient list count';
diff --git a/templates/web/highwaysengland/report/new/roads_message.html b/templates/web/highwaysengland/report/new/roads_message.html
index e75a0a01b..d09845daf 100644
--- a/templates/web/highwaysengland/report/new/roads_message.html
+++ b/templates/web/highwaysengland/report/new/roads_message.html
@@ -7,10 +7,9 @@
         </p>
     </div>
 
-    <div id="js-not-area7-road" class="hidden js-responsibility-message">
-        <strong>This site is currently only for reports in the East Midlands</strong>
-        <p>
-        Please follow this link to
+    <div id="js-dbfo-road" class="hidden js-responsibility-message">
+        Whilst this site is being used to report on roads directly maintained
+        by Highways England, please follow this link to
         <a class="js-update-coordinates" href="https://www.fixmystreet.com/report/new?latitude=[% latitude %]&amp;longitude=[% longitude %]">FixMyStreet</a> to continue reporting your issue.
         </p>
     </div>
diff --git a/web/cobrands/highwaysengland/assets.js b/web/cobrands/highwaysengland/assets.js
index 8e50ed396..5943cdffd 100644
--- a/web/cobrands/highwaysengland/assets.js
+++ b/web/cobrands/highwaysengland/assets.js
@@ -61,9 +61,9 @@ fixmystreet.assets.add(defaults, {
     no_asset_msg_id: '#js-not-he-road',
     actions: {
         found: function(layer, feature) {
-            // If the road isn't in area 7 then we want to show the not found message.
+            // If the road is a DBFO road then we want to show the not found message.
             fixmystreet.message_controller.road_found(layer, feature, function(feature) {
-                if (feature.attributes.area_name === 'Area 7') {
+                if (feature.attributes.area_name.indexOf('DBFO') === -1) {
                     $('#js-top-message').show();
                     $('#form_category_row').show();
                     return true;
@@ -72,7 +72,7 @@ fixmystreet.assets.add(defaults, {
                     $('#form_category_row').hide();
                     return false;
                 }
-            }, '#js-not-area7-road');
+            }, '#js-dbfo-road');
         },
         not_found: function(layer) {
           fixmystreet.message_controller.road_not_found(layer);
-- 
cgit v1.2.3


From 7359a017d4386c96cf681bb694f207138ebf0bc9 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 2 Nov 2020 11:20:12 +0000
Subject: Ignore Low Bing geocoder results if any higher.

---
 perllib/FixMyStreet/Geocode/Bing.pm | 14 ++++++++++++++
 t/Mock/Bing.pm                      | 17 +++++++++++++++++
 t/geocode/bing.t                    |  6 ++++++
 3 files changed, 37 insertions(+)

diff --git a/perllib/FixMyStreet/Geocode/Bing.pm b/perllib/FixMyStreet/Geocode/Bing.pm
index 1b947abee..8c5366d3d 100644
--- a/perllib/FixMyStreet/Geocode/Bing.pm
+++ b/perllib/FixMyStreet/Geocode/Bing.pm
@@ -7,6 +7,7 @@
 package FixMyStreet::Geocode::Bing;
 
 use strict;
+use warnings;
 
 use FixMyStreet::Geocode;
 use Utils;
@@ -52,6 +53,19 @@ sub string {
     my $results = $js->{resourceSets}->[0]->{resources};
     my ( $error, @valid_locations, $latitude, $longitude );
 
+    # If there are any High/Medium confidence results, don't include Low ones
+    my $exclude_low;
+    foreach (@$results) {
+        my $confidence = $_->{confidence};
+        if ($confidence eq 'High' || $confidence eq 'Medium') {
+            $exclude_low = 1;
+            last;
+        }
+    }
+    if ($exclude_low) {
+        @$results = grep { $_->{confidence} ne 'Low' } @$results;
+    }
+
     foreach (@$results) {
         my $address = $_->{name};
         if ($params->{bing_country}) {
diff --git a/t/Mock/Bing.pm b/t/Mock/Bing.pm
index 77045950f..cc4dab845 100644
--- a/t/Mock/Bing.pm
+++ b/t/Mock/Bing.pm
@@ -19,6 +19,7 @@ sub dispatch_request {
         my $results = [ {
             point => { coordinates => [ 51, -1 ] },
             name => 'Constitution Hill, London, SW1A',
+            confidence => 'High',
             address => {
                 addressLine => 'Constitution Hill',
                 locality => 'London',
@@ -29,6 +30,7 @@ sub dispatch_request {
             push @$results, {
                 point => { coordinates => [ 51, -1 ] },
                 name => 'Constitution Hill again, United Kingdom',
+                confidence => 'High',
                 address => {
                     addressLine => 'Constitution Hill again',
                     locality => 'London',
@@ -36,6 +38,21 @@ sub dispatch_request {
                 }
             };
         }
+        if ($query->{q} =~ /low/) {
+            push @$results, {
+                point => { coordinates => [ 52, -2 ] },
+                name => 'Constitution Hill elsewhere, United Kingdom',
+                confidence => 'Low',
+                address => {
+                    addressLine => 'Constitution Hill elsewhere',
+                    locality => 'London',
+                    countryRegion => 'United Kingdom',
+                }
+            };
+        }
+        if ($query->{q} =~ /onlylow/) {
+            @$results = map { $_->{confidence} = 'Low'; $_ } @$results;
+        }
         my $data = {
             statusCode => 200,
             resourceSets => [ { resources => $results } ],
diff --git a/t/geocode/bing.t b/t/geocode/bing.t
index 32cffaa4e..156f983e1 100644
--- a/t/geocode/bing.t
+++ b/t/geocode/bing.t
@@ -21,4 +21,10 @@ FixMyStreet::override_config {
     is $r->{error}[1]{address}, 'Constitution Hill again, London';
 };
 
+my $r = FixMyStreet::Geocode::Bing->string('two results andalow', $c);
+is scalar @{$r->{error}}, 2;
+
+$r = FixMyStreet::Geocode::Bing->string('two results onlylow', $c);
+is scalar @{$r->{error}}, 3;
+
 done_testing;
-- 
cgit v1.2.3


From 6f6a65c8d2076cc20c11ae290c9603ea3c4fe41c Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 5 Nov 2020 21:25:53 +0000
Subject: [Highways England] Remove map grayscale.

---
 web/cobrands/highwaysengland/base.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/cobrands/highwaysengland/base.scss b/web/cobrands/highwaysengland/base.scss
index 839c53ad8..72879d64a 100644
--- a/web/cobrands/highwaysengland/base.scss
+++ b/web/cobrands/highwaysengland/base.scss
@@ -201,5 +201,4 @@ p.form-error {
 
 .olLayerGrid, .olBackBuffer {
     opacity: 0.3;
-    filter: grayscale(1);
 }
-- 
cgit v1.2.3


From 808f4d7c18f2c3a1b776900820e604d896072499 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 10 Nov 2020 14:53:48 +0000
Subject: [Highways England] Added test for config reading.

---
 perllib/FixMyStreet/SendReport/Email/Highways.pm | 7 ++++++-
 t/app/sendreport/email/highways.t                | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/SendReport/Email/Highways.pm b/perllib/FixMyStreet/SendReport/Email/Highways.pm
index 918ac896d..3ace07b6a 100644
--- a/perllib/FixMyStreet/SendReport/Email/Highways.pm
+++ b/perllib/FixMyStreet/SendReport/Email/Highways.pm
@@ -12,8 +12,13 @@ sub build_recipient_list {
     my $contact = $self->fetch_category($body, $row) or return;
     my $email = $contact->email;
     my $area_name = $row->get_extra_field_value('area_name') || '';
+
+    # config is read-only, so must step through one-by-one to prevent
+    # vivification
     my $area_email = FixMyStreet->config('COBRAND_FEATURES') || {};
-    $area_email = $area_email->{open311_email}->{highwaysengland}->{$area_name};
+    $area_email = $area_email->{open311_email} || {};
+    $area_email = $area_email->{highwaysengland} || {};
+    $area_email = $area_email->{$area_name};
     $email = $area_email if $area_email;
 
     @{$self->to} = map { [ $_, $body->name ] } split /,/, $email;
diff --git a/t/app/sendreport/email/highways.t b/t/app/sendreport/email/highways.t
index 22913a7e6..6f6c65eb5 100644
--- a/t/app/sendreport/email/highways.t
+++ b/t/app/sendreport/email/highways.t
@@ -33,6 +33,14 @@ $row->set_extra_fields( { name => 'area_name', value => 'Area 6' } );
 is $e->build_recipient_list($row), 1, 'correct recipient list count';
 is_deeply $e->to, [ [ 'highways@example.com', 'Highways England' ] ], 'correct To line';
 
+FixMyStreet::override_config {
+    COBRAND_FEATURES => {}
+}, sub {
+    $row->set_extra_fields( { name => 'area_name', value => 'Area 7' } );
+    is $e->build_recipient_list($row), 1, 'correct recipient list count';
+    is_deeply $e->to, [ [ 'highways@example.com', 'Highways England' ] ], 'correct To line';
+};
+
 FixMyStreet::override_config {
     COBRAND_FEATURES => { open311_email => { highwaysengland => { 'Area 7' => 'a7@example.com' } } }
 }, sub {
-- 
cgit v1.2.3


From 9292866fbc1be364a716ac9efb105a0350a2de72 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Wed, 2 Sep 2020 16:30:57 +0100
Subject: Form wizard code.

---
 perllib/FixMyStreet/App.pm                  |   1 +
 perllib/FixMyStreet/App/Form/Field/JSON.pm  |  42 ++++++++++
 perllib/FixMyStreet/App/Form/Page/Simple.pm |  25 ++++++
 perllib/FixMyStreet/App/Form/Wizard.pm      | 115 ++++++++++++++++++++++++++++
 4 files changed, 183 insertions(+)
 create mode 100644 perllib/FixMyStreet/App/Form/Field/JSON.pm
 create mode 100644 perllib/FixMyStreet/App/Form/Page/Simple.pm
 create mode 100644 perllib/FixMyStreet/App/Form/Wizard.pm

diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 638fcc4e4..e367f0332 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -514,6 +514,7 @@ Sets the query parameter to the passed variable.
 sub set_param {
     my ($c, $param, $value) = @_;
     $c->req->params->{$param} = $value;
+    $c->req->body_params->{$param} = $value;
 }
 
 =head2 check_2fa
diff --git a/perllib/FixMyStreet/App/Form/Field/JSON.pm b/perllib/FixMyStreet/App/Form/Field/JSON.pm
new file mode 100644
index 000000000..4da4ef2b0
--- /dev/null
+++ b/perllib/FixMyStreet/App/Form/Field/JSON.pm
@@ -0,0 +1,42 @@
+package FixMyStreet::App::Form::Field::JSON;
+
+use HTML::FormHandler::Moose;
+extends 'HTML::FormHandler::Field::Hidden';
+
+use JSON::MaybeXS;
+use MIME::Base64;
+
+has '+inflate_method' => ( default => sub { \&inflate_json } );
+has '+deflate_method' => ( default => sub { \&deflate_json } );
+has '+fif_from_value' => ( default => 1 );
+
+sub inflate_json {
+    my ($self, $value) = @_;
+    return $value unless $value;
+    $value = decode_json(decode_base64($value));
+    return $value;
+}
+
+sub deflate_json {
+    my ($self, $value) = @_;
+    return $value unless $value;
+    $value = encode_base64(encode_json($value), "");
+    return $value;
+}
+
+__PACKAGE__->meta->make_immutable;
+use namespace::autoclean;
+
+1;
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+FixMyStreet::App::Form::Field::JSON - used to store some data in a hidden field
+
+=cut
diff --git a/perllib/FixMyStreet/App/Form/Page/Simple.pm b/perllib/FixMyStreet/App/Form/Page/Simple.pm
new file mode 100644
index 000000000..89a871e2e
--- /dev/null
+++ b/perllib/FixMyStreet/App/Form/Page/Simple.pm
@@ -0,0 +1,25 @@
+package FixMyStreet::App::Form::Page::Simple;
+use Moose;
+extends 'HTML::FormHandler::Page';
+
+# What page to go to after successful submission of this page
+has next => ( is => 'ro', isa => 'Str|CodeRef' );
+
+# A function that will be called to generate an update_field_list parameter
+has update_field_list => (
+    is => 'ro',
+    isa => 'CodeRef',
+    predicate => 'has_update_field_list',
+);
+
+# A function called after all form processing, just before template display
+# (to e.g. set up the map)
+has post_process => (
+    is => 'ro',
+    isa => 'CodeRef',
+);
+
+# Catalyst action to forward to once this page has been reached
+has finished => ( is => 'ro', isa => 'CodeRef' );
+
+1;
diff --git a/perllib/FixMyStreet/App/Form/Wizard.pm b/perllib/FixMyStreet/App/Form/Wizard.pm
new file mode 100644
index 000000000..edb7b0c5c
--- /dev/null
+++ b/perllib/FixMyStreet/App/Form/Wizard.pm
@@ -0,0 +1,115 @@
+package FixMyStreet::App::Form::Wizard;
+# ABSTRACT: create a multi-page form, based on HTML::FormHandler::Wizard, but not numbered
+
+use HTML::FormHandler::Moose;
+extends 'HTML::FormHandler';
+with ('HTML::FormHandler::BuildPages', 'HTML::FormHandler::Pages' );
+
+sub is_wizard { 1 } # So build_active is called
+
+sub build_page_name_space { 'FixMyStreet::App::Form::Page' }
+has '+field_name_space' => ( default => 'FixMyStreet::App::Form::Field' );
+
+# Internal attributes and fields to handle multi-page forms
+has page_name => ( is => 'ro', isa => 'Str' );
+has current_page => ( is => 'ro', lazy => 1,
+    default => sub { $_[0]->page($_[0]->page_name) },
+    predicate => 'has_current_page',
+);
+
+has saved_data_encoded => ( is => 'ro', isa => 'Maybe[Str]' );
+has saved_data => ( is => 'rw', lazy => 1, isa => 'HashRef', default => sub {
+    $_[0]->field('saved_data')->inflate_json($_[0]->saved_data_encoded) || {};
+});
+has previous_form => ( is => 'ro', isa => 'Maybe[HTML::FormHandler]' );
+has csrf_token => ( is => 'ro', isa => 'Str' );
+
+has_field saved_data => ( type => 'JSON' );
+has_field token => ( type => 'Hidden', required => 1 );
+has_field process => ( type => 'Hidden', required => 1 );
+
+sub next {
+    my $self = shift;
+    my $next = $self->current_page->next;
+    if (ref $next eq 'CODE') {
+        $next = $next->($self->saved_data);
+    }
+    return $next;
+}
+
+# Override HFH default and set current page only to active
+sub build_active {
+    my $self = shift;
+
+    my %active;
+    foreach my $fname ($self->current_page->all_fields) {
+        $active{$fname} = 1;
+    }
+
+    foreach my $page ( $self->all_pages ) {
+        foreach my $fname ( $page->all_fields ) {
+            my $field = $self->field($fname);
+            $field->inactive(1) unless $active{$fname};
+        }
+    }
+}
+
+# Stuff to set up as soon as we have a form
+sub after_build {
+    my $self = shift;
+    my $page = $self->current_page;
+
+    my $saved_data = $self->previous_form ? $self->previous_form->saved_data : $self->saved_data;
+
+    $self->init_object($saved_data); # For filling in existing values
+    $self->saved_data($saved_data);
+
+    # Fill in internal fields
+    $self->update_field(saved_data => { default => $saved_data });
+    $self->update_field(token => { default => $self->csrf_token });
+    $self->update_field(process => { default => $page->name });
+
+    # Update field list with any dynamic things (eg user-based, address lookup, geocoding)
+    if ($page->has_update_field_list) {
+        my $updates = $page->update_field_list->($self) || {};
+        foreach my $field_name (keys %$updates) {
+            $self->update_field($field_name, $updates->{$field_name});
+        }
+    }
+}
+
+# After a form has been processed, run any post process functions
+after 'process' => sub {
+    my $self = shift;
+    my $page = $self->current_page;
+    $page->post_process->($self) if $page->post_process;
+};
+
+after 'validate_form' => sub {
+    my $self = shift;
+
+    if ($self->validated) {
+        # Update saved_data for the next page
+        my $saved_data = { %{$self->saved_data}, %{$self->value} };
+        delete $saved_data->{process};
+        delete $saved_data->{token};
+        delete $saved_data->{saved_data};
+        $self->saved_data($saved_data);
+        $self->field('saved_data')->_set_value($saved_data);
+
+        # And check to see if there is a function to call on the page
+        my $page = $self->current_page;
+        if ($page->finished) {
+            my $success = $page->finished->($self);
+            if (!$success) {
+                $self->add_form_error('Something went wrong, please try again')
+                    unless $self->has_form_errors;
+                $self->validated(0);
+            }
+        }
+    }
+};
+
+__PACKAGE__->meta->make_immutable;
+use namespace::autoclean;
+1;
-- 
cgit v1.2.3


From ce1b3ec61fdaa954c26e55b8ce8cd1ad619b3538 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 29 Jun 2020 15:00:55 +0100
Subject: [Bromley] Add waste service lookup.

This creates an integration to view bin collection days, and
placeholders for the start of a non-map property-based reporting flow.
---
 perllib/FixMyStreet/App/Controller/Waste.pm        | 131 +++++-----
 perllib/FixMyStreet/App/Form/Field/Postcode.pm     |  50 ++++
 perllib/FixMyStreet/App/Form/Waste/UPRN.pm         |  37 +++
 perllib/FixMyStreet/Cobrand/Bromley.pm             | 137 +++++++++-
 perllib/FixMyStreet/Template.pm                    |   9 +-
 perllib/Integrations/Echo.pm                       | 278 +++++++++++++++++++++
 t/app/controller/waste.t                           |  53 ++++
 t/cobrand/bromley.t                                |  62 -----
 templates/web/base/waste/bin_days.html             |  96 +++++++
 templates/web/base/waste/govuk/fields.html         | 250 ++++++++++++++++++
 templates/web/base/waste/index.html                |  22 ++
 templates/web/base/waste/missing.html              |  22 ++
 templates/web/bromley/header_extra.html            |   1 +
 templates/web/bromley/waste/services.html          |   0
 web/cobrands/bromley/base.scss                     |  47 ++++
 web/cobrands/sass/_waste.scss                      | 148 +++++++++++
 .../govuk-frontend/govuk-frontend-3.5.0.min.css    |   3 +
 17 files changed, 1215 insertions(+), 131 deletions(-)
 create mode 100644 perllib/FixMyStreet/App/Form/Field/Postcode.pm
 create mode 100644 perllib/FixMyStreet/App/Form/Waste/UPRN.pm
 create mode 100644 perllib/Integrations/Echo.pm
 create mode 100644 t/app/controller/waste.t
 create mode 100644 templates/web/base/waste/bin_days.html
 create mode 100644 templates/web/base/waste/govuk/fields.html
 create mode 100644 templates/web/base/waste/index.html
 create mode 100644 templates/web/base/waste/missing.html
 create mode 100644 templates/web/bromley/header_extra.html
 create mode 100644 templates/web/bromley/waste/services.html
 create mode 100644 web/cobrands/sass/_waste.scss
 create mode 100644 web/vendor/govuk-frontend/govuk-frontend-3.5.0.min.css

diff --git a/perllib/FixMyStreet/App/Controller/Waste.pm b/perllib/FixMyStreet/App/Controller/Waste.pm
index 3cdd9fd42..6319b5f22 100644
--- a/perllib/FixMyStreet/App/Controller/Waste.pm
+++ b/perllib/FixMyStreet/App/Controller/Waste.pm
@@ -5,86 +5,83 @@ use namespace::autoclean;
 BEGIN { extends 'Catalyst::Controller' }
 
 use utf8;
-use Open311::GetServiceRequestUpdates;
+use FixMyStreet::App::Form::Waste::UPRN;
 
-sub receive_echo_event_notification : Path('/waste/echo') : Args(0) {
-    my ($self, $c) = @_;
-    $c->stash->{format} = 'xml';
-    $c->response->header(Content_Type => 'application/soap+xml');
+sub auto : Private {
+    my ( $self, $c ) = @_;
+    my $cobrand_check = $c->cobrand->feature('waste');
+    $c->detach( '/page_error_404_not_found' ) if !$cobrand_check;
+    return 1;
+}
 
-    require SOAP::Lite;
+sub index : Path : Args(0) {
+    my ( $self, $c ) = @_;
+
+    if (my $uprn = $c->get_param('address')) {
+        $c->detach('redirect_to_uprn', [ $uprn ]);
+    }
+
+    $c->stash->{title} = 'What is your address?';
+    my $form = FixMyStreet::App::Form::Waste::UPRN->new( cobrand => $c->cobrand );
+    $form->process( params => $c->req->body_params );
+    if ($form->validated) {
+        my $addresses = $form->value->{postcode};
+        $form = address_list_form($addresses);
+    }
+    $c->stash->{form} = $form;
+}
 
-    $c->detach('soap_error', [ 'Invalid method', 405 ]) unless $c->req->method eq 'POST';
+sub address_list_form {
+    my $addresses = shift;
+    HTML::FormHandler->new(
+        field_list => [
+            address => {
+                required => 1,
+                type => 'Select',
+                widget => 'RadioGroup',
+                label => 'Select an address',
+                tags => { last_differs => 1, small => 1 },
+                options => $addresses,
+            },
+            go => {
+                type => 'Submit',
+                value => 'Continue',
+                element_attr => { class => 'govuk-button' },
+            },
+        ],
+    );
+}
 
-    my $echo = $c->cobrand->feature('echo');
-    $c->detach('soap_error', [ 'Missing config', 500 ]) unless $echo;
+sub redirect_to_uprn : Private {
+    my ($self, $c, $uprn) = @_;
+    my $uri = '/waste/uprn/' . $uprn;
+    $c->res->redirect($uri);
+    $c->detach;
+}
 
-    # Make sure we log entire request for debugging
-    $c->detach('soap_error', [ 'Missing body' ]) unless $c->req->body;
-    my $soap = join('', $c->req->body->getlines);
-    $c->log->info($soap);
+sub uprn : Chained('/') : PathPart('waste/uprn') : CaptureArgs(1) {
+    my ($self, $c, $uprn) = @_;
 
-    my $body = $c->cobrand->body;
-    $c->detach('soap_error', [ 'Bad jurisdiction' ]) unless $body;
+    if ($uprn eq 'missing') {
+        $c->stash->{template} = 'waste/missing.html';
+        $c->detach;
+    }
 
-    my $env = SOAP::Deserializer->deserialize($soap);
+    $c->forward('/auth/get_csrf_token');
 
-    my $header = $env->header;
-    $c->detach('soap_error', [ 'Missing SOAP header' ]) unless $header;
-    my $action = $header->{Action};
-    $c->detach('soap_error', [ 'Incorrect Action' ]) unless $action && $action eq $echo->{receive_action};
-    $header = $header->{Security};
-    $c->detach('soap_error', [ 'Missing Security header' ]) unless $header;
-    my $token = $header->{UsernameToken};
-    $c->detach('soap_error', [ 'Authentication failed' ])
-        unless $token && $token->{Username} eq $echo->{receive_username} && $token->{Password} eq $echo->{receive_password};
+    my $property = $c->stash->{property} = $c->cobrand->call_hook(look_up_property => $uprn);
+    $c->detach( '/page_error_404_not_found', [] ) unless $property;
 
-    # Still want to say it is okay, even if we did nothing with it
-    $c->forward('soap_ok');
-}
+    $c->stash->{uprn} = $uprn;
+    $c->stash->{latitude} = $property->{latitude};
+    $c->stash->{longitude} = $property->{longitude};
 
-sub soap_error : Private {
-    my ($self, $c, $comment, $code) = @_;
-    $code ||= 400;
-    $c->response->status($code);
-    my $type = $code == 500 ? 'Server' : 'Client';
-    $c->response->body(SOAP::Serializer->fault($type, "Bad request: $comment", soap_header()));
+    $c->stash->{service_data} = $c->cobrand->call_hook(bin_services_for_address => $property) || [];
+    $c->stash->{services} = { map { $_->{service_id} => $_ } @{$c->stash->{service_data}} };
 }
 
-sub soap_ok : Private {
+sub bin_days : Chained('uprn') : PathPart('') : Args(0) {
     my ($self, $c) = @_;
-    $c->response->status(200);
-    my $method = SOAP::Data->name("NotifyEventUpdatedResponse")->attr({
-        xmlns => "http://www.twistedfish.com/xmlns/echo/api/v1"
-    });
-    $c->response->body(SOAP::Serializer->envelope(method => $method, soap_header()));
-}
-
-sub soap_header {
-    my $attr = "http://www.twistedfish.com/xmlns/echo/api/v1";
-    my $action = "NotifyEventUpdatedResponse";
-    my $header = SOAP::Header->name("Action")->attr({
-        xmlns => 'http://www.w3.org/2005/08/addressing',
-        'soap:mustUnderstand' => 1,
-    })->value("$attr/ReceiverService/$action");
-
-    my $dt = DateTime->now();
-    my $dt2 = $dt->clone->add(minutes => 5);
-    my $w3c = DateTime::Format::W3CDTF->new;
-    my $header2 = SOAP::Header->name("Security")->attr({
-        'soap:mustUnderstand' => 'true',
-        'xmlns' => 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'
-    })->value(
-        \SOAP::Header->name(
-            "Timestamp" => \SOAP::Header->value(
-                SOAP::Header->name('Created', $w3c->format_datetime($dt)),
-                SOAP::Header->name('Expires', $w3c->format_datetime($dt2)),
-            )
-        )->attr({
-            xmlns => "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd",
-        })
-    );
-    return ($header, $header2);
 }
 
 __PACKAGE__->meta->make_immutable;
diff --git a/perllib/FixMyStreet/App/Form/Field/Postcode.pm b/perllib/FixMyStreet/App/Form/Field/Postcode.pm
new file mode 100644
index 000000000..093ae66a3
--- /dev/null
+++ b/perllib/FixMyStreet/App/Form/Field/Postcode.pm
@@ -0,0 +1,50 @@
+package FixMyStreet::App::Form::Field::Postcode;
+
+use HTML::FormHandler::Moose;
+extends 'HTML::FormHandler::Field::Text';
+
+use mySociety::PostcodeUtil;
+
+apply(
+    [
+        {
+            transform => sub {
+                my ( $value, $field ) = @_;
+                $value =~ s/[^A-Z0-9]//i;
+                return mySociety::PostcodeUtil::canonicalise_postcode($value);
+            }
+        },
+        {
+            check => sub { mySociety::PostcodeUtil::is_valid_postcode(shift) },
+            message => 'Sorry, we did not recognise that postcode.',
+        }
+    ]
+);
+
+
+__PACKAGE__->meta->make_immutable;
+use namespace::autoclean;
+
+1;
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+FixMyStreet::App::Form::Field::Postcode - validates postcode using mySociety::PostcodeUtil
+
+=head1 DESCRIPTION
+
+Validates that the input looks like a postcode using L<mySociety::PostcodeUtil>.
+Widget type is 'text'.
+
+=head1 DEPENDENCIES
+
+L<mySociety::PostcodeUtil>
+
+=cut
+
diff --git a/perllib/FixMyStreet/App/Form/Waste/UPRN.pm b/perllib/FixMyStreet/App/Form/Waste/UPRN.pm
new file mode 100644
index 000000000..d0ac7b3cb
--- /dev/null
+++ b/perllib/FixMyStreet/App/Form/Waste/UPRN.pm
@@ -0,0 +1,37 @@
+package FixMyStreet::App::Form::Waste::UPRN;
+
+use utf8;
+use HTML::FormHandler::Moose;
+extends 'HTML::FormHandler';
+
+use mySociety::PostcodeUtil qw(is_valid_postcode);
+
+has '+field_name_space' => ( default => 'FixMyStreet::App::Form::Field' );
+
+has cobrand => ( is => 'ro' );
+
+has_field postcode => (
+    required => 1,
+    type => 'Postcode',
+    validate_method => sub {
+        my $self = shift;
+        return if $self->has_errors; # Called even if already failed
+        my $data = $self->form->cobrand->bin_addresses_for_postcode($self->value);
+        if (!@$data) {
+            $self->add_error('Sorry, we did not find any results for that postcode');
+        }
+        push @$data, { value => 'missing', label => 'I can’t find my address' };
+        $self->value($data);
+    },
+    tags => { autofocus => 1 },
+);
+
+has_field go => (
+    type => 'Submit',
+    value => 'Go',
+    element_attr => { class => 'govuk-button' },
+);
+
+__PACKAGE__->meta->make_immutable;
+
+1;
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index c8da01226..e4e509f77 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -6,6 +6,8 @@ use warnings;
 use utf8;
 use DateTime::Format::W3CDTF;
 use DateTime::Format::Flexible;
+use Integrations::Echo;
+use Sort::Key::Natural qw(natkeysort_inplace);
 use Try::Tiny;
 use FixMyStreet::DateRange;
 
@@ -376,5 +378,138 @@ sub munge_load_and_group_problems {
     }
 }
 
-1;
+sub bin_addresses_for_postcode {
+    my $self = shift;
+    my $pc = shift;
+
+    my $echo = $self->feature('echo');
+    $echo = Integrations::Echo->new(%$echo);
+    my $points = $echo->FindPoints($pc);
+    my $data = [ map { {
+        value => $_->{SharedRef}{Value}{anyType},
+        label => FixMyStreet::Template::title($_->{Description}),
+    } } @$points ];
+    natkeysort_inplace { $_->{label} } @$data;
+    return $data;
+}
+
+sub look_up_property {
+    my $self = shift;
+    my $uprn = shift;
+
+    my $echo = $self->feature('echo');
+    $echo = Integrations::Echo->new(%$echo);
+    my $result = $echo->GetPointAddress($uprn);
+    return {
+        id => $result->{Id},
+        uprn => $uprn,
+        address => FixMyStreet::Template::title($result->{Description}),
+        latitude => $result->{Coordinates}{GeoPoint}{Latitude},
+        longitude => $result->{Coordinates}{GeoPoint}{Longitude},
+    };
+}
+
+my %irregulars = ( 1 => 'st', 2 => 'nd', 3 => 'rd', 11 => 'th', 12 => 'th', 13 => 'th');
+sub ordinal {
+    my $n = shift;
+    $irregulars{$n % 100} || $irregulars{$n % 10} || 'th';
+}
+
+sub construct_bin_date {
+    my $str = shift;
+    return unless $str;
+    my $offset = ($str->{OffsetMinutes} || 0) * 60;
+    my $zone = DateTime::TimeZone->offset_as_string($offset);
+    my $date = DateTime::Format::W3CDTF->parse_datetime($str->{DateTime});
+    $date->set_time_zone($zone);
+    return $date;
+}
+
+sub bin_services_for_address {
+    my $self = shift;
+    my $property = shift;
+
+    my %service_name_override = (
+        531 => 'Non-Recyclable Refuse',
+        532 => 'Non-Recyclable Refuse',
+        533 => 'Non-Recyclable Refuse',
+        535 => 'Mixed Recycling (Cans, Plastics & Glass)',
+        536 => 'Mixed Recycling (Cans, Plastics & Glass)',
+        537 => 'Paper & Cardboard',
+        541 => 'Paper & Cardboard',
+        542 => 'Food Waste',
+        544 => 'Food Waste',
+        545 => 'Garden Waste',
+    );
+
+    my $echo = $self->feature('echo');
+    $echo = Integrations::Echo->new(%$echo);
+    my $result = $echo->GetServiceUnitsForObject($property->{uprn});
+    return [] unless @$result;
+
+    my @out;
+    foreach (@$result) {
+        next unless $_->{ServiceTasks};
+
+        my $servicetask = $_->{ServiceTasks}{ServiceTask};
+        my $schedules = _parse_schedules($servicetask);
+
+        next unless $schedules->{next} or $schedules->{last};
+
+        my $row = {
+            id => $_->{Id},
+            service_id => $_->{ServiceId},
+            service_name => $service_name_override{$_->{ServiceId}} || $_->{ServiceName},
+            service_task_id => $servicetask->{Id},
+            service_task_name => $servicetask->{TaskTypeName},
+            service_task_type_id => $servicetask->{TaskTypeId},
+            schedule => $servicetask->{ScheduleDescription},
+            last => $schedules->{last},
+            next => $schedules->{next},
+        };
+        push @out, $row;
+    }
 
+    return \@out;
+}
+
+sub _parse_schedules {
+    my $servicetask = shift;
+    my $schedules = $servicetask->{ServiceTaskSchedules}{ServiceTaskSchedule};
+    $schedules = [ $schedules ] unless ref $schedules eq 'ARRAY';
+
+    my $today = DateTime->now->set_time_zone(FixMyStreet->local_time_zone)->strftime("%F");
+    my ($min_next, $max_last, $next_changed);
+    foreach my $schedule (@$schedules) {
+        my $end_date = construct_bin_date($schedule->{EndDate})->strftime("%F");
+        next if $end_date lt $today;
+
+        my $next = $schedule->{NextInstance};
+        my $d = construct_bin_date($next->{CurrentScheduledDate});
+        if ($d && (!$min_next || $d < $min_next->{date})) {
+            $next_changed = $next->{CurrentScheduledDate}{DateTime} ne $next->{OriginalScheduledDate}{DateTime};
+            $min_next = {
+                date => $d,
+                ordinal => ordinal($d->day),
+                changed => $next_changed,
+            };
+        }
+
+        my $last = $schedule->{LastInstance};
+        $d = construct_bin_date($last->{CurrentScheduledDate});
+        if ($d && (!$max_last || $d > $max_last->{date})) {
+            $max_last = {
+                date => $d,
+                ordinal => ordinal($d->day),
+            };
+        }
+    }
+
+    return {
+        next => $min_next,
+        last => $max_last,
+    };
+}
+
+
+1;
diff --git a/perllib/FixMyStreet/Template.pm b/perllib/FixMyStreet/Template.pm
index afb977ac9..275089a35 100644
--- a/perllib/FixMyStreet/Template.pm
+++ b/perllib/FixMyStreet/Template.pm
@@ -161,7 +161,6 @@ sub sanitize {
     return $text;
 }
 
-
 =head2 email_sanitize_text
 
 Intended for use in the _email_comment_list.txt template to allow HTML
@@ -291,4 +290,12 @@ sub _space_slash {
     return $t;
 }
 
+sub title : Filter {
+    my $text = shift;
+    $text =~ s{(\w[\w']*)}{\u\L$1}g;
+    # Postcode special handling
+    $text =~ s{(\w?\w\d[\d\w]?\s*\d\w\w)}{\U$1}g;
+    return $text;
+}
+
 1;
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
new file mode 100644
index 000000000..3bcbfc69b
--- /dev/null
+++ b/perllib/Integrations/Echo.pm
@@ -0,0 +1,278 @@
+package Integrations::Echo;
+
+use strict;
+use warnings;
+use Moo;
+use Tie::IxHash;
+
+has attr => ( is => 'ro', default => 'http://www.twistedfish.com/xmlns/echo/api/v1' );
+has action => ( is => 'lazy', default => sub { $_[0]->attr . "/Service/" } );
+has username => ( is => 'ro' );
+has password => ( is => 'ro' );
+has url => ( is => 'ro' );
+
+has sample_data => ( is => 'ro', default => 0 );
+
+has endpoint => (
+    is => 'lazy',
+    default => sub {
+        my $self = shift;
+        $ENV{PERL_LWP_SSL_CA_PATH} = '/etc/ssl/certs';
+        SOAP::Lite->soapversion(1.2);
+        my $soap = SOAP::Lite->on_action( sub { $self->action . $_[1]; } )->proxy($self->url);
+        $soap->serializer->register_ns("http://schemas.microsoft.com/2003/10/Serialization/Arrays", 'msArray'),
+        return $soap;
+    },
+);
+
+has security => (
+    is => 'lazy',
+    default => sub {
+        my $self = shift;
+        SOAP::Header->name("Security")->attr({
+            'mustUnderstand' => 'true',
+            'xmlns' => 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'
+        })->value(
+            \SOAP::Header->name(
+                "UsernameToken" => \SOAP::Header->value(
+                    SOAP::Header->name('Username', $self->username),
+                    SOAP::Header->name('Password', $self->password),
+                )
+            )
+        );
+    },
+);
+
+sub action_hdr {
+    my ($self, $method) = @_;
+    SOAP::Header->name("Action")->attr({
+        'xmlns' => 'http://www.w3.org/2005/08/addressing',
+    })->value(
+        $self->action . $method
+    );
+}
+
+sub call {
+    my ($self, $method, @params) = @_;
+
+    require SOAP::Lite;
+    @params = make_soap_structure(@params);
+    my $res = $self->endpoint->call(
+        SOAP::Data->name($method)->attr({ xmlns => $self->attr }),
+        $self->security,
+        $self->action_hdr($method),
+        @params
+    );
+    $res = $res->result;
+    return $res;
+}
+
+# Given a list of task handles as two-value array refs (as returned in e.g. the
+# LastInstance part of GetServiceUnitsForObject), returns a list of the
+# corresponding tasks.
+sub GetTasks {
+    my $self = shift;
+
+    my @refs;
+    foreach my $ref (@_) {
+        tie(my %a, 'Tie::IxHash',
+            Key => 'Handle',
+            Type => "Task",
+            Value => [
+                { 'msArray:anyType' => $ref->[0] },
+                { 'msArray:anyType' => $ref->[1] },
+            ],
+        );
+        push @refs, \%a;
+    }
+
+    return [
+        { Ref => { Value => { anyType => [ 123, 456 ] } }, CompletedDate => undef },
+        { Ref => { Value => { anyType => [ 234, 567 ] } }, CompletedDate => { DateTime => '2020-05-27T10:00:00Z' } },
+        { Ref => { Value => { anyType => [ 345, 678 ] } }, CompletedDate => undef },
+        { Ref => { Value => { anyType => [ 456, 789 ] } }, CompletedDate => undef },
+    ] if $self->sample_data;
+
+    # This creates XML of the form <taskRefs><ObjectRef>...</ObjectRef><ObjectRef>...</ObjectRef>...</taskRefs>
+    # uncoverable statement
+    my $res = $self->call('GetTasks',
+        taskRefs => [
+            map { { ObjectRef => $_ } } @refs
+        ],
+        options => {
+            IncludePoints => 'false',
+        },
+    );
+    # uncoverable statement
+    return force_arrayref($res, 'Task');
+}
+
+sub _uprn_ref {
+    require SOAP::Lite;
+    my $uprn = shift;
+    tie(my %obj, 'Tie::IxHash',
+        Key => 'Uprn',
+        Type => 'PointAddress',
+        Value => [
+            { 'msArray:anyType' => SOAP::Data->value($uprn)->type('string') },
+        ],
+    );
+    return \%obj;
+}
+
+sub GetPointAddress {
+    my $self = shift;
+    my $uprn = shift;
+    my $obj = _uprn_ref($uprn);
+    return {
+        Id => '12345',
+        PointType => 'PointAddress',
+        PointAddressType => { Name => 'House' },
+        Coordinates => { GeoPoint => { Latitude => 51.401546, Longitude => 0.015415 } },
+        Description => '2 Example Street, Bromley, BR1 1AA',
+    } if $self->sample_data;
+    $self->call('GetPointAddress', ref => $obj);
+}
+
+# Given a postcode, returns an arrayref of addresses
+sub FindPoints {
+    my $self = shift;
+    my $pc = shift;
+    tie(my %obj, 'Tie::IxHash',
+        PointType => 'PointAddress',
+        Postcode => $pc,
+    );
+    return [
+        { Description => '1 Example Street, Bromley, BR1 1AA', SharedRef => { Value => { anyType => 1000000001 } } },
+        { Description => '2 Example Street, Bromley, BR1 1AA', SharedRef => { Value => { anyType => 1000000002 } } },
+        { Description => '3 Example Street, Bromley, BR1 1AA', SharedRef => { Value => { anyType => 1000000003 } } },
+        { Description => '4 Example Street, Bromley, BR1 1AA', SharedRef => { Value => { anyType => 1000000004 } } },
+        { Description => '5 Example Street, Bromley, BR1 1AA', SharedRef => { Value => { anyType => 1000000005 } } },
+    ] if $self->sample_data;
+    my $res = $self->call('FindPoints', query => \%obj);
+    return force_arrayref($res, 'PointInfo');
+}
+
+sub GetServiceUnitsForObject {
+    my $self = shift;
+    my $uprn = shift;
+    my $obj = _uprn_ref($uprn);
+    my $from = DateTime->now->set_time_zone(FixMyStreet->local_time_zone);
+    return [ {
+        Id => 1001,
+        ServiceId => 101,
+        ServiceName => 'Refuse collection',
+        ServiceTasks => { ServiceTask => {
+            Id => 401,
+            ScheduleDescription => 'every Wednesday',
+            ServiceTaskSchedules => { ServiceTaskSchedule => {
+                EndDate => { DateTime => '2050-01-01T00:00:00Z' },
+                NextInstance => {
+                    CurrentScheduledDate => { DateTime => '2020-06-03T00:00:00Z' },
+                    OriginalScheduledDate => { DateTime => '2020-06-03T00:00:00Z' },
+                },
+                LastInstance => {
+                    CurrentScheduledDate => { DateTime => '2020-05-27T00:00:00Z' },
+                },
+            } },
+        } },
+    }, {
+        Id => 1002,
+        ServiceId => 537,
+        ServiceName => 'Paper recycling collection',
+        ServiceTasks => { ServiceTask => {
+            Id => 402,
+            ScheduleDescription => 'every other Wednesday',
+            ServiceTaskSchedules => { ServiceTaskSchedule => {
+                EndDate => { DateTime => '2050-01-01T00:00:00Z' },
+                NextInstance => {
+                    CurrentScheduledDate => { DateTime => '2020-06-10T00:00:00Z' },
+                    OriginalScheduledDate => { DateTime => '2020-06-10T00:00:00Z' },
+                },
+                LastInstance => {
+                    CurrentScheduledDate => { DateTime => '2020-05-27T00:00:00Z' },
+                },
+            } },
+        } },
+    }, {
+        Id => 1003,
+        ServiceId => 535,
+        ServiceName => 'Domestic Container Mix Collection',
+        ServiceTasks => { ServiceTask => {
+            Id => 403,
+            ScheduleDescription => 'every other Wednesday',
+            ServiceTaskSchedules => { ServiceTaskSchedule => {
+                EndDate => { DateTime => '2050-01-01T00:00:00Z' },
+                NextInstance => {
+                    CurrentScheduledDate => { DateTime => '2020-06-03T00:00:00Z' },
+                    OriginalScheduledDate => { DateTime => '2020-06-03T00:00:00Z' },
+                },
+                LastInstance => {
+                    CurrentScheduledDate => { DateTime => '2020-05-20T00:00:00Z' },
+                },
+            } },
+        } },
+    }, {
+        Id => 1004,
+        ServiceId => 542,
+        ServiceName => 'Food waste collection',
+        ServiceTasks => { ServiceTask => {
+            Id => 404,
+            ScheduleDescription => 'every other Monday',
+            ServiceTaskSchedules => { ServiceTaskSchedule => [ {
+                EndDate => { DateTime => '2020-01-01T00:00:00Z' },
+                LastInstance => {
+                    CurrentScheduledDate => { DateTime => '2019-12-31T00:00:00Z' },
+                },
+            }, {
+                EndDate => { DateTime => '2050-01-01T00:00:00Z' },
+                NextInstance => {
+                    CurrentScheduledDate => { DateTime => '2020-06-02T00:00:00Z' },
+                    OriginalScheduledDate => { DateTime => '2020-06-01T00:00:00Z' },
+                },
+                LastInstance => {
+                    CurrentScheduledDate => { DateTime => '2020-05-18T00:00:00Z' },
+                },
+            } ] },
+        } },
+    } ] if $self->sample_data;
+    # uncoverable statement
+    my $res = $self->call('GetServiceUnitsForObject',
+        objectRef => $obj,
+        query => ixhash(
+            From => dt_to_hash($from),
+            IncludeTaskInstances => 'true',
+        ),
+    );
+    # uncoverable statement
+    return force_arrayref($res, 'ServiceUnit');
+}
+
+sub force_arrayref {
+    my ($res, $key) = @_;
+    return [] unless $res;
+    my $data = $res->{$key};
+    return [] unless $data;
+    $data = [ $data ] unless ref $data eq 'ARRAY';
+    return $data;
+}
+
+sub make_soap_structure {
+    my @out;
+    for (my $i=0; $i<@_; $i+=2) {
+        my $name = $_[$i] =~ /:/ ? $_[$i] : $_[$i];
+        my $v = $_[$i+1];
+        my $val = $v;
+        my $d = SOAP::Data->name($name);
+        if (ref $v eq 'HASH') {
+            $val = \SOAP::Data->value(make_soap_structure(%$v));
+        } elsif (ref $v eq 'ARRAY') {
+            my @map = map { make_soap_structure(%$_) } @$v;
+            $val = \SOAP::Data->value(SOAP::Data->name('dummy' => @map));
+        }
+        push @out, $d->value($val);
+    }
+    return @out;
+}
+
+1;
diff --git a/t/app/controller/waste.t b/t/app/controller/waste.t
new file mode 100644
index 000000000..77b1ef5bc
--- /dev/null
+++ b/t/app/controller/waste.t
@@ -0,0 +1,53 @@
+use Test::MockModule;
+use FixMyStreet::TestMech;
+
+my $mech = FixMyStreet::TestMech->new;
+
+FixMyStreet::override_config {
+    ALLOWED_COBRANDS => ['bromley', 'fixmystreet'],
+    COBRAND_FEATURES => { echo => { bromley => { sample_data => 1 } }, waste => { bromley => 1 } },
+}, sub {
+    $mech->host('bromley.fixmystreet.com');
+    subtest 'Missing address lookup' => sub {
+        $mech->get_ok('/waste');
+        $mech->submit_form_ok({ with_fields => { postcode => 'BR1 1AA' } });
+        $mech->submit_form_ok({ with_fields => { address => 'missing' } });
+        $mech->content_contains('can’t find your address');
+    };
+    subtest 'Address lookup' => sub {
+        $mech->get_ok('/waste');
+        $mech->submit_form_ok({ with_fields => { postcode => 'BR1 1AA' } });
+        $mech->submit_form_ok({ with_fields => { address => '1000000002' } });
+        $mech->content_contains('2 Example Street');
+        $mech->content_contains('Food Waste');
+    };
+};
+
+package SOAP::Result;
+sub result { return $_[0]->{result}; }
+sub new { my $c = shift; bless { @_ }, $c; }
+
+package main;
+
+FixMyStreet::override_config {
+    ALLOWED_COBRANDS => 'bromley',
+    COBRAND_FEATURES => { echo => { bromley => { url => 'http://example.org' } }, waste => { bromley => 1 } },
+}, sub {
+    subtest 'Address lookup, mocking SOAP call' => sub {
+        my $integ = Test::MockModule->new('SOAP::Lite');
+        $integ->mock(call => sub {
+            return SOAP::Result->new(result => {
+                PointInfo => [
+                    { Description => '1 Example Street', SharedRef => { Value => { anyType => 1000000001 } } },
+                    { Description => '2 Example Street', SharedRef => { Value => { anyType => 1000000002 } } },
+                ],
+            });
+        });
+
+        $mech->get_ok('/waste');
+        $mech->submit_form_ok({ with_fields => { postcode => 'BR1 1AA' } });
+        $mech->content_contains('2 Example Street');
+    };
+};
+
+done_testing;
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index e6fa8e115..d26b10709 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -242,66 +242,4 @@ subtest 'check heatmap page' => sub {
     };
 };
 
-package SOAP::Result;
-sub result { return $_[0]->{result}; }
-sub new { my $c = shift; bless { @_ }, $c; }
-
-package main;
-
-subtest 'updating of waste reports' => sub {
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => 'bromley',
-        COBRAND_FEATURES => {
-            echo => { bromley => {
-                receive_action => 'action',
-                receive_username => 'un',
-                receive_password => 'password',
-            } },
-            waste => { bromley => 1 }
-        },
-    }, sub {
-        FixMyStreet::App->log->disable('info');
-
-        $mech->get('/waste/echo');
-        is $mech->res->code, 405, 'Cannot GET';
-
-        $mech->post('/waste/echo', Content_Type => 'text/xml');
-        is $mech->res->code, 400, 'No body';
-
-        my $in = '<Envelope><Header><Action>bad-action</Action></Header><Body></Body></Envelope>';
-        $mech->post('/waste/echo', Content_Type => 'text/xml', Content => $in);
-        is $mech->res->code, 400, 'Bad action';
-
-        $in = '<Envelope><Header><Action>action</Action><Security><UsernameToken><Username></Username><Password></Password></UsernameToken></Security></Header><Body></Body></Envelope>';
-        $mech->post('/waste/echo', Content_Type => 'text/xml', Content => $in);
-        is $mech->res->code, 400, 'Bad auth';
-
-        $in = <<EOF;
-<?xml version="1.0" encoding="UTF-8"?>
-<Envelope>
-  <Header>
-    <Action>action</Action>
-    <Security><UsernameToken><Username>un</Username><Password>password</Password></UsernameToken></Security>
-  </Header>
-  <Body>
-    <NotifyEventUpdated>
-      <event>
-        <Guid>waste-15005-XXX</Guid>
-        <EventTypeId>2104</EventTypeId>
-        <EventStateId>15006</EventStateId>
-        <ResolutionCodeId>207</ResolutionCodeId>
-      </event>
-    </NotifyEventUpdated>
-  </Body>
-</Envelope>
-EOF
-
-        $mech->post('/waste/echo', Content_Type => 'text/xml', Content => $in);
-        is $mech->res->code, 200, 'OK response, even though event does not exist';
-        is $report->comments->count, 2, 'No new update';
-
-        FixMyStreet::App->log->enable('info');
-    };
-};
-
 done_testing();
diff --git a/templates/web/base/waste/bin_days.html b/templates/web/base/waste/bin_days.html
new file mode 100644
index 000000000..0b51e9a47
--- /dev/null
+++ b/templates/web/base/waste/bin_days.html
@@ -0,0 +1,96 @@
+[% SET bodyclass = 'waste' %]
+[% USE date(format = '%A, %-d~~~ %B') %]
+
+[% INCLUDE header.html %]
+
+<h1 class="govuk-heading-xl">Your bin days</h1>
+
+<dl class="waste__address">
+  <dt class="waste__address__title">Address</dt>
+  <dd class="waste__address__property">[% property.address %]</dd>
+</dl>
+<div class="waste__collections">
+  <h2 class="govuk-heading-l govuk-!-margin-bottom-2">Your collections</h2>
+  <p>Please click the service button under each collection schedule for further options associated with that collection.</p>
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+
+[% SET any_report_allowed = 0 ~%]
+[% SET any_request_allowed = 0 ~%]
+[% FOR unit IN service_data %]
+
+<h3 class="govuk-heading-m waste-service-name">[% unit.service_name %]</h3>
+
+<dl class="govuk-summary-list">
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">Frequency</dt>
+    <dd class="govuk-summary-list__value">[% unit.schedule %]</dd>
+  </div>
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">Next collection</dt>
+    <dd class="govuk-summary-list__value">
+      [% IF unit.next %]
+        [% date.format(unit.next.date) | replace('~~~', unit.next.ordinal) %]
+        [% IF unit.next.changed %](this collection has been adjusted from its usual time)[% END %]
+      [% ELSE %]
+        <i>None</i>
+      [% END %]
+    </dd>
+  </div>
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">Last collection</dt>
+    <dd class="govuk-summary-list__value">
+      [% IF unit.last %]
+        [% date.format(unit.last.date) | replace('~~~', unit.last.ordinal) %]
+        [% IF unit.last.completed %](completed at [% date.format(unit.last.completed, '%l:%M%p') | lower ~%])[% END ~%]
+        [% IF unit.last.resolution %][% unit.last.resolution | staff_html_markup({ is_body_user => 1 }) %][% END ~%]
+      [% ELSE %]
+        <i>None</i>
+      [% END %]
+    </dd>
+  </div>
+</dl>
+<p class="waste-panel-toggle hidden-nojs"><a data-toggle-visibility="#panel-[% unit.service_id %]" class="waste-service-name-link govuk-button govuk-button--secondary">[% unit.service_name %] services</a></p>
+
+<div class="waste-services-launch-panel hidden-js" id="panel-[% unit.service_id %]">
+    [% PROCESS waste/services.html %]
+</div>
+
+[% END %]
+[% IF NOT service_data.size %]
+    <p>This property has no collections.</p>
+[% END %]
+
+        [% TRY %][% PROCESS waste/services_extra.html %][% CATCH file %][% END %]
+
+    </div>
+
+    [% IF service_data.size %]
+    <div class="govuk-grid-column-one-third">
+      <div class="aside">
+        <div class="aside-download">
+          <h3>Download your collection schedule</h3>
+          <ul>
+            <li><a href="#">Add to your calendar (.ics file)</a></li>
+          </ul>
+        </div>
+       [% IF any_report_allowed OR any_request_allowed %]
+        <div class="aside-services">
+          <h3>More services</h3>
+          <ul>
+            [% IF any_report_allowed %]
+              <li><a href="[% c.uri_for_action('waste/report', [ uprn ]) %]">Report a missed collection</a></li>
+            [% END %]
+            [% IF any_request_allowed %]
+              <li><a href="[% c.uri_for_action('waste/request', [ uprn ]) %]">Request a new container</a></li>
+            [% END %]
+          </ul>
+        </div>
+       [% END %]
+      </div>
+    </div>
+    [% END %]
+  </div>
+</div>
+[% INCLUDE footer.html %]
+
diff --git a/templates/web/base/waste/govuk/fields.html b/templates/web/base/waste/govuk/fields.html
new file mode 100644
index 000000000..3be0194b0
--- /dev/null
+++ b/templates/web/base/waste/govuk/fields.html
@@ -0,0 +1,250 @@
+[% BLOCK form %]
+  [% FOR field IN form.sorted_fields %]
+    [% NEXT IF field.name == 'back' %]
+    [% SET error = field.errors.join(' ') ~%]
+    <div class="govuk-form-group[% IF error %] govuk-form-group--error[% END %][% ' hidden-js' IF field.get_tag('initial_hidden') %]" id="form-[% field.id %]-row">
+    [% IF field.widget == 'Submit' %]
+        [% field.render_element | safe %]
+    [% ELSIF field.widget == 'Hidden' %]
+        [% PROCESS hidden %]
+    [% ELSIF field.widget == 'Text' %]
+        [% PROCESS text %]
+    [% ELSIF field.widget == 'Textarea' %]
+        [% PROCESS textarea %]
+    [% ELSIF field.widget == 'RadioGroup' %]
+        [% PROCESS radio %]
+    [% ELSIF field.widget == 'Select' %]
+        [% PROCESS select %]
+    [% ELSIF field.widget == 'CheckboxGroup' %]
+        [% PROCESS checkboxes options=field.options %]
+    [% ELSIF field.widget == 'Checkbox' %]
+        [% PROCESS checkboxes options=[{ value = 1, label = field.option_label }] %]
+    [% ELSIF field.type == 'DateTime' # Date %]
+        [% PROCESS date %]
+    [% ELSE %]
+        [% field.html_name %] [% field.widget %] NOT HANDLED
+    [% END %]
+    </div>
+  [% END %]
+[% END %]
+
+[% BLOCK back %]
+  [% IF form.field('back').is_active %]
+    [% form.field('back').render_element | safe %]
+  [% END %]
+[% END %]
+
+[% BLOCK errors %]
+  [% IF form.errors %]
+    <div class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary">
+        <h2 class="govuk-error-summary__title" id="error-summary-title">
+            There is a problem
+        </h2>
+        <div class="govuk-error-summary__body">
+            <ul class="govuk-list govuk-error-summary__list">
+              [% FOR error IN form.errors %]
+                <li>
+                    <a href="#">[% error %]</a>
+                </li>
+              [% END %]
+            </ul>
+        </div>
+    </div>
+  [% END %]
+[% END %]
+
+[% BLOCK title %]
+  <h1 class="govuk-heading-xl">[% title %]</h1>
+[% END %]
+
+[% BLOCK checkboxes %]
+  <fieldset class="govuk-fieldset" aria-describedby="[% IF field.get_tag('hint') %][% field.id %]-hint [% END %][% IF error %][% field.id %]-error[% END %]">
+[% IF field.label %]
+    <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+      <h2 class="govuk-fieldset__heading">
+        [% field.label %]
+      </h2>
+    </legend>
+[% END %]
+[% IF field.get_tag('hint') %]
+    <span id="[% field.id %]-hint" class="govuk-hint">[% field.get_tag('hint') %]</span>
+[% END %]
+[% IF error %]
+    <span id="[% field.id %]-error" class="govuk-error-message">
+      <span class="govuk-visually-hidden">Error:</span> [% error %]
+    </span>
+[% END %]
+    <div class="govuk-checkboxes">
+    [% FOR item IN options %]
+	  [% hint = item.hint OR item.get_tag('hint') %]
+      <div class="govuk-checkboxes__item">
+        <input type="checkbox" class="govuk-checkboxes__input" id="[% field.id %]-[% loop.index %]"
+            name="[% field.html_name %]" value="[% item.value %]"[% ' aria-describedby="' _ field.id _ '-item-hint"' IF hint %]
+            [% 'data-toggle-visibility="#' _ field.get_tag('toggle') _ '"' IF field.get_tag('toggle') ~%]
+            [% 'checked' IF field.fif.grep(item.value).size %]>
+        <label class="govuk-label govuk-checkboxes__label" for="[% field.id %]-[% loop.index %]">
+          [% item.label %]
+        </label>
+[% IF hint %]
+        <span id="[% field.id %]-item-hint" class="govuk-hint govuk-checkboxes__hint">
+          [% hint %]
+        </span>
+[% END %]
+      </div>
+    [% END %]
+    </div>
+  </fieldset>
+[% END %]
+
+[% BLOCK date %]
+  <fieldset class="govuk-fieldset" role="group"
+    [%~ IF field.get_tag('hint') OR error %]
+      aria-describedby="[% IF field.get_tag('hint') %][% field.id %]-hint [% END %][% IF error %][% id %]-error[% END %]"
+    [%~ END %]>
+    <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
+      <h2 class="govuk-fieldset__heading">
+        [% field.label %]
+      </h2>
+    </legend>
+[% IF field.get_tag('hint') %]
+    <span id="[% field.id %]-hint" class="govuk-hint">
+      [% field.get_tag('hint') %]
+    </span>
+[% END %]
+[% IF error %]
+    <span id="[% field.id %]-error" class="govuk-error-message">
+      <span class="govuk-visually-hidden">Error:</span> [% error %]
+    </span>
+[% END %]
+    <div class="govuk-date-input" id="[% field.id %]">
+      <div class="govuk-date-input__item">
+        <div class="govuk-form-group">
+          <label class="govuk-label govuk-date-input__label" for="[% field.id %].day">
+            Day
+          </label>
+          <input class="govuk-input govuk-date-input__input govuk-input--width-2[% IF error %] govuk-input--error[% END %]"
+            id="[% field.id %].day" name="[% field.html_name %].day" type="text" value="[% field.fif.day %]" pattern="[0-9]*" inputmode="numeric">
+        </div>
+      </div>
+      <div class="govuk-date-input__item">
+        <div class="govuk-form-group">
+          <label class="govuk-label govuk-date-input__label" for="[% field.id %].month">
+            Month
+          </label>
+          <input class="govuk-input govuk-date-input__input govuk-input--width-2[% IF error %] govuk-input--error[% END %]"
+            id="[% field.id %].month" name="[% field.html_name %].month" type="text" value="[% field.fif.month %]" pattern="[0-9]*" inputmode="numeric">
+        </div>
+      </div>
+      <div class="govuk-date-input__item">
+        <div class="govuk-form-group">
+          <label class="govuk-label govuk-date-input__label" for="[% field.id %].year">
+            Year
+          </label>
+          <input class="govuk-input govuk-date-input__input govuk-input--width-4[% IF error %] govuk-input--error[% END %]"
+            id="[% field.id %].year" name="[% field.html_name %].year" type="text" value="[% field.fif.year %]" pattern="[0-9]*" inputmode="numeric">
+        </div>
+      </div>
+    </div>
+  </fieldset>
+[% END %]
+
+[% BLOCK radio %]
+  <fieldset class="govuk-fieldset" aria-describedby="[% IF field.get_tag('hint') %][% field.id %]-hint [% END %][% IF error %][% field.id %]-error[% END %]">
+    <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+        <h2 class="govuk-fieldset__heading">
+          [% field.label %]
+        </h2>
+    </legend>
+[% IF field.get_tag('hint') %]
+    <span id="[% field.id %]-hint" class="govuk-hint">[% field.get_tag('hint') %]</span>
+[% END %]
+[% IF error %]
+    <span id="[% field.id %]-error" class="govuk-error-message">
+      <span class="govuk-visually-hidden">Error:</span> [% error %]
+    </span>
+[% END %]
+    <div class="govuk-radios[% IF field.get_tag('inline') %] govuk-radios--inline[% END %][% IF field.get_tag('small') %] govuk-radios--small[% END %]">
+    [% FOR item IN field.options %]
+      [% IF loop.last AND field.get_tag('last_differs') %]
+        <div class="govuk-radios__divider">or</div>
+      [% END %]
+      <div class="govuk-radios__item">
+        <input type="radio" class="govuk-radios__input" id="[% field.id %]-[% loop.index %]"
+            name="[% field.html_name %]" value="[% item.value %]"
+            [% 'checked' IF field.fif == item.value %]>
+        <label class="govuk-label govuk-radios__label" for="[% field.id %]-[% loop.index %]">
+          [% item.label %]
+        </label>
+      </div>
+    [% END %]
+    </div>
+  </fieldset>
+[% END %]
+
+[% BLOCK hidden %]
+    <input type="hidden" name="[% field.html_name %]" id="[% field.id %]" value="[% field.fif %]">
+[% END %]
+
+[% BLOCK text %]
+    <label class="govuk-label" for="[% field.id %]">
+        [% field.label %]
+    </label>
+  [% IF field.get_tag('hint') %]
+    <span id="[% field.id %]-hint" class="govuk-hint">
+        [% field.get_tag('hint') %]
+    </span>
+  [% END %]
+  [% IF error %]
+    <span id="[% field.id %]-error" class="govuk-error-message">
+        <span class="govuk-visually-hidden">Error:</span> [% error %]
+    </span>
+  [% END %]
+    <input class="govuk-input[% IF error %] govuk-input--error[% END %]" id="[% field.id %]" name="[% field.html_name %]" type="text"
+         value="[% field.fif %]"
+    [%~ IF field.get_tag('autofocus') %] autofocus[% END ~%]
+    [%~ IF field.get_tag('hint') OR error %]
+      aria-describedby="[% IF field.get_tag('hint') %][% field.id %]-hint [% END %][% IF error %][% id %]-error[% END %]"
+    [%~ END %]>
+[% END %]
+
+[% BLOCK textarea %]
+    <label class="govuk-label" for="[% field.id %]">
+        [% field.label %]
+    </label>
+  [% IF field.get_tag('hint') %]
+    <span id="[% field.id %]-hint" class="govuk-hint">
+        [% field.get_tag('hint') %]
+    </span>
+  [% END %]
+  [% IF error %]
+    <span id="[% field.id %]-error" class="govuk-error-message">
+        <span class="govuk-visually-hidden">Error:</span> [% error %]
+    </span>
+  [% END %]
+    <textarea class="govuk-textarea[% IF error %] govuk-textarea--error[% END %]" id="[% field.id %]"
+        name="[% field.html_name %]" rows="5"
+    [%~ IF field.get_tag('hint') OR error %]
+        aria-describedby="[% IF field.get_tag('hint') %][% field.id %]-hint [% END %][% IF error %][% id %]-error[% END %]"
+    [%~ END %]>[% field.fif %]</textarea>
+[% END %]
+
+[% BLOCK select %]
+    <label class="govuk-label" for="[% field.id %]">
+        [% field.label %]
+    </label>
+  [% IF field.get_tag('hint') %]
+    <span id="[% field.id %]-hint" class="govuk-hint">
+        [% field.get_tag('hint') %]
+    </span>
+  [% END %]
+  [% IF error %]
+    <span id="[% field.id %]-error" class="govuk-error-message">
+        <span class="govuk-visually-hidden">Error:</span> [% error %]
+    </span>
+  [% END %]
+  <select class="govuk-select" id="[% field.id %]" name="[% field.html_name %]">
+    [% FOR item IN field.options %]
+      <option value="[% item.value %]"[% ' selected' IF field.fif == item.value %]>[% item.label %]</option>
+	[% END %]
+  </select>
+[% END %]
diff --git a/templates/web/base/waste/index.html b/templates/web/base/waste/index.html
new file mode 100644
index 000000000..8e02c5b71
--- /dev/null
+++ b/templates/web/base/waste/index.html
@@ -0,0 +1,22 @@
+[% SET bodyclass = 'waste' %]
+
+[% INCLUDE header.html %]
+
+  [% PROCESS 'waste/govuk/fields.html' %]
+  [% PROCESS back %]
+  [% PROCESS errors %]
+  [% PROCESS title %]
+  [% IF property %]
+  <dl class="waste__address">
+    <dt class="waste__address__title">Address</dt>
+    <dd class="waste__address__property">[% property.address %]</dd>
+  </dl>
+  [% END %]
+<form method="post">
+  [% PROCESS form %]
+  <input type="hidden" name="token" value="[% csrf_token %]">
+  <input type="hidden" name="process" value="[% process %]">
+  <input type="hidden" name="saved_data" value="[% saved_data %]">
+</form>
+
+[% INCLUDE footer.html %]
diff --git a/templates/web/base/waste/missing.html b/templates/web/base/waste/missing.html
new file mode 100644
index 000000000..e80ce87a2
--- /dev/null
+++ b/templates/web/base/waste/missing.html
@@ -0,0 +1,22 @@
+[% INCLUDE header.html %]
+
+<h1 class="govuk-heading-xl">No address on record</h1>
+
+<p class="govuk-body-l">We can’t find your address in our records</p>
+
+<p class="govuk-body">We can’t find your address. This may be because:</p>
+
+<ul class="govuk-list govuk-list--bullet">
+    <li>It’s a commercial or non-residential property and isn’t eligible for kerbside collections
+    <li>It’s a brand new address and hasn’t had collections arranged yet
+    <li>It’s outside of our area, you can find your council who is responsible for your bins on <a href="https://gov.uk/">GOV.UK</a>
+</ul>
+
+<h2 class="govuk-heading-m">What you can do now</h2>
+
+<ul class="govuk-list govuk-list--bullet">
+    <li>Check your address details and <a href="[% c.uri_for_action('waste/index') %]">search again</a>
+    <li>Call our customer service team on 0800 647 7836 who will be pleased to assist you
+</ul>
+
+[% INCLUDE footer.html %]
diff --git a/templates/web/bromley/header_extra.html b/templates/web/bromley/header_extra.html
new file mode 100644
index 000000000..709f06084
--- /dev/null
+++ b/templates/web/bromley/header_extra.html
@@ -0,0 +1 @@
+<link rel="stylesheet" href="/vendor/govuk-frontend/govuk-frontend-3.5.0.min.css">
diff --git a/templates/web/bromley/waste/services.html b/templates/web/bromley/waste/services.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss
index 1db6d98a7..ab4a476e8 100644
--- a/web/cobrands/bromley/base.scss
+++ b/web/cobrands/bromley/base.scss
@@ -443,3 +443,50 @@ body.mappage {
     }
   }
 }
+
+@import "../sass/waste";
+
+// Waste style overrides
+.waste {
+  [class^="govuk-heading-"],
+  .govuk-fieldset__heading {
+    font-family: $heading-font;
+    color: darken($bromley_blue, 10%);
+  }
+
+  .govuk-heading-xl {
+    font-size: 2.2em;
+    margin-bottom: 1em;
+  }
+
+  .govuk-heading-l {
+    font-size: 1.4375em;
+  }
+
+  .govuk-heading-m {
+    font-size: 1.125em;
+  }
+
+  .govuk-summary-list {
+    border-top-color: $bromley_blue;
+  }
+
+  .govuk-button {
+    background-color: $bromley_green;
+    box-shadow: 0 2px 0 darken($bromley_green, 10%);
+    &:hover {
+      //don't override focus as gov.uk is good at that
+      background-color: darken($bromley_green, 10%);
+    }
+  }
+
+  .govuk-button--secondary {
+    background-color: $base_bg;
+    box-shadow: 0 2px 0 darken($base_bg, 10%);
+    &:hover {
+      background-color: darken($base_bg, 5%);
+      box-shadow: 0 2px 0 darken($base_bg, 15%);
+    }
+  }
+}
+
diff --git a/web/cobrands/sass/_waste.scss b/web/cobrands/sass/_waste.scss
new file mode 100644
index 000000000..9ea957131
--- /dev/null
+++ b/web/cobrands/sass/_waste.scss
@@ -0,0 +1,148 @@
+body.waste {
+    label, legend {
+      margin-top: 0; font-weight: normal !important;
+    } /* from base/h5bp */
+
+    input[type="text"].govuk-input--width-2 {
+      max-width: 5.4ex;
+    }
+
+    input[type="text"].govuk-input--width-4 {
+      max-width: 9ex;
+    }
+
+    input[type="text"].govuk-input {
+      font-size: 16px;
+      font-size: 1rem;
+      line-height: 1.25;
+      padding: 5px;
+      @media (min-width: 40.0625em) {
+        font-size: 19px; font-size: 1.1875rem; line-height: 1.31579;
+      }
+    }
+}
+
+.waste__collections,
+.waste__summary {
+  .govuk-summary-list {
+    font-size: 1em;
+    border-top: 1px solid #808080;
+    background-color: white;
+  }
+
+  .govuk-summary-list__row {
+    background-color: white;
+  }
+
+  .govuk-heading-m {
+    margin-bottom: 10px;
+  }
+  
+  .govuk-summary-list__key--sub { 
+    padding-top: 10px; 
+    font-weight: normal !important; /* Ugh */ 
+  }
+}
+
+.waste__summary {
+  .govuk-button--secondary {
+    font-size: 1em;
+  }
+  .govuk-summary-list__key {
+    vertical-align: middle;
+  }
+}
+
+.govuk-select {
+  width: auto;
+  min-width: 5em;
+}
+
+.waste__address {
+  font-size: 1.125em;
+  margin-bottom: 2em;
+}
+
+.waste__address__title {
+  font-weight: normal;
+}
+
+.waste__address__property {
+  font-weight: bold;
+}
+
+.aside-services {
+  ul ul {
+    margin-top: 0.4em;
+  }
+}
+.waste {
+  .govuk-fieldset__heading {
+    font-size: 1.4375rem;
+    font-weight: bold;
+  }
+}
+
+.waste-panel-toggle {
+  position: relative;
+  top: -1em;
+  margin-bottom: 0;
+  z-index: 1;
+}
+
+.waste-services-launch-panel {
+  margin-bottom: 3em;
+  opacity: 1;
+  transform: translateY(0);
+  transition: all 200ms ease-out;
+  z-index: inherit;
+  position: relative;
+  .js &.hidden-js {
+    display: block;
+    opacity: 0;
+    transform: translateY(-100%);
+    transition: all 200ms ease-in;
+    position: absolute;
+  }
+}
+
+.waste-service-name.govuk-heading-m {
+  margin-top: 1.5em;
+}
+
+.waste-service-descriptor {
+  font-family: $body-font;
+  display: block;
+  width: 100%;
+  margin-bottom: 0.5em;
+  padding: 0 0 0.25em 0;
+  border: 0;
+  border-bottom: 1px solid #e9e9e9;
+  -webkit-appearance: none;
+  background: transparent;
+  font-size: inherit;
+  text-align: left; 
+  white-space: normal;
+  line-height: 1.5;
+  .content & {
+    font-weight: normal;
+  }
+}
+
+.waste-service-link,
+input[type="submit"].waste-service-link {
+  color: $link-color;
+  &:hover,
+  &:focus {
+    text-decoration: underline;
+  }
+}
+
+.waste-service-name-link {
+  .waste & {
+    cursor: pointer;
+    margin-top: 0.5em;
+    margin-bottom: 0;
+    font-size: 1rem;
+  }
+}
diff --git a/web/vendor/govuk-frontend/govuk-frontend-3.5.0.min.css b/web/vendor/govuk-frontend/govuk-frontend-3.5.0.min.css
new file mode 100644
index 000000000..9c526ac39
--- /dev/null
+++ b/web/vendor/govuk-frontend/govuk-frontend-3.5.0.min.css
@@ -0,0 +1,3 @@
+.govuk-link{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
+
+/*! Copyright (c) 2011 by Margaret Calvert & Henrik Kubel. All rights reserved. The font has been customised for exclusive use on gov.uk. This cut is not commercially available. */@font-face{font-family:GDS Transport;src:url(/assets/fonts/light-94a07e06a1-v2.woff2) format("woff2"),url(/assets/fonts/light-f591b13f7d-v2.woff) format("woff");font-weight:400;font-style:normal;font-display:fallback}@font-face{font-family:GDS Transport;src:url(/assets/fonts/bold-b542beb274-v2.woff2) format("woff2"),url(/assets/fonts/bold-affa96571d-v2.woff) format("woff");font-weight:700;font-style:normal;font-display:fallback}@media print{.govuk-link{font-family:sans-serif}}.govuk-link:focus{outline:3px solid rgba(0,0,0,0);background-color:#fd0;box-shadow:0 -2px #fd0,0 4px #0b0c0c;text-decoration:none}.govuk-link:link{color:#1d70b8}.govuk-link:visited{color:#4c2c92}.govuk-link:hover{color:#003078}.govuk-link:active,.govuk-link:focus{color:#0b0c0c}@media print{.govuk-link[href^="/"]:after,.govuk-link[href^="http://"]:after,.govuk-link[href^="https://"]:after{content:" (" attr(href) ")";font-size:90%;word-wrap:break-word}}.govuk-link--muted:active,.govuk-link--muted:hover,.govuk-link--muted:link,.govuk-link--muted:visited{color:#626a6e}.govuk-link--muted:focus,.govuk-link--text-colour:active,.govuk-link--text-colour:focus,.govuk-link--text-colour:hover,.govuk-link--text-colour:link,.govuk-link--text-colour:visited{color:#0b0c0c}@media print{.govuk-link--text-colour:active,.govuk-link--text-colour:focus,.govuk-link--text-colour:hover,.govuk-link--text-colour:link,.govuk-link--text-colour:visited{color:#000}}.govuk-link--no-visited-state:link,.govuk-link--no-visited-state:visited{color:#1d70b8}.govuk-link--no-visited-state:hover{color:#003078}.govuk-link--no-visited-state:active,.govuk-link--no-visited-state:focus,.govuk-list{color:#0b0c0c}.govuk-list{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;margin-top:0;margin-bottom:15px;padding-left:0;list-style-type:none}@media print{.govuk-list{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-list{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-list{font-size:14pt;line-height:1.15;color:#000}}@media (min-width:40.0625em){.govuk-list{margin-bottom:20px}}.govuk-list .govuk-list{margin-top:10px}.govuk-list>li{margin-bottom:5px}.govuk-list--bullet{padding-left:20px;list-style-type:disc}.govuk-list--number{padding-left:20px;list-style-type:decimal}.govuk-list--bullet>li,.govuk-list--number>li{margin-bottom:0}@media (min-width:40.0625em){.govuk-list--bullet>li,.govuk-list--number>li{margin-bottom:5px}}.govuk-template{background-color:#f3f2f1;-webkit-text-size-adjust:100%;-moz-text-size-adjust:100%;-ms-text-size-adjust:100%;text-size-adjust:100%}@media screen{.govuk-template{overflow-y:scroll}}.govuk-template__body{margin:0;background-color:#fff}.govuk-heading-xl{color:#0b0c0c;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:32px;font-size:2rem;line-height:1.09375;display:block;margin-top:0;margin-bottom:30px}@media print{.govuk-heading-xl{color:#000;font-family:sans-serif}}@media (min-width:40.0625em){.govuk-heading-xl{font-size:48px;font-size:3rem;line-height:1.04167}}@media print{.govuk-heading-xl{font-size:32pt;line-height:1.15}}@media (min-width:40.0625em){.govuk-heading-xl{margin-bottom:50px}}.govuk-heading-l{color:#0b0c0c;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:24px;font-size:1.5rem;line-height:1.04167;display:block;margin-top:0;margin-bottom:20px}@media print{.govuk-heading-l{color:#000;font-family:sans-serif}}@media (min-width:40.0625em){.govuk-heading-l{font-size:36px;font-size:2.25rem;line-height:1.11111}}@media print{.govuk-heading-l{font-size:24pt;line-height:1.05}}@media (min-width:40.0625em){.govuk-heading-l{margin-bottom:30px}}.govuk-heading-m{color:#0b0c0c;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:18px;font-size:1.125rem;line-height:1.11111;display:block;margin-top:0;margin-bottom:15px}@media print{.govuk-heading-m{color:#000;font-family:sans-serif}}@media (min-width:40.0625em){.govuk-heading-m{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-heading-m{font-size:18pt;line-height:1.15}}@media (min-width:40.0625em){.govuk-heading-m{margin-bottom:20px}}.govuk-heading-s{color:#0b0c0c;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:16px;font-size:1rem;line-height:1.25;display:block;margin-top:0;margin-bottom:15px}@media print{.govuk-heading-s{color:#000;font-family:sans-serif}}@media (min-width:40.0625em){.govuk-heading-s{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-heading-s{font-size:14pt;line-height:1.15}}@media (min-width:40.0625em){.govuk-heading-s{margin-bottom:20px}}.govuk-caption-xl{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1.11111;display:block;margin-bottom:5px;color:#626a6e}@media print{.govuk-caption-xl{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-caption-xl{font-size:27px;font-size:1.6875rem;line-height:1.11111}}@media print{.govuk-caption-xl{font-size:18pt;line-height:1.15}}.govuk-caption-l{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1.11111;display:block;margin-bottom:5px;color:#626a6e}@media print{.govuk-caption-l{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-caption-l{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-caption-l{font-size:18pt;line-height:1.15}}@media (min-width:40.0625em){.govuk-caption-l{margin-bottom:0}}.govuk-caption-m{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;display:block;color:#626a6e}@media print{.govuk-caption-m{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-caption-m{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-caption-m{font-size:14pt;line-height:1.15}}.govuk-body-l,.govuk-body-lead{color:#0b0c0c;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1.11111;margin-top:0;margin-bottom:20px}@media print{.govuk-body-l,.govuk-body-lead{color:#000;font-family:sans-serif}}@media (min-width:40.0625em){.govuk-body-l,.govuk-body-lead{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-body-l,.govuk-body-lead{font-size:18pt;line-height:1.15}}@media (min-width:40.0625em){.govuk-body-l,.govuk-body-lead{margin-bottom:30px}}.govuk-body,.govuk-body-m{color:#0b0c0c;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;margin-top:0;margin-bottom:15px}@media print{.govuk-body,.govuk-body-m{color:#000;font-family:sans-serif}}@media (min-width:40.0625em){.govuk-body,.govuk-body-m{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-body,.govuk-body-m{font-size:14pt;line-height:1.15}}@media (min-width:40.0625em){.govuk-body,.govuk-body-m{margin-bottom:20px}}.govuk-body-s{color:#0b0c0c;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:14px;font-size:.875rem;line-height:1.14286;margin-top:0;margin-bottom:15px}@media print{.govuk-body-s{color:#000;font-family:sans-serif}}@media (min-width:40.0625em){.govuk-body-s{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-body-s{font-size:14pt;line-height:1.2}}@media (min-width:40.0625em){.govuk-body-s{margin-bottom:20px}}.govuk-body-xs{color:#0b0c0c;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:12px;font-size:.75rem;line-height:1.25;margin-top:0;margin-bottom:15px}@media print{.govuk-body-xs{color:#000;font-family:sans-serif}}@media (min-width:40.0625em){.govuk-body-xs{font-size:14px;font-size:.875rem;line-height:1.42857}}@media print{.govuk-body-xs{font-size:12pt;line-height:1.2}}@media (min-width:40.0625em){.govuk-body-xs{margin-bottom:20px}}.govuk-body-l+.govuk-heading-l,.govuk-body-lead+.govuk-heading-l{padding-top:5px}@media (min-width:40.0625em){.govuk-body-l+.govuk-heading-l,.govuk-body-lead+.govuk-heading-l{padding-top:10px}}.govuk-body+.govuk-heading-l,.govuk-body-m+.govuk-heading-l,.govuk-body-s+.govuk-heading-l,.govuk-list+.govuk-heading-l{padding-top:15px}@media (min-width:40.0625em){.govuk-body+.govuk-heading-l,.govuk-body-m+.govuk-heading-l,.govuk-body-s+.govuk-heading-l,.govuk-list+.govuk-heading-l{padding-top:20px}}.govuk-body+.govuk-heading-m,.govuk-body+.govuk-heading-s,.govuk-body-m+.govuk-heading-m,.govuk-body-m+.govuk-heading-s,.govuk-body-s+.govuk-heading-m,.govuk-body-s+.govuk-heading-s,.govuk-list+.govuk-heading-m,.govuk-list+.govuk-heading-s{padding-top:5px}@media (min-width:40.0625em){.govuk-body+.govuk-heading-m,.govuk-body+.govuk-heading-s,.govuk-body-m+.govuk-heading-m,.govuk-body-m+.govuk-heading-s,.govuk-body-s+.govuk-heading-m,.govuk-body-s+.govuk-heading-s,.govuk-list+.govuk-heading-m,.govuk-list+.govuk-heading-s{padding-top:10px}}.govuk-section-break{margin:0;border:0}.govuk-section-break--xl{margin-top:30px;margin-bottom:30px}@media (min-width:40.0625em){.govuk-section-break--xl{margin-top:50px;margin-bottom:50px}}.govuk-section-break--l{margin-top:20px;margin-bottom:20px}@media (min-width:40.0625em){.govuk-section-break--l{margin-top:30px;margin-bottom:30px}}.govuk-section-break--m{margin-top:15px;margin-bottom:15px}@media (min-width:40.0625em){.govuk-section-break--m{margin-top:20px;margin-bottom:20px}}.govuk-section-break--visible{border-bottom:1px solid #b1b4b6}.govuk-form-group{margin-bottom:20px}.govuk-form-group:after{content:"";display:block;clear:both}@media (min-width:40.0625em){.govuk-form-group{margin-bottom:30px}}.govuk-form-group .govuk-form-group:last-of-type{margin-bottom:0}.govuk-form-group--error{padding-left:15px;border-left:5px solid #d4351c}.govuk-form-group--error .govuk-form-group{padding:0;border:0}.govuk-grid-row{margin-right:-15px;margin-left:-15px}.govuk-grid-row:after{content:"";display:block;clear:both}.govuk-grid-column-one-quarter{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width:40.0625em){.govuk-grid-column-one-quarter{width:25%;float:left}}.govuk-grid-column-one-third{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width:40.0625em){.govuk-grid-column-one-third{width:33.3333%;float:left}}.govuk-grid-column-one-half{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width:40.0625em){.govuk-grid-column-one-half{width:50%;float:left}}.govuk-grid-column-two-thirds{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width:40.0625em){.govuk-grid-column-two-thirds{width:66.6666%;float:left}}.govuk-grid-column-three-quarters{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width:40.0625em){.govuk-grid-column-three-quarters{width:75%;float:left}}.govuk-grid-column-full{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width:40.0625em){.govuk-grid-column-full{width:100%;float:left}}.govuk-grid-column-one-quarter-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width:48.0625em){.govuk-grid-column-one-quarter-from-desktop{width:25%;float:left}}.govuk-grid-column-one-third-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width:48.0625em){.govuk-grid-column-one-third-from-desktop{width:33.3333%;float:left}}.govuk-grid-column-one-half-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width:48.0625em){.govuk-grid-column-one-half-from-desktop{width:50%;float:left}}.govuk-grid-column-two-thirds-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width:48.0625em){.govuk-grid-column-two-thirds-from-desktop{width:66.6666%;float:left}}.govuk-grid-column-three-quarters-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width:48.0625em){.govuk-grid-column-three-quarters-from-desktop{width:75%;float:left}}.govuk-grid-column-full-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width:48.0625em){.govuk-grid-column-full-from-desktop{width:100%;float:left}}.govuk-main-wrapper{display:block;padding-top:20px;padding-bottom:20px}@media (min-width:40.0625em){.govuk-main-wrapper{padding-top:40px;padding-bottom:40px}}.govuk-main-wrapper--auto-spacing:first-child,.govuk-main-wrapper--l{padding-top:30px}@media (min-width:40.0625em){.govuk-main-wrapper--auto-spacing:first-child,.govuk-main-wrapper--l{padding-top:50px}}.govuk-width-container{max-width:960px;margin-right:15px;margin-left:15px}@supports (margin:max(calc(0px))){.govuk-width-container{margin-right:max(15px,calc(15px + env(safe-area-inset-right)));margin-left:max(15px,calc(15px + env(safe-area-inset-left)))}}@media (min-width:40.0625em){.govuk-width-container{margin-right:30px;margin-left:30px}@supports (margin:max(calc(0px))){.govuk-width-container{margin-right:max(30px,calc(15px + env(safe-area-inset-right)));margin-left:max(30px,calc(15px + env(safe-area-inset-left)))}}}@media (min-width:1020px){.govuk-width-container{margin-right:auto;margin-left:auto}@supports (margin:max(calc(0px))){.govuk-width-container{margin-right:auto;margin-left:auto}}}.govuk-accordion{margin-bottom:20px}@media (min-width:40.0625em){.govuk-accordion{margin-bottom:30px}}.govuk-accordion__section{padding-top:15px}.govuk-accordion__section-header{padding-top:15px;padding-bottom:15px}.govuk-accordion__section-heading{margin-top:0;margin-bottom:0}.govuk-accordion__section-button{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:18px;font-size:1.125rem;line-height:1.11111;display:inline-block;margin-bottom:0;padding-top:15px}@media print{.govuk-accordion__section-button{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-accordion__section-button{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-accordion__section-button{font-size:18pt;line-height:1.15}}.govuk-accordion__section-summary{margin-top:10px;margin-bottom:0}.govuk-accordion__section-content>:last-child{margin-bottom:0}.js-enabled .govuk-accordion{border-bottom:1px solid #b1b4b6}.js-enabled .govuk-accordion__section{padding-top:0}.js-enabled .govuk-accordion__section-content{display:none;padding-top:15px;padding-bottom:15px}@media (min-width:40.0625em){.js-enabled .govuk-accordion__section-content{padding-top:15px;padding-bottom:15px}}.js-enabled .govuk-accordion__section--expanded .govuk-accordion__section-content{display:block}.js-enabled .govuk-accordion__open-all{font-weight:400;font-size:14px;font-size:.875rem;line-height:1.14286;position:relative;z-index:1;margin:0;padding:0;border-width:0;color:#1d70b8;background:none;cursor:pointer;-webkit-appearance:none;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@media (min-width:40.0625em){.js-enabled .govuk-accordion__open-all{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.js-enabled .govuk-accordion__open-all{font-size:14pt;line-height:1.2;font-family:sans-serif}}.js-enabled .govuk-accordion__open-all:focus{outline:3px solid rgba(0,0,0,0);background-color:#fd0;box-shadow:0 -2px #fd0,0 4px #0b0c0c;text-decoration:none}.js-enabled .govuk-accordion__open-all:link{color:#1d70b8}.js-enabled .govuk-accordion__open-all:visited{color:#4c2c92}.js-enabled .govuk-accordion__open-all:hover{color:#003078}.js-enabled .govuk-accordion__open-all:active,.js-enabled .govuk-accordion__open-all:focus{color:#0b0c0c}.js-enabled .govuk-accordion__open-all::-moz-focus-inner{padding:0;border:0}.js-enabled .govuk-accordion__section-header{position:relative;padding-right:40px;border-top:1px solid #b1b4b6;color:#1d70b8;cursor:pointer}@media (hover:none){.js-enabled .govuk-accordion__section-header:hover{border-top-color:#1d70b8;box-shadow:inset 0 3px 0 0 #1d70b8}}.js-enabled .govuk-accordion__section-button{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;margin-top:0;margin-bottom:0;margin-left:0;padding:0;border-width:0;color:inherit;background:none;text-align:left;cursor:pointer;-webkit-appearance:none}@media print{.js-enabled .govuk-accordion__section-button{font-family:sans-serif}}.js-enabled .govuk-accordion__section-button:focus{outline:3px solid rgba(0,0,0,0);color:#0b0c0c;background-color:#fd0;box-shadow:0 -2px #fd0,0 4px #0b0c0c;text-decoration:none}.js-enabled .govuk-accordion__section-button::-moz-focus-inner{padding:0;border:0}.js-enabled .govuk-accordion__section-button:after{content:"";position:absolute;top:0;right:0;bottom:0;left:0}.js-enabled .govuk-accordion__section-button:hover:not(:focus){text-decoration:underline}@media (hover:none){.js-enabled .govuk-accordion__section-button:hover{text-decoration:none}}.js-enabled .govuk-accordion__controls{text-align:right}.js-enabled .govuk-accordion__icon{position:absolute;top:50%;right:15px;width:16px;height:16px;margin-top:-8px}.js-enabled .govuk-accordion__icon:after,.js-enabled .govuk-accordion__icon:before{content:"";box-sizing:border-box;position:absolute;top:0;right:0;bottom:0;left:0;width:25%;height:25%;margin:auto;border:2px solid rgba(0,0,0,0);background-color:#0b0c0c}.js-enabled .govuk-accordion__icon:before{width:100%}.js-enabled .govuk-accordion__icon:after{height:100%}.js-enabled .govuk-accordion__section--expanded .govuk-accordion__icon:after{content:" ";display:none}.govuk-back-link{font-size:14px;font-size:.875rem;line-height:1.14286;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;position:relative;margin-top:15px;margin-bottom:15px;padding-left:14px}@media (min-width:40.0625em){.govuk-back-link{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-back-link{font-size:14pt;line-height:1.2;font-family:sans-serif}}.govuk-back-link:focus{outline:3px solid rgba(0,0,0,0);color:#0b0c0c;background-color:#fd0;box-shadow:0 -2px #fd0,0 4px #0b0c0c;text-decoration:none}.govuk-back-link:active,.govuk-back-link:focus,.govuk-back-link:hover,.govuk-back-link:link,.govuk-back-link:visited{color:#0b0c0c}@media print{.govuk-back-link:active,.govuk-back-link:focus,.govuk-back-link:hover,.govuk-back-link:link,.govuk-back-link:visited{color:#000}}.govuk-back-link[href]{border-bottom:1px solid #0b0c0c;text-decoration:none}.govuk-back-link[href]:focus{border-bottom-color:rgba(0,0,0,0)}.govuk-back-link:before{display:block;width:0;height:0;-webkit-clip-path:polygon(0 50%,100% 100%,100% 0);clip-path:polygon(0 50%,100% 100%,100% 0);border-color:rgba(0,0,0,0);border-style:solid;border-width:5px 6px 5px 0;border-right-color:inherit;content:"";position:absolute;top:0;bottom:0;left:0;margin:auto}.govuk-breadcrumbs{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:14px;font-size:.875rem;line-height:1.14286;color:#0b0c0c;margin-top:15px;margin-bottom:10px}@media print{.govuk-breadcrumbs{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-breadcrumbs{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-breadcrumbs{font-size:14pt;line-height:1.2;color:#000}}.govuk-breadcrumbs__list{margin:0;padding:0;list-style-type:none}.govuk-breadcrumbs__list:after{content:"";display:block;clear:both}.govuk-breadcrumbs__list-item{display:inline-block;position:relative;margin-bottom:5px;margin-left:10px;padding-left:15.655px;float:left}.govuk-breadcrumbs__list-item:before{content:"";display:block;position:absolute;top:0;bottom:0;left:-3.31px;width:7px;height:7px;margin:auto 0;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg);border:solid;border-width:1px 1px 0 0;border-color:#626a6e}.govuk-breadcrumbs__list-item:first-child{margin-left:0;padding-left:0}.govuk-breadcrumbs__list-item:first-child:before{content:none;display:none}.govuk-breadcrumbs__link{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@media print{.govuk-breadcrumbs__link{font-family:sans-serif}}.govuk-breadcrumbs__link:focus{outline:3px solid rgba(0,0,0,0);color:#0b0c0c;background-color:#fd0;box-shadow:0 -2px #fd0,0 4px #0b0c0c;text-decoration:none}.govuk-breadcrumbs__link:active,.govuk-breadcrumbs__link:focus,.govuk-breadcrumbs__link:hover,.govuk-breadcrumbs__link:link,.govuk-breadcrumbs__link:visited{color:#0b0c0c}@media print{.govuk-breadcrumbs__link:active,.govuk-breadcrumbs__link:focus,.govuk-breadcrumbs__link:hover,.govuk-breadcrumbs__link:link,.govuk-breadcrumbs__link:visited{color:#000}}.govuk-button{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.1875;box-sizing:border-box;display:inline-block;position:relative;width:100%;margin-top:0;margin-bottom:22px;padding:8px 10px 7px;border:2px solid rgba(0,0,0,0);border-radius:0;color:#fff;background-color:#00703c;box-shadow:0 2px 0 #002d18;text-align:center;vertical-align:top;cursor:pointer;-webkit-appearance:none}@media print{.govuk-button{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-button{font-size:19px;font-size:1.1875rem;line-height:1}}@media print{.govuk-button{font-size:14pt;line-height:19px}}@media (min-width:40.0625em){.govuk-button{margin-bottom:32px;width:auto}}.govuk-button:active,.govuk-button:hover,.govuk-button:link,.govuk-button:visited{color:#fff;text-decoration:none}.govuk-button::-moz-focus-inner{padding:0;border:0}.govuk-button:hover{background-color:#005a30}.govuk-button:active{top:2px}.govuk-button:focus{border-color:#fd0;outline:3px solid rgba(0,0,0,0);box-shadow:inset 0 0 0 1px #fd0}.govuk-button:focus:not(:active):not(:hover){border-color:#fd0;color:#0b0c0c;background-color:#fd0;box-shadow:0 2px 0 #0b0c0c}.govuk-button:before{content:"";display:block;position:absolute;top:-2px;right:-2px;bottom:-4px;left:-2px;background:rgba(0,0,0,0)}.govuk-button:active:before{top:-4px}.govuk-button--disabled,.govuk-button[disabled=disabled],.govuk-button[disabled]{opacity:.5}.govuk-button--disabled:hover,.govuk-button[disabled=disabled]:hover,.govuk-button[disabled]:hover{background-color:#00703c;cursor:default}.govuk-button--disabled:focus,.govuk-button[disabled=disabled]:focus,.govuk-button[disabled]:focus{outline:none}.govuk-button--disabled:active,.govuk-button[disabled=disabled]:active,.govuk-button[disabled]:active{top:0;box-shadow:0 2px 0 #002d18}.govuk-button--secondary{background-color:#f3f2f1;box-shadow:0 2px 0 #929191}.govuk-button--secondary,.govuk-button--secondary:active,.govuk-button--secondary:hover,.govuk-button--secondary:link,.govuk-button--secondary:visited{color:#0b0c0c}.govuk-button--secondary:hover{background-color:#dbdad9}.govuk-button--secondary:hover[disabled]{background-color:#f3f2f1}.govuk-button--warning{background-color:#d4351c;box-shadow:0 2px 0 #55150b}.govuk-button--warning,.govuk-button--warning:active,.govuk-button--warning:hover,.govuk-button--warning:link,.govuk-button--warning:visited{color:#fff}.govuk-button--warning:hover{background-color:#aa2a16}.govuk-button--warning:hover[disabled]{background-color:#d4351c}.govuk-button--start{font-weight:700;font-size:18px;font-size:1.125rem;line-height:1;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;min-height:auto;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}@media (min-width:40.0625em){.govuk-button--start{font-size:24px;font-size:1.5rem;line-height:1}}@media print{.govuk-button--start{font-size:18pt;line-height:1}}.govuk-button__start-icon{margin-left:5px;vertical-align:middle;-ms-flex-negative:0;flex-shrink:0;-ms-flex-item-align:center;align-self:center}@media (min-width:48.0625em){.govuk-button__start-icon{margin-left:10px}}.govuk-error-message{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:16px;font-size:1rem;line-height:1.25;display:block;margin-bottom:15px;clear:both;color:#d4351c}@media print{.govuk-error-message{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-error-message{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-error-message{font-size:14pt;line-height:1.15}}.govuk-fieldset{min-width:0;margin:0;padding:0;border:0}.govuk-fieldset:after{content:"";display:block;clear:both}@supports not (caret-color:auto){.govuk-fieldset,x:-moz-any-link{display:table-cell}}.govuk-fieldset__legend{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;color:#0b0c0c;box-sizing:border-box;display:table;max-width:100%;margin-bottom:10px;padding:0;white-space:normal}@media print{.govuk-fieldset__legend{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-fieldset__legend{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-fieldset__legend{font-size:14pt;line-height:1.15;color:#000}}.govuk-fieldset__legend--xl{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:32px;font-size:2rem;line-height:1.09375;margin-bottom:15px}@media print{.govuk-fieldset__legend--xl{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-fieldset__legend--xl{font-size:48px;font-size:3rem;line-height:1.04167}}@media print{.govuk-fieldset__legend--xl{font-size:32pt;line-height:1.15}}.govuk-fieldset__legend--l{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:24px;font-size:1.5rem;line-height:1.04167;margin-bottom:15px}@media print{.govuk-fieldset__legend--l{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-fieldset__legend--l{font-size:36px;font-size:2.25rem;line-height:1.11111}}@media print{.govuk-fieldset__legend--l{font-size:24pt;line-height:1.05}}.govuk-fieldset__legend--m{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:18px;font-size:1.125rem;line-height:1.11111;margin-bottom:15px}@media print{.govuk-fieldset__legend--m{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-fieldset__legend--m{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-fieldset__legend--m{font-size:18pt;line-height:1.15}}.govuk-fieldset__legend--s{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:16px;font-size:1rem;line-height:1.25}@media print{.govuk-fieldset__legend--s{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-fieldset__legend--s{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-fieldset__legend--s{font-size:14pt;line-height:1.15}}.govuk-fieldset__heading{margin:0;font-size:inherit;font-weight:inherit}.govuk-hint{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;display:block;margin-bottom:15px;color:#626a6e}@media print{.govuk-hint{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-hint{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-hint{font-size:14pt;line-height:1.15}}.govuk-label:not(.govuk-label--m):not(.govuk-label--l):not(.govuk-label--xl)+.govuk-hint{margin-bottom:10px}.govuk-fieldset__legend:not(.govuk-fieldset__legend--m):not(.govuk-fieldset__legend--l):not(.govuk-fieldset__legend--xl)+.govuk-hint{margin-bottom:10px}.govuk-fieldset__legend+.govuk-hint{margin-top:-5px}.govuk-label{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;color:#0b0c0c;display:block;margin-bottom:5px}@media print{.govuk-label{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-label{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-label{font-size:14pt;line-height:1.15;color:#000}}.govuk-label--xl{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:32px;font-size:2rem;line-height:1.09375;margin-bottom:15px}@media print{.govuk-label--xl{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-label--xl{font-size:48px;font-size:3rem;line-height:1.04167}}@media print{.govuk-label--xl{font-size:32pt;line-height:1.15}}.govuk-label--l{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:24px;font-size:1.5rem;line-height:1.04167;margin-bottom:15px}@media print{.govuk-label--l{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-label--l{font-size:36px;font-size:2.25rem;line-height:1.11111}}@media print{.govuk-label--l{font-size:24pt;line-height:1.05}}.govuk-label--m{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:18px;font-size:1.125rem;line-height:1.11111;margin-bottom:10px}@media print{.govuk-label--m{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-label--m{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-label--m{font-size:18pt;line-height:1.15}}.govuk-label--s{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:16px;font-size:1rem;line-height:1.25}@media print{.govuk-label--s{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-label--s{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-label--s{font-size:14pt;line-height:1.15}}.govuk-label-wrapper{margin:0}.govuk-checkboxes__item{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;display:block;position:relative;min-height:40px;margin-bottom:10px;padding-left:40px;clear:left}@media print{.govuk-checkboxes__item{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-checkboxes__item{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-checkboxes__item{font-size:14pt;line-height:1.15}}.govuk-checkboxes__item:last-child,.govuk-checkboxes__item:last-of-type{margin-bottom:0}.govuk-checkboxes__input{cursor:pointer;position:absolute;z-index:1;top:-2px;left:-2px;width:44px;height:44px;margin:0;opacity:0}.govuk-checkboxes__label{display:inline-block;margin-bottom:0;padding:8px 15px 5px;cursor:pointer;-ms-touch-action:manipulation;touch-action:manipulation}.govuk-checkboxes__label:before{content:"";box-sizing:border-box;position:absolute;top:0;left:0;width:40px;height:40px;border:2px solid;background:rgba(0,0,0,0)}.govuk-checkboxes__label:after{content:"";position:absolute;top:11px;left:9px;width:18px;height:7px;-webkit-transform:rotate(-45deg);-ms-transform:rotate(-45deg);transform:rotate(-45deg);border:solid;border-width:0 0 5px 5px;border-top-color:rgba(0,0,0,0);opacity:0;background:rgba(0,0,0,0)}.govuk-checkboxes__hint{display:block;padding-right:15px;padding-left:15px}.govuk-checkboxes__input:focus+.govuk-checkboxes__label:before{border-width:4px;box-shadow:0 0 0 3px #fd0}.govuk-checkboxes__input:checked+.govuk-checkboxes__label:after{opacity:1}.govuk-checkboxes__input:disabled,.govuk-checkboxes__input:disabled+.govuk-checkboxes__label{cursor:default}.govuk-checkboxes__input:disabled+.govuk-checkboxes__label{opacity:.5}.govuk-checkboxes__conditional{margin-bottom:15px;margin-left:18px;padding-left:33px;border-left:4px solid #b1b4b6}@media (min-width:40.0625em){.govuk-checkboxes__conditional{margin-bottom:20px}}.js-enabled .govuk-checkboxes__conditional--hidden{display:none}.govuk-checkboxes__conditional>:last-child{margin-bottom:0}.govuk-checkboxes--small .govuk-checkboxes__item{min-height:0;margin-bottom:0;padding-left:34px;float:left}.govuk-checkboxes--small .govuk-checkboxes__item:after{content:"";display:block;clear:both}.govuk-checkboxes--small .govuk-checkboxes__input{left:-10px}.govuk-checkboxes--small .govuk-checkboxes__label{margin-top:-2px;padding:13px 15px 13px 1px;float:left}@media (min-width:40.0625em){.govuk-checkboxes--small .govuk-checkboxes__label{padding:11px 15px 10px 1px}}.govuk-checkboxes--small .govuk-checkboxes__label:before{top:8px;width:24px;height:24px}.govuk-checkboxes--small .govuk-checkboxes__label:after{top:15px;left:6px;width:9px;height:3.5px;border-width:0 0 3px 3px}.govuk-checkboxes--small .govuk-checkboxes__hint{padding:0;clear:both}.govuk-checkboxes--small .govuk-checkboxes__conditional{margin-left:10px;padding-left:20px;clear:both}.govuk-checkboxes--small .govuk-checkboxes__item:hover .govuk-checkboxes__input:not(:disabled)+.govuk-checkboxes__label:before{box-shadow:0 0 0 10px #b1b4b6}.govuk-checkboxes--small .govuk-checkboxes__item:hover .govuk-checkboxes__input:focus+.govuk-checkboxes__label:before{box-shadow:0 0 0 3px #fd0,0 0 0 10px #b1b4b6}@media (hover:none),(pointer:coarse){.govuk-checkboxes--small .govuk-checkboxes__item:hover .govuk-checkboxes__input:not(:disabled)+.govuk-checkboxes__label:before{box-shadow:none}.govuk-checkboxes--small .govuk-checkboxes__item:hover .govuk-checkboxes__input:focus+.govuk-checkboxes__label:before{box-shadow:0 0 0 3px #fd0}}.govuk-character-count{margin-bottom:20px}@media (min-width:40.0625em){.govuk-character-count{margin-bottom:30px}}.govuk-character-count .govuk-form-group,.govuk-character-count .govuk-textarea{margin-bottom:5px}.govuk-character-count .govuk-textarea--error{padding:3px}.govuk-character-count__message{margin-top:0;margin-bottom:0}.govuk-character-count__message--disabled{visibility:hidden}.govuk-summary-list{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;color:#0b0c0c;margin:0 0 20px}@media print{.govuk-summary-list{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-summary-list{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-summary-list{font-size:14pt;line-height:1.15;color:#000}}@media (min-width:40.0625em){.govuk-summary-list{display:table;width:100%;table-layout:fixed;margin-bottom:30px}}@media (max-width:40.0525em){.govuk-summary-list__row{margin-bottom:15px;border-bottom:1px solid #b1b4b6}}@media (min-width:40.0625em){.govuk-summary-list__row{display:table-row}}.govuk-summary-list__actions,.govuk-summary-list__key,.govuk-summary-list__value{margin:0}@media (min-width:40.0625em){.govuk-summary-list__actions,.govuk-summary-list__key,.govuk-summary-list__value{display:table-cell;padding-right:20px;padding-top:10px;padding-bottom:10px;border-bottom:1px solid #b1b4b6}}.govuk-summary-list__actions{margin-bottom:15px}@media (min-width:40.0625em){.govuk-summary-list__actions{width:20%;padding-right:0;text-align:right}}.govuk-summary-list__key,.govuk-summary-list__value{word-wrap:break-word;overflow-wrap:break-word}.govuk-summary-list__key{margin-bottom:5px;font-weight:700}@media (min-width:40.0625em){.govuk-summary-list__key{width:30%}}@media (max-width:40.0525em){.govuk-summary-list__value{margin-bottom:15px}}@media (min-width:40.0625em){.govuk-summary-list__value{width:50%}}@media (min-width:40.0625em){.govuk-summary-list__value:last-child{width:70%}}.govuk-summary-list__value>p{margin-bottom:10px}.govuk-summary-list__value>:last-child{margin-bottom:0}.govuk-summary-list__actions-list{width:100%;margin:0;padding:0}.govuk-summary-list__actions-list-item{display:inline;margin-right:10px;padding-right:10px}.govuk-summary-list__actions-list-item:not(:last-child){border-right:1px solid #b1b4b6}.govuk-summary-list__actions-list-item:last-child{margin-right:0;padding-right:0;border:0}@media (max-width:40.0525em){.govuk-summary-list--no-border .govuk-summary-list__row{border:0}}@media (min-width:40.0625em){.govuk-summary-list--no-border .govuk-summary-list__actions,.govuk-summary-list--no-border .govuk-summary-list__key,.govuk-summary-list--no-border .govuk-summary-list__value{padding-bottom:11px;border:0}}@media (max-width:40.0525em){.govuk-summary-list__row--no-border{border:0}}@media (min-width:40.0625em){.govuk-summary-list__row--no-border .govuk-summary-list__actions,.govuk-summary-list__row--no-border .govuk-summary-list__key,.govuk-summary-list__row--no-border .govuk-summary-list__value{padding-bottom:11px;border:0}}.govuk-input{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;box-sizing:border-box;width:100%;height:40px;height:2.5rem;margin-top:0;padding:5px;border:2px solid #0b0c0c;border-radius:0;-webkit-appearance:none;-moz-appearance:none;appearance:none}@media print{.govuk-input{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-input{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-input{font-size:14pt;line-height:1.15}}.govuk-input:focus{outline:3px solid #fd0;outline-offset:0;box-shadow:inset 0 0 0 2px}.govuk-input::-webkit-inner-spin-button,.govuk-input::-webkit-outer-spin-button{margin:0;-webkit-appearance:none}.govuk-input[type=number]{-moz-appearance:textfield}.govuk-input--error{border:4px solid #d4351c}.govuk-input--error:focus{border-color:#0b0c0c;box-shadow:none}.govuk-input--width-30{max-width:59ex}.govuk-input--width-20{max-width:41ex}.govuk-input--width-10{max-width:23ex}.govuk-input--width-5{max-width:10.8ex}.govuk-input--width-4{max-width:9ex}.govuk-input--width-3{max-width:7.2ex}.govuk-input--width-2{max-width:5.4ex}.govuk-date-input{font-size:0}.govuk-date-input:after{content:"";display:block;clear:both}.govuk-date-input__item{display:inline-block;margin-right:20px;margin-bottom:0}.govuk-date-input__label{display:block}.govuk-date-input__input{margin-bottom:0}.govuk-details{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;color:#0b0c0c;margin-bottom:20px;display:block}@media print{.govuk-details{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-details{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-details{font-size:14pt;line-height:1.15;color:#000}}@media (min-width:40.0625em){.govuk-details{margin-bottom:30px}}.govuk-details__summary{display:inline-block;position:relative;margin-bottom:5px;padding-left:25px;color:#1d70b8;cursor:pointer}.govuk-details__summary:hover{color:#003078}.govuk-details__summary:focus{outline:3px solid rgba(0,0,0,0);color:#0b0c0c;background-color:#fd0;box-shadow:0 -2px #fd0,0 4px #0b0c0c;text-decoration:none}.govuk-details__summary-text{text-decoration:underline}.govuk-details__summary:focus .govuk-details__summary-text{text-decoration:none}.govuk-details__summary::-webkit-details-marker{display:none}.govuk-details__summary:before{content:"";position:absolute;top:-1px;bottom:0;left:0;margin:auto;display:block;width:0;height:0;-webkit-clip-path:polygon(0 0,100% 50%,0 100%);clip-path:polygon(0 0,100% 50%,0 100%);border-color:rgba(0,0,0,0);border-style:solid;border-width:7px 0 7px 12.124px;border-left-color:inherit}.govuk-details[open]>.govuk-details__summary:before{display:block;width:0;height:0;-webkit-clip-path:polygon(0 0,50% 100%,100% 0);clip-path:polygon(0 0,50% 100%,100% 0);border-color:rgba(0,0,0,0);border-style:solid;border-width:12.124px 7px 0;border-top-color:inherit}.govuk-details__text{padding:15px 15px 15px 20px;border-left:5px solid #b1b4b6}.govuk-details__text p{margin-top:0;margin-bottom:20px}.govuk-details__text>:last-child{margin-bottom:0}.govuk-error-summary{color:#0b0c0c;padding:15px;margin-bottom:30px;border:5px solid #d4351c}@media print{.govuk-error-summary{color:#000}}@media (min-width:40.0625em){.govuk-error-summary{padding:20px;margin-bottom:50px}}.govuk-error-summary:focus{outline:3px solid #fd0}.govuk-error-summary__title{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:18px;font-size:1.125rem;line-height:1.11111;margin-top:0;margin-bottom:15px}@media print{.govuk-error-summary__title{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-error-summary__title{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-error-summary__title{font-size:18pt;line-height:1.15}}@media (min-width:40.0625em){.govuk-error-summary__title{margin-bottom:20px}}.govuk-error-summary__body{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25}@media print{.govuk-error-summary__body{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-error-summary__body{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-error-summary__body{font-size:14pt;line-height:1.15}}.govuk-error-summary__body p{margin-top:0;margin-bottom:15px}@media (min-width:40.0625em){.govuk-error-summary__body p{margin-bottom:20px}}.govuk-error-summary__list{margin-top:0;margin-bottom:0}.govuk-error-summary__list a{font-weight:700}.govuk-error-summary__list a:active,.govuk-error-summary__list a:hover,.govuk-error-summary__list a:link,.govuk-error-summary__list a:visited{color:#d4351c}.govuk-error-summary__list a:focus{outline:3px solid rgba(0,0,0,0);color:#0b0c0c;background-color:#fd0;box-shadow:0 -2px #fd0,0 4px #0b0c0c;text-decoration:none}.govuk-file-upload{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;color:#0b0c0c;padding-top:5px;padding-bottom:5px}@media print{.govuk-file-upload{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-file-upload{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-file-upload{font-size:14pt;line-height:1.15;color:#000}}.govuk-file-upload:focus{margin-right:-5px;margin-left:-5px;padding-right:5px;padding-left:5px;outline:3px solid #fd0;box-shadow:inset 0 0 0 4px #0b0c0c}.govuk-file-upload:focus-within{margin-right:-5px;margin-left:-5px;padding-right:5px;padding-left:5px;outline:3px solid #fd0;box-shadow:inset 0 0 0 4px #0b0c0c}.govuk-file-upload--error{margin-right:-5px;margin-left:-5px;padding-right:5px;padding-left:5px;border:4px solid #d4351c}.govuk-file-upload--error:focus{border-color:#0b0c0c;box-shadow:none}.govuk-file-upload--error:focus-within{border-color:#0b0c0c;box-shadow:none}.govuk-footer{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:14px;font-size:.875rem;line-height:1.14286;padding-top:25px;padding-bottom:15px;border-top:1px solid #b1b4b6;color:#0b0c0c;background:#f3f2f1}@media print{.govuk-footer{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-footer{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-footer{font-size:14pt;line-height:1.2}}@media (min-width:40.0625em){.govuk-footer{padding-top:40px;padding-bottom:25px}}.govuk-footer__link:active,.govuk-footer__link:hover,.govuk-footer__link:link,.govuk-footer__link:visited{color:#0b0c0c}.govuk-footer__link:focus{outline:3px solid rgba(0,0,0,0);color:#0b0c0c;background-color:#fd0;box-shadow:0 -2px #fd0,0 4px #0b0c0c;text-decoration:none}.govuk-footer__section-break{margin:0 0 30px;border:0;border-bottom:1px solid #b1b4b6}@media (min-width:40.0625em){.govuk-footer__section-break{margin-bottom:50px}}.govuk-footer__meta{display:-webkit-box;display:-ms-flexbox;display:flex;margin-right:-15px;margin-left:-15px;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.govuk-footer__meta-item{margin-right:15px;margin-bottom:25px;margin-left:15px}.govuk-footer__meta-item--grow{-webkit-box-flex:1;-ms-flex:1;flex:1}@media (max-width:40.0525em){.govuk-footer__meta-item--grow{-ms-flex-preferred-size:320px;flex-basis:320px}}.govuk-footer__licence-logo{display:inline-block;margin-right:10px;vertical-align:top}@media (max-width:48.0525em){.govuk-footer__licence-logo{margin-bottom:15px}}.govuk-footer__licence-description{display:inline-block}.govuk-footer__copyright-logo{display:inline-block;min-width:125px;padding-top:112px;background-image:url(/assets/images/govuk-crest.png);background-repeat:no-repeat;background-position:50% 0;background-size:125px 102px;text-align:center;text-decoration:none;white-space:nowrap}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:2dppx),only screen and (min-resolution:192dpi){.govuk-footer__copyright-logo{background-image:url(/assets/images/govuk-crest-2x.png)}}.govuk-footer__inline-list{margin-top:0;margin-bottom:15px;padding:0}.govuk-footer__meta-custom{margin-bottom:20px}.govuk-footer__inline-list-item{display:inline-block;margin-right:15px;margin-bottom:5px}.govuk-footer__heading{margin-bottom:25px;padding-bottom:20px;border-bottom:1px solid #b1b4b6}@media (min-width:40.0625em){.govuk-footer__heading{margin-bottom:40px}}@media (max-width:40.0525em){.govuk-footer__heading{padding-bottom:10px}}.govuk-footer__navigation{display:-webkit-box;display:-ms-flexbox;display:flex;margin-right:-15px;margin-left:-15px;-ms-flex-wrap:wrap;flex-wrap:wrap}.govuk-footer__section{display:inline-block;margin-right:15px;margin-bottom:30px;margin-left:15px;vertical-align:top;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;-ms-flex-negative:1;flex-shrink:1}@media (max-width:48.0525em){.govuk-footer__section{-ms-flex-preferred-size:200px;flex-basis:200px}}@media (min-width:48.0625em){.govuk-footer__section:first-child:nth-last-child(2){-webkit-box-flex:2;-ms-flex-positive:2;flex-grow:2}}.govuk-footer__list{margin:0;padding:0;list-style:none;-webkit-column-gap:30px;-moz-column-gap:30px;column-gap:30px}@media (min-width:48.0625em){.govuk-footer__list--columns-2{-webkit-column-count:2;-moz-column-count:2;column-count:2}.govuk-footer__list--columns-3{-webkit-column-count:3;-moz-column-count:3;column-count:3}}.govuk-footer__list-item{margin-bottom:15px}@media (min-width:40.0625em){.govuk-footer__list-item{margin-bottom:20px}}.govuk-footer__list-item:last-child{margin-bottom:0}.govuk-header{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:14px;font-size:.875rem;line-height:1.14286;border-bottom:10px solid #fff;color:#fff;background:#0b0c0c}@media print{.govuk-header{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-header{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-header{font-size:14pt;line-height:1.2}}.govuk-header__container--full-width{padding:0 15px;border-color:#1d70b8}.govuk-header__container--full-width .govuk-header__menu-button{right:15px}.govuk-header__container{position:relative;margin-bottom:-10px;padding-top:10px;border-bottom:10px solid #1d70b8}.govuk-header__container:after{content:"";display:block;clear:both}.govuk-header__logotype{display:inline-block;margin-right:5px}.govuk-header__logotype-crown{position:relative;top:-1px;margin-right:1px;fill:currentColor;vertical-align:top}.govuk-header__logotype-crown-fallback-image{width:36px;height:32px;border:0;vertical-align:middle}.govuk-header__product-name{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1;display:inline-table;padding-right:10px}@media print{.govuk-header__product-name{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-header__product-name{font-size:24px;font-size:1.5rem;line-height:1}}@media print{.govuk-header__product-name{font-size:18pt;line-height:1}}.govuk-header__link{text-decoration:none}.govuk-header__link:link,.govuk-header__link:visited{color:#fff}.govuk-header__link:hover{text-decoration:underline}.govuk-header__link:focus{outline:3px solid rgba(0,0,0,0);color:#0b0c0c;background-color:#fd0;box-shadow:0 -2px #fd0,0 4px #0b0c0c;text-decoration:none}.govuk-header__link--homepage{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;display:inline-block;font-size:30px;line-height:1}@media print{.govuk-header__link--homepage{font-family:sans-serif}}.govuk-header__link--homepage:link,.govuk-header__link--homepage:visited{text-decoration:none}.govuk-header__link--homepage:active,.govuk-header__link--homepage:hover{margin-bottom:-1px;border-bottom:1px solid}.govuk-header__link--homepage:focus{margin-bottom:0;border-bottom:0}.govuk-header__link--service-name{display:inline-block;margin-bottom:10px;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:18px;font-size:1.125rem;line-height:1.11111}@media print{.govuk-header__link--service-name{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-header__link--service-name{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-header__link--service-name{font-size:18pt;line-height:1.15}}.govuk-header__content,.govuk-header__logo{box-sizing:border-box}.govuk-header__logo{margin-bottom:10px;padding-right:50px}@media (min-width:40.0625em){.govuk-header__logo{margin-bottom:10px}}@media (min-width:48.0625em){.govuk-header__logo{width:33.33%;padding-right:15px;float:left;vertical-align:top}}@media (min-width:48.0625em){.govuk-header__content{width:66.66%;padding-left:15px;float:left}}.govuk-header__menu-button{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:14px;font-size:.875rem;line-height:1.14286;display:none;position:absolute;top:20px;right:0;margin:0;padding:0;border:0;color:#fff;background:none}@media print{.govuk-header__menu-button{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-header__menu-button{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-header__menu-button{font-size:14pt;line-height:1.2}}.govuk-header__menu-button:hover{text-decoration:underline}.govuk-header__menu-button:focus{outline:3px solid rgba(0,0,0,0);color:#0b0c0c;background-color:#fd0;box-shadow:0 -2px #fd0,0 4px #0b0c0c;text-decoration:none}.govuk-header__menu-button:after{display:inline-block;width:0;height:0;-webkit-clip-path:polygon(0 0,50% 100%,100% 0);clip-path:polygon(0 0,50% 100%,100% 0);border-color:rgba(0,0,0,0);border-style:solid;border-width:8.66px 5px 0;border-top-color:inherit;content:"";margin-left:5px}@media (min-width:40.0625em){.govuk-header__menu-button{top:15px}}.govuk-header__menu-button--open:after{display:inline-block;width:0;height:0;-webkit-clip-path:polygon(50% 0,0 100%,100% 100%);clip-path:polygon(50% 0,0 100%,100% 100%);border-color:rgba(0,0,0,0);border-style:solid;border-width:0 5px 8.66px;border-bottom-color:inherit}.govuk-header__navigation{display:block;margin:0;padding:0;list-style:none}@media (min-width:40.0625em){.govuk-header__navigation{margin-bottom:10px}}.js-enabled .govuk-header__menu-button{display:block}@media (min-width:48.0625em){.js-enabled .govuk-header__menu-button{display:none}}.js-enabled .govuk-header__navigation{display:none}@media (min-width:48.0625em){.js-enabled .govuk-header__navigation{display:block}}.js-enabled .govuk-header__navigation--open{display:block}@media (min-width:48.0625em){.govuk-header__navigation--end{margin:0;padding:5px 0;text-align:right}}.govuk-header__navigation--no-service-name{padding-top:40px}.govuk-header__navigation-item{padding:10px 0;border-bottom:1px solid #2e3133}@media (min-width:48.0625em){.govuk-header__navigation-item{display:inline-block;margin-right:15px;padding:5px 0;border:0}}.govuk-header__navigation-item a{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:14px;font-size:.875rem;line-height:1.14286;white-space:nowrap}@media print{.govuk-header__navigation-item a{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-header__navigation-item a{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-header__navigation-item a{font-size:14pt;line-height:1.2}}.govuk-header__navigation-item--active a:hover,.govuk-header__navigation-item--active a:link,.govuk-header__navigation-item--active a:visited{color:#1d8feb}.govuk-header__navigation-item--active a:focus{color:#0b0c0c}.govuk-header__navigation-item:last-child{margin-right:0}@media print{.govuk-header{border-bottom-width:0;color:#0b0c0c;background:rgba(0,0,0,0)}.govuk-header__logotype-crown-fallback-image{display:none}.govuk-header__link:link,.govuk-header__link:visited{color:#0b0c0c}.govuk-header__link:after{display:none}}.govuk-inset-text{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;color:#0b0c0c;padding:15px;margin-top:20px;margin-bottom:20px;clear:both;border-left:10px solid #b1b4b6}@media print{.govuk-inset-text{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-inset-text{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-inset-text{font-size:14pt;line-height:1.15;color:#000}}@media (min-width:40.0625em){.govuk-inset-text{margin-top:30px;margin-bottom:30px}}.govuk-inset-text>:first-child{margin-top:0}.govuk-inset-text>:last-child,.govuk-inset-text>:only-child{margin-bottom:0}.govuk-panel{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;box-sizing:border-box;margin-bottom:15px;padding:35px;border:5px solid rgba(0,0,0,0);text-align:center}@media print{.govuk-panel{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-panel{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-panel{font-size:14pt;line-height:1.15}}@media (max-width:40.0525em){.govuk-panel{padding:25px}}.govuk-panel--confirmation{color:#fff;background:#00703c}.govuk-panel__title{margin-top:0;margin-bottom:30px;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:32px;font-size:2rem;line-height:1.09375}@media print{.govuk-panel__title{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-panel__title{font-size:48px;font-size:3rem;line-height:1.04167}}@media print{.govuk-panel__title{font-size:32pt;line-height:1.15}}.govuk-panel__title:last-child{margin-bottom:0}.govuk-panel__body{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:24px;font-size:1.5rem;line-height:1.04167}@media print{.govuk-panel__body{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-panel__body{font-size:36px;font-size:2.25rem;line-height:1.11111}}@media print{.govuk-panel__body{font-size:24pt;line-height:1.05}}.govuk-tag{display:inline-block;outline:2px solid rgba(0,0,0,0);outline-offset:-2px;color:#fff;background-color:#1d70b8;letter-spacing:1px;text-decoration:none;text-transform:uppercase;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:14px;font-size:.875rem;line-height:1;padding:5px 8px 4px}@media print{.govuk-tag{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-tag{font-size:16px;font-size:1rem;line-height:1}}@media print{.govuk-tag{font-size:14pt;line-height:1}}.govuk-tag--inactive{background-color:#626a6e}.govuk-phase-banner{padding-top:10px;padding-bottom:10px;border-bottom:1px solid #b1b4b6}.govuk-phase-banner__content{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:14px;font-size:.875rem;line-height:1.14286;color:#0b0c0c;display:table;margin:0}@media print{.govuk-phase-banner__content{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-phase-banner__content{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-phase-banner__content{font-size:14pt;line-height:1.2;color:#000}}.govuk-phase-banner__content__tag{margin-right:10px}.govuk-phase-banner__text{display:table-cell;vertical-align:baseline}.govuk-tabs{margin-top:5px;margin-bottom:20px}@media (min-width:40.0625em){.govuk-tabs{margin-top:5px;margin-bottom:30px}}.govuk-tabs__title{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;color:#0b0c0c;margin-bottom:10px}@media print{.govuk-tabs__title{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-tabs__title{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-tabs__title{font-size:14pt;line-height:1.15;color:#000}}.govuk-tabs__list{padding:0;list-style:none;margin:0 0 20px}@media (min-width:40.0625em){.govuk-tabs__list{margin-bottom:30px}}.govuk-tabs__list-item{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;margin-left:25px}@media print{.govuk-tabs__list-item{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-tabs__list-item{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-tabs__list-item{font-size:14pt;line-height:1.15}}.govuk-tabs__list-item:before{color:#0b0c0c;content:"\2014 ";margin-left:-25px;padding-right:5px}@media print{.govuk-tabs__list-item:before{color:#000}}.govuk-tabs__tab{display:inline-block;margin-bottom:10px}.govuk-tabs__tab:link{color:#1d70b8}.govuk-tabs__tab:visited{color:#4c2c92}.govuk-tabs__tab:hover{color:#003078}.govuk-tabs__tab:active{color:#0b0c0c}.govuk-tabs__tab:focus{outline:3px solid rgba(0,0,0,0);color:#0b0c0c;background-color:#fd0;box-shadow:0 -2px #fd0,0 4px #0b0c0c;text-decoration:none}.govuk-tabs__panel{margin-bottom:30px}@media (min-width:40.0625em){.govuk-tabs__panel{margin-bottom:50px}}@media (min-width:40.0625em){.js-enabled .govuk-tabs__list{margin-bottom:0;border-bottom:1px solid #b1b4b6}.js-enabled .govuk-tabs__list:after{content:"";display:block;clear:both}.js-enabled .govuk-tabs__title{display:none}.js-enabled .govuk-tabs__list-item{position:relative;margin-right:5px;margin-bottom:0;margin-left:0;padding:10px 20px;float:left;background-color:#f3f2f1;text-align:center}.js-enabled .govuk-tabs__list-item:before{content:none}.js-enabled .govuk-tabs__list-item--selected{position:relative;margin-top:-5px;margin-bottom:-1px;padding:14px 19px 16px;border:1px solid #b1b4b6;border-bottom:0;background-color:#fff}.js-enabled .govuk-tabs__list-item--selected .govuk-tabs__tab{text-decoration:none}.js-enabled .govuk-tabs__tab{margin-bottom:0}.js-enabled .govuk-tabs__tab:active,.js-enabled .govuk-tabs__tab:focus,.js-enabled .govuk-tabs__tab:hover,.js-enabled .govuk-tabs__tab:link,.js-enabled .govuk-tabs__tab:visited{color:#0b0c0c}}@media print and (min-width:40.0625em){.js-enabled .govuk-tabs__tab:active,.js-enabled .govuk-tabs__tab:focus,.js-enabled .govuk-tabs__tab:hover,.js-enabled .govuk-tabs__tab:link,.js-enabled .govuk-tabs__tab:visited{color:#000}}@media (min-width:40.0625em){.js-enabled .govuk-tabs__tab:after{content:"";position:absolute;top:0;right:0;bottom:0;left:0}.js-enabled .govuk-tabs__panel{margin-bottom:0;padding:30px 20px;border:1px solid #b1b4b6;border-top:0}}@media (min-width:40.0625em) and (min-width:40.0625em){.js-enabled .govuk-tabs__panel{margin-bottom:0}}@media (min-width:40.0625em){.js-enabled .govuk-tabs__panel>:last-child{margin-bottom:0}.js-enabled .govuk-tabs__panel--hidden{display:none}}.govuk-radios__item{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;display:block;position:relative;min-height:40px;margin-bottom:10px;padding-left:40px;clear:left}@media print{.govuk-radios__item{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-radios__item{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-radios__item{font-size:14pt;line-height:1.15}}.govuk-radios__item:last-child,.govuk-radios__item:last-of-type{margin-bottom:0}.govuk-radios__input{cursor:pointer;position:absolute;z-index:1;top:-2px;left:-2px;width:44px;height:44px;margin:0;opacity:0}.govuk-radios__label{display:inline-block;margin-bottom:0;padding:8px 15px 5px;cursor:pointer;-ms-touch-action:manipulation;touch-action:manipulation}.govuk-radios__label:before{content:"";box-sizing:border-box;position:absolute;top:0;left:0;width:40px;height:40px;border:2px solid;border-radius:50%;background:rgba(0,0,0,0)}.govuk-radios__label:after{content:"";position:absolute;top:10px;left:10px;width:0;height:0;border:10px solid;border-radius:50%;opacity:0;background:currentColor}.govuk-radios__hint{display:block;padding-right:15px;padding-left:15px}.govuk-radios__input:focus+.govuk-radios__label:before{border-width:4px;box-shadow:0 0 0 4px #fd0}.govuk-radios__input:checked+.govuk-radios__label:after{opacity:1}.govuk-radios__input:disabled,.govuk-radios__input:disabled+.govuk-radios__label{cursor:default}.govuk-radios__input:disabled+.govuk-radios__label{opacity:.5}@media (min-width:40.0625em){.govuk-radios--inline:after{content:"";display:block;clear:both}.govuk-radios--inline .govuk-radios__item{margin-right:20px;float:left;clear:none}}.govuk-radios--inline.govuk-radios--conditional .govuk-radios__item{margin-right:0;float:none}.govuk-radios__divider{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;color:#0b0c0c;width:40px;margin-bottom:10px;text-align:center}@media print{.govuk-radios__divider{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-radios__divider{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-radios__divider{font-size:14pt;line-height:1.15;color:#000}}.govuk-radios__conditional{margin-bottom:15px;margin-left:18px;padding-left:33px;border-left:4px solid #b1b4b6}@media (min-width:40.0625em){.govuk-radios__conditional{margin-bottom:20px}}.js-enabled .govuk-radios__conditional--hidden{display:none}.govuk-radios__conditional>:last-child{margin-bottom:0}.govuk-radios--small .govuk-radios__item{min-height:0;margin-bottom:0;padding-left:34px;float:left}.govuk-radios--small .govuk-radios__item:after{content:"";display:block;clear:both}.govuk-radios--small .govuk-radios__input{left:-10px}.govuk-radios--small .govuk-radios__label{margin-top:-2px;padding:13px 15px 13px 1px;float:left}@media (min-width:40.0625em){.govuk-radios--small .govuk-radios__label{padding:11px 15px 10px 1px}}.govuk-radios--small .govuk-radios__label:before{top:8px;width:24px;height:24px}.govuk-radios--small .govuk-radios__label:after{top:15px;left:7px;border-width:5px}.govuk-radios--small .govuk-radios__hint{padding:0;clear:both;pointer-events:none}.govuk-radios--small .govuk-radios__conditional{margin-left:10px;padding-left:20px;clear:both}.govuk-radios--small .govuk-radios__divider{width:24px;margin-bottom:5px}.govuk-radios--small .govuk-radios__item:hover .govuk-radios__input:not(:disabled)+.govuk-radios__label:before{box-shadow:0 0 0 10px #b1b4b6}.govuk-radios--small .govuk-radios__item:hover .govuk-radios__input:focus+.govuk-radios__label:before{box-shadow:0 0 0 4px #fd0,0 0 0 10px #b1b4b6}@media (hover:none),(pointer:coarse){.govuk-radios--small .govuk-radios__item:hover .govuk-radios__input:not(:disabled)+.govuk-radios__label:before{box-shadow:none}.govuk-radios--small .govuk-radios__item:hover .govuk-radios__input:focus+.govuk-radios__label:before{box-shadow:0 0 0 4px #fd0}}.govuk-select{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;box-sizing:border-box;max-width:100%;height:40px;height:2.5rem;padding:5px;border:2px solid #0b0c0c}@media print{.govuk-select{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-select{font-size:19px;font-size:1.1875rem;line-height:1.25}}@media print{.govuk-select{font-size:14pt;line-height:1.25}}.govuk-select:focus{outline:3px solid #fd0;outline-offset:0;box-shadow:inset 0 0 0 2px}.govuk-select:focus::-ms-value,.govuk-select option:active,.govuk-select option:checked{color:#fff;background-color:#1d70b8}.govuk-select--error{border:4px solid #d4351c}.govuk-select--error:focus{border-color:#0b0c0c;box-shadow:none}.govuk-skip-link{position:absolute!important;width:1px!important;height:1px!important;margin:0!important;overflow:hidden!important;clip:rect(0 0 0 0)!important;-webkit-clip-path:inset(50%)!important;clip-path:inset(50%)!important;white-space:nowrap!important;font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-size:14px;font-size:.875rem;line-height:1.14286;display:block;padding:10px 15px}.govuk-skip-link:active,.govuk-skip-link:focus{position:static!important;width:auto!important;height:auto!important;margin:inherit!important;overflow:visible!important;clip:auto!important;-webkit-clip-path:none!important;clip-path:none!important;white-space:inherit!important}@media print{.govuk-skip-link{font-family:sans-serif}}.govuk-skip-link:active,.govuk-skip-link:focus,.govuk-skip-link:hover,.govuk-skip-link:link,.govuk-skip-link:visited{color:#0b0c0c}@media print{.govuk-skip-link:active,.govuk-skip-link:focus,.govuk-skip-link:hover,.govuk-skip-link:link,.govuk-skip-link:visited{color:#000}}@media (min-width:40.0625em){.govuk-skip-link{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-skip-link{font-size:14pt;line-height:1.2}}@supports (padding:max(calc(0px))){.govuk-skip-link{padding-right:max(15px,calc(15px + env(safe-area-inset-right)));padding-left:max(15px,calc(15px + env(safe-area-inset-left)))}}.govuk-skip-link:focus{outline:3px solid #fd0;background-color:#fd0}.govuk-table{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;color:#0b0c0c;width:100%;margin-bottom:20px;border-spacing:0;border-collapse:collapse}@media print{.govuk-table{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-table{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-table{font-size:14pt;line-height:1.15;color:#000}}@media (min-width:40.0625em){.govuk-table{margin-bottom:30px}}.govuk-table__header{font-weight:700}.govuk-table__cell,.govuk-table__header{padding:10px 20px 10px 0;border-bottom:1px solid #b1b4b6;text-align:left;vertical-align:top}.govuk-table__cell--numeric{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-font-feature-settings:"tnum" 1;font-feature-settings:"tnum" 1;font-weight:400}@media print{.govuk-table__cell--numeric{font-family:sans-serif}}@supports (font-variant-numeric:tabular-nums){.govuk-table__cell--numeric{-webkit-font-feature-settings:normal;font-feature-settings:normal;font-variant-numeric:tabular-nums}}.govuk-table__cell--numeric,.govuk-table__header--numeric{text-align:right}.govuk-table__cell:last-child,.govuk-table__header:last-child{padding-right:0}.govuk-table__caption{font-weight:700;display:table-caption;text-align:left}.govuk-textarea{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;box-sizing:border-box;display:block;width:100%;min-height:40px;margin-bottom:20px;padding:5px;resize:vertical;border:2px solid #0b0c0c;border-radius:0;-webkit-appearance:none}@media print{.govuk-textarea{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-textarea{font-size:19px;font-size:1.1875rem;line-height:1.25}}@media print{.govuk-textarea{font-size:14pt;line-height:1.25}}@media (min-width:40.0625em){.govuk-textarea{margin-bottom:30px}}.govuk-textarea:focus{outline:3px solid #fd0;outline-offset:0;box-shadow:inset 0 0 0 2px}.govuk-textarea--error{border:4px solid #d4351c}.govuk-textarea--error:focus{border-color:#0b0c0c;box-shadow:none}.govuk-warning-text{position:relative;margin-bottom:20px;padding:10px 0}@media (min-width:40.0625em){.govuk-warning-text{margin-bottom:30px}}.govuk-warning-text__assistive{position:absolute!important;width:1px!important;height:1px!important;margin:0!important;padding:0!important;overflow:hidden!important;clip:rect(0 0 0 0)!important;-webkit-clip-path:inset(50%)!important;clip-path:inset(50%)!important;border:0!important;white-space:nowrap!important}.govuk-warning-text__icon{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;display:inline-block;position:absolute;left:0;min-width:29px;min-height:29px;margin-top:-7px;border:3px solid #0b0c0c;border-radius:50%;color:#fff;background:#0b0c0c;font-size:30px;line-height:29px;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}@media print{.govuk-warning-text__icon{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-warning-text__icon{margin-top:-5px}}.govuk-warning-text__text{font-family:GDS Transport,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:16px;font-size:1rem;line-height:1.25;color:#0b0c0c;display:block;padding-left:45px}@media print{.govuk-warning-text__text{font-family:sans-serif}}@media (min-width:40.0625em){.govuk-warning-text__text{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-warning-text__text{font-size:14pt;line-height:1.15;color:#000}}.govuk-clearfix:after{content:"";display:block;clear:both}.govuk-visually-hidden{padding:0!important;border:0!important}.govuk-visually-hidden,.govuk-visually-hidden-focusable{position:absolute!important;width:1px!important;height:1px!important;margin:0!important;overflow:hidden!important;clip:rect(0 0 0 0)!important;-webkit-clip-path:inset(50%)!important;clip-path:inset(50%)!important;white-space:nowrap!important}.govuk-visually-hidden-focusable:active,.govuk-visually-hidden-focusable:focus{position:static!important;width:auto!important;height:auto!important;margin:inherit!important;overflow:visible!important;clip:auto!important;-webkit-clip-path:none!important;clip-path:none!important;white-space:inherit!important}.govuk-\!-display-inline{display:inline!important}.govuk-\!-display-inline-block{display:inline-block!important}.govuk-\!-display-block{display:block!important}.govuk-\!-display-none{display:none!important}.govuk-\!-margin-0{margin:0!important}@media (min-width:40.0625em){.govuk-\!-margin-0{margin:0!important}}.govuk-\!-margin-top-0{margin-top:0!important}@media (min-width:40.0625em){.govuk-\!-margin-top-0{margin-top:0!important}}.govuk-\!-margin-right-0{margin-right:0!important}@media (min-width:40.0625em){.govuk-\!-margin-right-0{margin-right:0!important}}.govuk-\!-margin-bottom-0{margin-bottom:0!important}@media (min-width:40.0625em){.govuk-\!-margin-bottom-0{margin-bottom:0!important}}.govuk-\!-margin-left-0{margin-left:0!important}@media (min-width:40.0625em){.govuk-\!-margin-left-0{margin-left:0!important}}.govuk-\!-margin-1{margin:5px!important}@media (min-width:40.0625em){.govuk-\!-margin-1{margin:5px!important}}.govuk-\!-margin-top-1{margin-top:5px!important}@media (min-width:40.0625em){.govuk-\!-margin-top-1{margin-top:5px!important}}.govuk-\!-margin-right-1{margin-right:5px!important}@media (min-width:40.0625em){.govuk-\!-margin-right-1{margin-right:5px!important}}.govuk-\!-margin-bottom-1{margin-bottom:5px!important}@media (min-width:40.0625em){.govuk-\!-margin-bottom-1{margin-bottom:5px!important}}.govuk-\!-margin-left-1{margin-left:5px!important}@media (min-width:40.0625em){.govuk-\!-margin-left-1{margin-left:5px!important}}.govuk-\!-margin-2{margin:10px!important}@media (min-width:40.0625em){.govuk-\!-margin-2{margin:10px!important}}.govuk-\!-margin-top-2{margin-top:10px!important}@media (min-width:40.0625em){.govuk-\!-margin-top-2{margin-top:10px!important}}.govuk-\!-margin-right-2{margin-right:10px!important}@media (min-width:40.0625em){.govuk-\!-margin-right-2{margin-right:10px!important}}.govuk-\!-margin-bottom-2{margin-bottom:10px!important}@media (min-width:40.0625em){.govuk-\!-margin-bottom-2{margin-bottom:10px!important}}.govuk-\!-margin-left-2{margin-left:10px!important}@media (min-width:40.0625em){.govuk-\!-margin-left-2{margin-left:10px!important}}.govuk-\!-margin-3{margin:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-3{margin:15px!important}}.govuk-\!-margin-top-3{margin-top:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-top-3{margin-top:15px!important}}.govuk-\!-margin-right-3{margin-right:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-right-3{margin-right:15px!important}}.govuk-\!-margin-bottom-3{margin-bottom:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-bottom-3{margin-bottom:15px!important}}.govuk-\!-margin-left-3{margin-left:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-left-3{margin-left:15px!important}}.govuk-\!-margin-4{margin:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-4{margin:20px!important}}.govuk-\!-margin-top-4{margin-top:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-top-4{margin-top:20px!important}}.govuk-\!-margin-right-4{margin-right:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-right-4{margin-right:20px!important}}.govuk-\!-margin-bottom-4{margin-bottom:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-bottom-4{margin-bottom:20px!important}}.govuk-\!-margin-left-4{margin-left:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-left-4{margin-left:20px!important}}.govuk-\!-margin-5{margin:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-5{margin:25px!important}}.govuk-\!-margin-top-5{margin-top:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-top-5{margin-top:25px!important}}.govuk-\!-margin-right-5{margin-right:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-right-5{margin-right:25px!important}}.govuk-\!-margin-bottom-5{margin-bottom:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-bottom-5{margin-bottom:25px!important}}.govuk-\!-margin-left-5{margin-left:15px!important}@media (min-width:40.0625em){.govuk-\!-margin-left-5{margin-left:25px!important}}.govuk-\!-margin-6{margin:20px!important}@media (min-width:40.0625em){.govuk-\!-margin-6{margin:30px!important}}.govuk-\!-margin-top-6{margin-top:20px!important}@media (min-width:40.0625em){.govuk-\!-margin-top-6{margin-top:30px!important}}.govuk-\!-margin-right-6{margin-right:20px!important}@media (min-width:40.0625em){.govuk-\!-margin-right-6{margin-right:30px!important}}.govuk-\!-margin-bottom-6{margin-bottom:20px!important}@media (min-width:40.0625em){.govuk-\!-margin-bottom-6{margin-bottom:30px!important}}.govuk-\!-margin-left-6{margin-left:20px!important}@media (min-width:40.0625em){.govuk-\!-margin-left-6{margin-left:30px!important}}.govuk-\!-margin-7{margin:25px!important}@media (min-width:40.0625em){.govuk-\!-margin-7{margin:40px!important}}.govuk-\!-margin-top-7{margin-top:25px!important}@media (min-width:40.0625em){.govuk-\!-margin-top-7{margin-top:40px!important}}.govuk-\!-margin-right-7{margin-right:25px!important}@media (min-width:40.0625em){.govuk-\!-margin-right-7{margin-right:40px!important}}.govuk-\!-margin-bottom-7{margin-bottom:25px!important}@media (min-width:40.0625em){.govuk-\!-margin-bottom-7{margin-bottom:40px!important}}.govuk-\!-margin-left-7{margin-left:25px!important}@media (min-width:40.0625em){.govuk-\!-margin-left-7{margin-left:40px!important}}.govuk-\!-margin-8{margin:30px!important}@media (min-width:40.0625em){.govuk-\!-margin-8{margin:50px!important}}.govuk-\!-margin-top-8{margin-top:30px!important}@media (min-width:40.0625em){.govuk-\!-margin-top-8{margin-top:50px!important}}.govuk-\!-margin-right-8{margin-right:30px!important}@media (min-width:40.0625em){.govuk-\!-margin-right-8{margin-right:50px!important}}.govuk-\!-margin-bottom-8{margin-bottom:30px!important}@media (min-width:40.0625em){.govuk-\!-margin-bottom-8{margin-bottom:50px!important}}.govuk-\!-margin-left-8{margin-left:30px!important}@media (min-width:40.0625em){.govuk-\!-margin-left-8{margin-left:50px!important}}.govuk-\!-margin-9{margin:40px!important}@media (min-width:40.0625em){.govuk-\!-margin-9{margin:60px!important}}.govuk-\!-margin-top-9{margin-top:40px!important}@media (min-width:40.0625em){.govuk-\!-margin-top-9{margin-top:60px!important}}.govuk-\!-margin-right-9{margin-right:40px!important}@media (min-width:40.0625em){.govuk-\!-margin-right-9{margin-right:60px!important}}.govuk-\!-margin-bottom-9{margin-bottom:40px!important}@media (min-width:40.0625em){.govuk-\!-margin-bottom-9{margin-bottom:60px!important}}.govuk-\!-margin-left-9{margin-left:40px!important}@media (min-width:40.0625em){.govuk-\!-margin-left-9{margin-left:60px!important}}.govuk-\!-padding-0{padding:0!important}@media (min-width:40.0625em){.govuk-\!-padding-0{padding:0!important}}.govuk-\!-padding-top-0{padding-top:0!important}@media (min-width:40.0625em){.govuk-\!-padding-top-0{padding-top:0!important}}.govuk-\!-padding-right-0{padding-right:0!important}@media (min-width:40.0625em){.govuk-\!-padding-right-0{padding-right:0!important}}.govuk-\!-padding-bottom-0{padding-bottom:0!important}@media (min-width:40.0625em){.govuk-\!-padding-bottom-0{padding-bottom:0!important}}.govuk-\!-padding-left-0{padding-left:0!important}@media (min-width:40.0625em){.govuk-\!-padding-left-0{padding-left:0!important}}.govuk-\!-padding-1{padding:5px!important}@media (min-width:40.0625em){.govuk-\!-padding-1{padding:5px!important}}.govuk-\!-padding-top-1{padding-top:5px!important}@media (min-width:40.0625em){.govuk-\!-padding-top-1{padding-top:5px!important}}.govuk-\!-padding-right-1{padding-right:5px!important}@media (min-width:40.0625em){.govuk-\!-padding-right-1{padding-right:5px!important}}.govuk-\!-padding-bottom-1{padding-bottom:5px!important}@media (min-width:40.0625em){.govuk-\!-padding-bottom-1{padding-bottom:5px!important}}.govuk-\!-padding-left-1{padding-left:5px!important}@media (min-width:40.0625em){.govuk-\!-padding-left-1{padding-left:5px!important}}.govuk-\!-padding-2{padding:10px!important}@media (min-width:40.0625em){.govuk-\!-padding-2{padding:10px!important}}.govuk-\!-padding-top-2{padding-top:10px!important}@media (min-width:40.0625em){.govuk-\!-padding-top-2{padding-top:10px!important}}.govuk-\!-padding-right-2{padding-right:10px!important}@media (min-width:40.0625em){.govuk-\!-padding-right-2{padding-right:10px!important}}.govuk-\!-padding-bottom-2{padding-bottom:10px!important}@media (min-width:40.0625em){.govuk-\!-padding-bottom-2{padding-bottom:10px!important}}.govuk-\!-padding-left-2{padding-left:10px!important}@media (min-width:40.0625em){.govuk-\!-padding-left-2{padding-left:10px!important}}.govuk-\!-padding-3{padding:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-3{padding:15px!important}}.govuk-\!-padding-top-3{padding-top:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-top-3{padding-top:15px!important}}.govuk-\!-padding-right-3{padding-right:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-right-3{padding-right:15px!important}}.govuk-\!-padding-bottom-3{padding-bottom:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-bottom-3{padding-bottom:15px!important}}.govuk-\!-padding-left-3{padding-left:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-left-3{padding-left:15px!important}}.govuk-\!-padding-4{padding:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-4{padding:20px!important}}.govuk-\!-padding-top-4{padding-top:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-top-4{padding-top:20px!important}}.govuk-\!-padding-right-4{padding-right:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-right-4{padding-right:20px!important}}.govuk-\!-padding-bottom-4{padding-bottom:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-bottom-4{padding-bottom:20px!important}}.govuk-\!-padding-left-4{padding-left:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-left-4{padding-left:20px!important}}.govuk-\!-padding-5{padding:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-5{padding:25px!important}}.govuk-\!-padding-top-5{padding-top:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-top-5{padding-top:25px!important}}.govuk-\!-padding-right-5{padding-right:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-right-5{padding-right:25px!important}}.govuk-\!-padding-bottom-5{padding-bottom:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-bottom-5{padding-bottom:25px!important}}.govuk-\!-padding-left-5{padding-left:15px!important}@media (min-width:40.0625em){.govuk-\!-padding-left-5{padding-left:25px!important}}.govuk-\!-padding-6{padding:20px!important}@media (min-width:40.0625em){.govuk-\!-padding-6{padding:30px!important}}.govuk-\!-padding-top-6{padding-top:20px!important}@media (min-width:40.0625em){.govuk-\!-padding-top-6{padding-top:30px!important}}.govuk-\!-padding-right-6{padding-right:20px!important}@media (min-width:40.0625em){.govuk-\!-padding-right-6{padding-right:30px!important}}.govuk-\!-padding-bottom-6{padding-bottom:20px!important}@media (min-width:40.0625em){.govuk-\!-padding-bottom-6{padding-bottom:30px!important}}.govuk-\!-padding-left-6{padding-left:20px!important}@media (min-width:40.0625em){.govuk-\!-padding-left-6{padding-left:30px!important}}.govuk-\!-padding-7{padding:25px!important}@media (min-width:40.0625em){.govuk-\!-padding-7{padding:40px!important}}.govuk-\!-padding-top-7{padding-top:25px!important}@media (min-width:40.0625em){.govuk-\!-padding-top-7{padding-top:40px!important}}.govuk-\!-padding-right-7{padding-right:25px!important}@media (min-width:40.0625em){.govuk-\!-padding-right-7{padding-right:40px!important}}.govuk-\!-padding-bottom-7{padding-bottom:25px!important}@media (min-width:40.0625em){.govuk-\!-padding-bottom-7{padding-bottom:40px!important}}.govuk-\!-padding-left-7{padding-left:25px!important}@media (min-width:40.0625em){.govuk-\!-padding-left-7{padding-left:40px!important}}.govuk-\!-padding-8{padding:30px!important}@media (min-width:40.0625em){.govuk-\!-padding-8{padding:50px!important}}.govuk-\!-padding-top-8{padding-top:30px!important}@media (min-width:40.0625em){.govuk-\!-padding-top-8{padding-top:50px!important}}.govuk-\!-padding-right-8{padding-right:30px!important}@media (min-width:40.0625em){.govuk-\!-padding-right-8{padding-right:50px!important}}.govuk-\!-padding-bottom-8{padding-bottom:30px!important}@media (min-width:40.0625em){.govuk-\!-padding-bottom-8{padding-bottom:50px!important}}.govuk-\!-padding-left-8{padding-left:30px!important}@media (min-width:40.0625em){.govuk-\!-padding-left-8{padding-left:50px!important}}.govuk-\!-padding-9{padding:40px!important}@media (min-width:40.0625em){.govuk-\!-padding-9{padding:60px!important}}.govuk-\!-padding-top-9{padding-top:40px!important}@media (min-width:40.0625em){.govuk-\!-padding-top-9{padding-top:60px!important}}.govuk-\!-padding-right-9{padding-right:40px!important}@media (min-width:40.0625em){.govuk-\!-padding-right-9{padding-right:60px!important}}.govuk-\!-padding-bottom-9{padding-bottom:40px!important}@media (min-width:40.0625em){.govuk-\!-padding-bottom-9{padding-bottom:60px!important}}.govuk-\!-padding-left-9{padding-left:40px!important}@media (min-width:40.0625em){.govuk-\!-padding-left-9{padding-left:60px!important}}.govuk-\!-font-size-80{font-size:53px!important;font-size:3.3125rem!important;line-height:1.03774!important}@media (min-width:40.0625em){.govuk-\!-font-size-80{font-size:80px!important;font-size:5rem!important;line-height:1!important}}@media print{.govuk-\!-font-size-80{font-size:53pt!important;line-height:1.1!important}}.govuk-\!-font-size-48{font-size:32px!important;font-size:2rem!important;line-height:1.09375!important}@media (min-width:40.0625em){.govuk-\!-font-size-48{font-size:48px!important;font-size:3rem!important;line-height:1.04167!important}}@media print{.govuk-\!-font-size-48{font-size:32pt!important;line-height:1.15!important}}.govuk-\!-font-size-36{font-size:24px!important;font-size:1.5rem!important;line-height:1.04167!important}@media (min-width:40.0625em){.govuk-\!-font-size-36{font-size:36px!important;font-size:2.25rem!important;line-height:1.11111!important}}@media print{.govuk-\!-font-size-36{font-size:24pt!important;line-height:1.05!important}}.govuk-\!-font-size-27{font-size:18px!important;font-size:1.125rem!important;line-height:1.11111!important}@media (min-width:40.0625em){.govuk-\!-font-size-27{font-size:27px!important;font-size:1.6875rem!important;line-height:1.11111!important}}@media print{.govuk-\!-font-size-27{font-size:18pt!important;line-height:1.15!important}}.govuk-\!-font-size-24{font-size:18px!important;font-size:1.125rem!important;line-height:1.11111!important}@media (min-width:40.0625em){.govuk-\!-font-size-24{font-size:24px!important;font-size:1.5rem!important;line-height:1.25!important}}@media print{.govuk-\!-font-size-24{font-size:18pt!important;line-height:1.15!important}}.govuk-\!-font-size-19{font-size:16px!important;font-size:1rem!important;line-height:1.25!important}@media (min-width:40.0625em){.govuk-\!-font-size-19{font-size:19px!important;font-size:1.1875rem!important;line-height:1.31579!important}}@media print{.govuk-\!-font-size-19{font-size:14pt!important;line-height:1.15!important}}.govuk-\!-font-size-16{font-size:14px!important;font-size:.875rem!important;line-height:1.14286!important}@media (min-width:40.0625em){.govuk-\!-font-size-16{font-size:16px!important;font-size:1rem!important;line-height:1.25!important}}@media print{.govuk-\!-font-size-16{font-size:14pt!important;line-height:1.2!important}}.govuk-\!-font-size-14{font-size:12px!important;font-size:.75rem!important;line-height:1.25!important}@media (min-width:40.0625em){.govuk-\!-font-size-14{font-size:14px!important;font-size:.875rem!important;line-height:1.42857!important}}@media print{.govuk-\!-font-size-14{font-size:12pt!important;line-height:1.2!important}}.govuk-\!-font-weight-regular{font-weight:400!important}.govuk-\!-font-weight-bold{font-weight:700!important}.govuk-\!-width-full,.govuk-\!-width-three-quarters{width:100%!important}@media (min-width:40.0625em){.govuk-\!-width-three-quarters{width:75%!important}}.govuk-\!-width-two-thirds{width:100%!important}@media (min-width:40.0625em){.govuk-\!-width-two-thirds{width:66.66%!important}}.govuk-\!-width-one-half{width:100%!important}@media (min-width:40.0625em){.govuk-\!-width-one-half{width:50%!important}}.govuk-\!-width-one-third{width:100%!important}@media (min-width:40.0625em){.govuk-\!-width-one-third{width:33.33%!important}}.govuk-\!-width-one-quarter{width:100%!important}@media (min-width:40.0625em){.govuk-\!-width-one-quarter{width:25%!important}}
\ No newline at end of file
-- 
cgit v1.2.3


From dbde76a5090e772c806bd189426ee078b9b7e4ba Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 29 Jun 2020 16:07:52 +0100
Subject: [Bromley] Add waste reporting service.

This creates a non-map property-based reporting flow for reporting
missed collections and requesting new containers. Such reports are
always private, in categories that are hidden from the map filters
and never shown on .com.
---
 perllib/FixMyStreet/App/Controller/Report/New.pm |   2 +-
 perllib/FixMyStreet/App/Controller/Waste.pm      | 263 +++++++++++++++++++++++
 perllib/FixMyStreet/App/Form/Page/Waste.pm       |  11 +
 perllib/FixMyStreet/App/Form/Waste.pm            |  52 +++++
 perllib/FixMyStreet/App/Form/Waste/AboutYou.pm   |  38 ++++
 perllib/FixMyStreet/App/Form/Waste/Report.pm     |  65 ++++++
 perllib/FixMyStreet/App/Form/Waste/Request.pm    |  64 ++++++
 perllib/FixMyStreet/Cobrand/Bromley.pm           |  50 +++++
 perllib/FixMyStreet/Cobrand/FixMyStreet.pm       |  20 +-
 t/app/controller/waste.t                         |  85 ++++++++
 t/cobrand/bromley.t                              |   7 +-
 templates/web/base/waste/confirmation.html       |  34 +++
 templates/web/base/waste/index.html              |   3 -
 templates/web/base/waste/summary.html            |  70 ++++++
 templates/web/base/waste/summary_report.html     |  19 ++
 templates/web/base/waste/summary_request.html    |  20 ++
 templates/web/bromley/waste/services.html        |  14 ++
 17 files changed, 809 insertions(+), 8 deletions(-)
 create mode 100644 perllib/FixMyStreet/App/Form/Page/Waste.pm
 create mode 100644 perllib/FixMyStreet/App/Form/Waste.pm
 create mode 100644 perllib/FixMyStreet/App/Form/Waste/AboutYou.pm
 create mode 100644 perllib/FixMyStreet/App/Form/Waste/Report.pm
 create mode 100644 perllib/FixMyStreet/App/Form/Waste/Request.pm
 create mode 100644 templates/web/base/waste/confirmation.html
 create mode 100644 templates/web/base/waste/summary.html
 create mode 100644 templates/web/base/waste/summary_report.html
 create mode 100644 templates/web/base/waste/summary_request.html

diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 3b42085ff..98ebd4972 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -1140,7 +1140,7 @@ sub process_report : Private {
 
     # save the cobrand and language related information
     $report->cobrand( $c->cobrand->moniker );
-    $report->cobrand_data( '' );
+    $report->cobrand_data( $c->stash->{cobrand_data} || '' );
     $report->lang( $c->stash->{lang_code} );
 
     return 1;
diff --git a/perllib/FixMyStreet/App/Controller/Waste.pm b/perllib/FixMyStreet/App/Controller/Waste.pm
index 6319b5f22..667edad10 100644
--- a/perllib/FixMyStreet/App/Controller/Waste.pm
+++ b/perllib/FixMyStreet/App/Controller/Waste.pm
@@ -5,7 +5,11 @@ use namespace::autoclean;
 BEGIN { extends 'Catalyst::Controller' }
 
 use utf8;
+use Lingua::EN::Inflect qw( NUMWORDS );
 use FixMyStreet::App::Form::Waste::UPRN;
+use FixMyStreet::App::Form::Waste::AboutYou;
+use FixMyStreet::App::Form::Waste::Request;
+use FixMyStreet::App::Form::Waste::Report;
 
 sub auto : Private {
     my ( $self, $c ) = @_;
@@ -55,6 +59,9 @@ sub address_list_form {
 sub redirect_to_uprn : Private {
     my ($self, $c, $uprn) = @_;
     my $uri = '/waste/uprn/' . $uprn;
+    my $type = $c->get_param('type') || '';
+    $uri .= '/request' if $type eq 'request';
+    $uri .= '/report' if $type eq 'report';
     $c->res->redirect($uri);
     $c->detach;
 }
@@ -84,6 +91,262 @@ sub bin_days : Chained('uprn') : PathPart('') : Args(0) {
     my ($self, $c) = @_;
 }
 
+sub construct_bin_request_form {
+    my $c = shift;
+
+    my $field_list = [];
+
+    foreach (@{$c->stash->{service_data}}) {
+        next unless $_->{next};
+        my $name = $_->{service_name};
+        my $containers = $_->{request_containers};
+        my $max = $_->{request_max};
+        foreach my $id (@$containers) {
+            push @$field_list, "container-$id" => {
+                type => 'Checkbox',
+                apply => [
+                    {
+                        when => { "quantity-$id" => sub { $_[0] > 0 } },
+                        check => qr/^1$/,
+                        message => 'Please tick the box',
+                    },
+                ],
+                label => $name,
+                option_label => $c->stash->{containers}->{$id},
+                tags => { toggle => "form-quantity-$id-row" },
+            };
+            $name = ''; # Only on first container
+            push @$field_list, "quantity-$id" => {
+                type => 'Select',
+                label => 'Quantity',
+                tags => {
+                    hint => "You can request a maximum of " . NUMWORDS($max) . " containers",
+                    initial_hidden => 1,
+                },
+                options => [
+                    { value => "", label => '-' },
+                    map { { value => $_, label => $_ } } (1..$max),
+                ],
+                required_when => { "container-$id" => 1 },
+            };
+        }
+    }
+
+    return $field_list;
+}
+
+sub request : Chained('uprn') : Args(0) {
+    my ($self, $c) = @_;
+
+    my $field_list = construct_bin_request_form($c);
+
+    $c->stash->{first_page} = 'request';
+    $c->stash->{form_class} = 'FixMyStreet::App::Form::Waste::Request';
+    $c->stash->{page_list} = [
+        request => {
+            fields => [ grep { ! ref $_ } @$field_list, 'submit' ],
+            title => 'Which containers do you need?',
+            next => 'about_you',
+        },
+    ];
+    $c->stash->{field_list} = $field_list;
+    $c->forward('form');
+}
+
+sub process_request_data : Private {
+    my ($self, $c, $form) = @_;
+    my $data = $form->saved_data;
+    my $address = $c->stash->{property}->{address};
+    my @services = grep { /^container-/ && $data->{$_} } keys %$data;
+    foreach (@services) {
+        my ($id) = /container-(.*)/;
+        my $container = $c->stash->{containers}{$id};
+        my $quantity = $data->{"quantity-$id"};
+        $data->{title} = "Request new $container";
+        $data->{detail} = "Quantity: $quantity\n\n$address";
+        $c->set_param('Container_Type', $id);
+        $c->set_param('Quantity', $quantity);
+        $c->forward('add_report', [ $data ]) or return;
+        push @{$c->stash->{report_ids}}, $c->stash->{report}->id;
+    }
+    return 1;
+}
+
+sub construct_bin_report_form {
+    my $c = shift;
+
+    my $field_list = [];
+
+    foreach (@{$c->stash->{service_data}}) {
+        next unless $_->{last};
+        my $id = $_->{service_id};
+        my $name = $_->{service_name};
+        push @$field_list, "service-$id" => {
+            type => 'Checkbox',
+            label => $name,
+            option_label => $name,
+        };
+    }
+
+    return $field_list;
+}
+
+sub report : Chained('uprn') : Args(0) {
+    my ($self, $c) = @_;
+
+    my $field_list = construct_bin_report_form($c);
+
+    $c->stash->{first_page} = 'report';
+    $c->stash->{form_class} = 'FixMyStreet::App::Form::Waste::Report';
+    $c->stash->{page_list} = [
+        report => {
+            fields => [ grep { ! ref $_ } @$field_list, 'submit' ],
+            title => 'Select your missed collection',
+            next => 'about_you',
+        },
+    ];
+    $c->stash->{field_list} = $field_list;
+    $c->forward('form');
+}
+
+sub process_report_data : Private {
+    my ($self, $c, $form) = @_;
+    my $data = $form->saved_data;
+    my $address = $c->stash->{property}->{address};
+    my @services = grep { /^service-/ && $data->{$_} } keys %$data;
+    foreach (@services) {
+        my ($id) = /service-(.*)/;
+        my $service = $c->stash->{services}{$id}{service_name};
+        $data->{title} = "Report missed $service";
+        $data->{detail} = "$data->{title}\n\n$address";
+        $c->set_param('service_id', $id);
+        $c->forward('add_report', [ $data ]) or return;
+        push @{$c->stash->{report_ids}}, $c->stash->{report}->id;
+    }
+    return 1;
+}
+
+sub load_form {
+    my ($c, $previous_form) = @_;
+
+    my $page;
+    if ($previous_form) {
+        $page = $previous_form->next;
+    } else {
+        $page = $c->forward('get_page');
+    }
+
+    my $form = $c->stash->{form_class}->new(
+        page_list => $c->stash->{page_list},
+        $c->stash->{field_list} ? (field_list => $c->stash->{field_list}) : (),
+        page_name => $page,
+        csrf_token => $c->stash->{csrf_token},
+        c => $c,
+        previous_form => $previous_form,
+        saved_data_encoded => $c->get_param('saved_data'),
+        no_preload => 1,
+    );
+
+    if (!$form->has_current_page) {
+        $c->detach('/page_error_400_bad_request', [ 'Bad request' ]);
+    }
+
+    return $form;
+}
+
+sub form : Private {
+    my ($self, $c) = @_;
+
+    my $form = load_form($c);
+    if ($c->get_param('process')) {
+        $c->forward('/auth/check_csrf_token');
+        $form->process(params => $c->req->body_params);
+        if ($form->validated) {
+            $form = load_form($c, $form);
+        }
+    }
+
+    $form->process unless $form->processed;
+
+    $c->stash->{template} = $form->template || 'waste/index.html';
+    $c->stash->{form} = $form;
+}
+
+sub get_page : Private {
+    my ($self, $c) = @_;
+
+    my $goto = $c->get_param('goto') || '';
+    my $process = $c->get_param('process') || '';
+    $goto = $c->stash->{first_page} unless $goto || $process;
+    if ($goto && $process) {
+        $c->detach('/page_error_400_bad_request', [ 'Bad request' ]);
+    }
+
+    return $goto || $process;
+}
+
+sub add_report : Private {
+    my ( $self, $c, $data ) = @_;
+
+    $c->stash->{cobrand_data} = 'waste';
+
+    # XXX Is this best way to do this?
+    if ($c->user_exists && $c->user->from_body && $c->user->email ne $data->{email}) {
+        $c->set_param('form_as', 'another_user');
+        $c->set_param('username', $data->{email} || $data->{phone});
+    } else {
+        $c->set_param('username_register', $data->{email} || $data->{phone});
+    }
+
+    # Set the data as if a new report form has been submitted
+
+    $c->set_param('submit_problem', 1);
+    $c->set_param('pc', '');
+    $c->set_param('non_public', 1);
+
+    $c->set_param('name', $data->{name});
+    $c->set_param('phone', $data->{phone});
+
+    $c->set_param('category', $data->{category});
+    $c->set_param('title', $data->{title});
+    $c->set_param('detail', $data->{detail});
+    $c->set_param('uprn', $c->stash->{uprn});
+
+    $c->forward('setup_categories_and_bodies') unless $c->stash->{contacts};
+    $c->forward('/report/new/non_map_creation', [['/waste/remove_name_errors']]) or return;
+    my $report = $c->stash->{report};
+    $report->confirm;
+    $report->update;
+
+    $c->model('DB::Alert')->find_or_create({
+        user => $report->user,
+        alert_type => 'new_updates',
+        parameter => $report->id,
+        cobrand => $report->cobrand,
+        lang => $report->lang,
+    })->confirm;
+
+    return 1;
+}
+
+sub remove_name_errors : Private {
+    my ($self, $c) = @_;
+    # We do not mind about missing title/split name here
+    my $field_errors = $c->stash->{field_errors};
+    delete $field_errors->{fms_extra_title};
+    delete $field_errors->{first_name};
+    delete $field_errors->{last_name};
+}
+
+sub setup_categories_and_bodies : Private {
+    my ($self, $c) = @_;
+
+    $c->stash->{all_areas} = $c->stash->{all_areas_mapit} = { $c->cobrand->council_area_id => { id => $c->cobrand->council_area_id } };
+    $c->forward('/report/new/setup_categories_and_bodies');
+    my $contacts = $c->stash->{contacts};
+    @$contacts = grep { grep { $_ eq 'Waste' } @{$_->groups} } @$contacts;
+}
+
 __PACKAGE__->meta->make_immutable;
 
 1;
diff --git a/perllib/FixMyStreet/App/Form/Page/Waste.pm b/perllib/FixMyStreet/App/Form/Page/Waste.pm
new file mode 100644
index 000000000..5275cae7f
--- /dev/null
+++ b/perllib/FixMyStreet/App/Form/Page/Waste.pm
@@ -0,0 +1,11 @@
+package FixMyStreet::App::Form::Page::Waste;
+use Moose;
+extends 'FixMyStreet::App::Form::Page::Simple';
+
+# Title to use for this page
+has title => ( is => 'ro', isa => 'Str' );
+
+# Special template to use in preference to the default
+has template => ( is => 'ro', isa => 'Str' );
+
+1;
diff --git a/perllib/FixMyStreet/App/Form/Waste.pm b/perllib/FixMyStreet/App/Form/Waste.pm
new file mode 100644
index 000000000..c430506c7
--- /dev/null
+++ b/perllib/FixMyStreet/App/Form/Waste.pm
@@ -0,0 +1,52 @@
+package FixMyStreet::App::Form::Waste;
+
+use HTML::FormHandler::Moose;
+extends 'FixMyStreet::App::Form::Wizard';
+
+has c => ( is => 'ro' );
+
+has default_page_type => ( is => 'ro', isa => 'Str', default => 'Waste' );
+
+has finished_action => ( is => 'ro' );
+
+before _process_page_array => sub {
+    my ($self, $pages) = @_;
+    foreach my $page (@$pages) {
+        $page->{type} = $self->default_page_type
+            unless $page->{type};
+    }
+};
+
+# Add some functions to the form to pass through to the current page
+has '+current_page' => (
+    handles => {
+        title => 'title',
+        template => 'template',
+    }
+);
+
+sub wizard_finished {
+    my ($form, $action) = @_;
+    my $c = $form->c;
+    my $success = $c->forward($action, [ $form ]);
+    if (!$success) {
+        $form->add_form_error('Something went wrong, please try again');
+        foreach (keys %{$c->stash->{field_errors}}) {
+            $form->add_form_error("$_: " . $c->stash->{field_errors}{$_});
+        }
+    }
+    return $success;
+}
+
+# Make sure we can have pre-ticked things on the first page
+before after_build => sub {
+    my $self = shift;
+
+    my $saved_data = $self->previous_form ? $self->previous_form->saved_data : $self->saved_data;
+
+    my $c = $self->c;
+
+    map { $saved_data->{$_} = 1 } grep { /^(service|container)-/ && $c->req->params->{$_} } keys %{$c->req->params};
+};
+
+1;
diff --git a/perllib/FixMyStreet/App/Form/Waste/AboutYou.pm b/perllib/FixMyStreet/App/Form/Waste/AboutYou.pm
new file mode 100644
index 000000000..d5bb3df2b
--- /dev/null
+++ b/perllib/FixMyStreet/App/Form/Waste/AboutYou.pm
@@ -0,0 +1,38 @@
+package FixMyStreet::App::Form::Waste::AboutYou;
+
+use utf8;
+use HTML::FormHandler::Moose::Role;
+use FixMyStreet::SMS;
+
+has_field name => (
+    type => 'Text',
+    label => 'Your name',
+    required => 1,
+    validate_method => sub {
+        my $self = shift;
+        $self->add_error('Please enter your full name.')
+            if length($self->value) < 5
+                || $self->value !~ m/\s/
+                || $self->value =~ m/\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i;
+    },
+);
+
+has_field phone => (
+    type => 'Text',
+    label => 'Telephone number',
+    validate_method => sub {
+        my $self = shift;
+        my $parsed = FixMyStreet::SMS->parse_username($self->value);
+        $self->add_error('Please provide a valid phone number')
+            unless $parsed->{phone};
+    }
+);
+
+has_field email => (
+    type => 'Email',
+    tags => {
+        hint => 'If you provide an email address, we can send you order status updates'
+    },
+);
+
+1;
diff --git a/perllib/FixMyStreet/App/Form/Waste/Report.pm b/perllib/FixMyStreet/App/Form/Waste/Report.pm
new file mode 100644
index 000000000..589e75d48
--- /dev/null
+++ b/perllib/FixMyStreet/App/Form/Waste/Report.pm
@@ -0,0 +1,65 @@
+package FixMyStreet::App::Form::Waste::Report;
+
+use utf8;
+use HTML::FormHandler::Moose;
+extends 'FixMyStreet::App::Form::Waste';
+
+# First page has dynamic fields, so is set in code
+
+has_page about_you => (
+    fields => ['name', 'email', 'phone', 'continue'],
+    title => 'About you',
+    next => 'summary',
+);
+
+with 'FixMyStreet::App::Form::Waste::AboutYou';
+
+has_page summary => (
+    fields => ['submit'],
+    title => 'Submit missed collection',
+    template => 'waste/summary_report.html',
+    finished => sub {
+        return $_[0]->wizard_finished('process_report_data');
+    },
+    next => 'done',
+);
+
+has_page done => (
+    title => 'Missed collection sent',
+    template => 'waste/confirmation.html',
+);
+
+has_field category => (
+    type => 'Hidden',
+    default => 'Report missed collection'
+);
+
+has_field continue => (
+    type => 'Submit',
+    value => 'Continue',
+    element_attr => { class => 'govuk-button' },
+);
+
+has_field submit => (
+    type => 'Submit',
+    value => 'Report collection as missed',
+    element_attr => { class => 'govuk-button' },
+    order => 999,
+);
+
+sub validate {
+    my $self = shift;
+    my $any = 0;
+
+    foreach ($self->all_fields) {
+        $any = 1 if $_->name =~ /^service-/ && ($_->value || $self->saved_data->{$_->name});
+    }
+    $self->add_form_error('Please specify what was missed')
+        unless $any;
+
+    $self->add_form_error('Please specify at least one of phone or email')
+        unless $self->field('phone')->is_inactive || $self->field('phone')->value || $self->field('email')->value;
+}
+
+1;
+
diff --git a/perllib/FixMyStreet/App/Form/Waste/Request.pm b/perllib/FixMyStreet/App/Form/Waste/Request.pm
new file mode 100644
index 000000000..e7caaa206
--- /dev/null
+++ b/perllib/FixMyStreet/App/Form/Waste/Request.pm
@@ -0,0 +1,64 @@
+package FixMyStreet::App::Form::Waste::Request;
+
+use utf8;
+use HTML::FormHandler::Moose;
+extends 'FixMyStreet::App::Form::Waste';
+
+# First page has dynamic fields, so is set in code
+
+has_page about_you => (
+    fields => ['name', 'email', 'phone', 'continue'],
+    title => 'About you',
+    next => 'summary',
+);
+
+with 'FixMyStreet::App::Form::Waste::AboutYou';
+
+has_page summary => (
+    fields => ['submit'],
+    title => 'Submit container request',
+    template => 'waste/summary_request.html',
+    finished => sub {
+        return $_[0]->wizard_finished('process_request_data');
+    },
+    next => 'done',
+);
+
+has_page done => (
+    title => 'Container request sent',
+    template => 'waste/confirmation.html',
+);
+
+has_field category => (
+    type => 'Hidden',
+    default => 'Request new container',
+);
+
+has_field continue => (
+    type => 'Submit',
+    value => 'Continue',
+    element_attr => { class => 'govuk-button' },
+);
+
+has_field submit => (
+    type => 'Submit',
+    value => 'Request new containers',
+    element_attr => { class => 'govuk-button' },
+    order => 999,
+);
+
+sub validate {
+    my $self = shift;
+    my $any = 0;
+
+    foreach ($self->all_fields) {
+        $any = 1 if $_->name =~ /^container-/ && ($_->value || $self->saved_data->{$_->name});
+    }
+    $self->add_form_error('Please specify what you need')
+        unless $any;
+
+    $self->add_form_error('Please specify at least one of phone or email')
+        unless $self->field('phone')->is_inactive || $self->field('phone')->value || $self->field('email')->value;
+}
+
+1;
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index e4e509f77..6441180e3 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -378,6 +378,25 @@ sub munge_load_and_group_problems {
     }
 }
 
+sub munge_around_category_where {
+    my ($self, $where) = @_;
+    $where->{extra} = [ undef, { -not_like => '%Waste%' } ];
+}
+
+sub munge_reports_category_list {
+    my ($self, $categories) = @_;
+    @$categories = grep { grep { $_ ne 'Waste' } @{$_->groups} } @$categories;
+}
+
+sub munge_report_new_contacts {
+    my ($self, $categories) = @_;
+
+    return if $self->{c}->action =~ /^waste/;
+
+    @$categories = grep { grep { $_ ne 'Waste' } @{$_->groups} } @$categories;
+    $self->SUPER::munge_report_new_contacts($categories);
+}
+
 sub bin_addresses_for_postcode {
     my $self = shift;
     my $pc = shift;
@@ -442,6 +461,33 @@ sub bin_services_for_address {
         545 => 'Garden Waste',
     );
 
+    $self->{c}->stash->{containers} = {
+        1 => 'Green Box (Plastic)',
+        2 => 'Wheeled Bin (Plastic)',
+        12 => 'Black Box (Paper)',
+        13 => 'Wheeled Bin (Paper)',
+        9 => 'Kitchen Caddy',
+        10 => 'Outside Food Waste Container',
+        45 => 'Wheeled Bin (Food)',
+    };
+    my %service_to_containers = (
+        535 => [ 1 ],
+        536 => [ 2 ],
+        537 => [ 12 ],
+        541 => [ 13 ],
+        542 => [ 9, 10 ],
+        544 => [ 45 ],
+    );
+    my %request_allowed = map { $_ => 1 } keys %service_to_containers;
+    my %quantity_max = (
+        535 => 6,
+        536 => 4,
+        537 => 6,
+        541 => 4,
+        542 => 6,
+        544 => 4,
+    );
+
     my $echo = $self->feature('echo');
     $echo = Integrations::Echo->new(%$echo);
     my $result = $echo->GetServiceUnitsForObject($property->{uprn});
@@ -456,10 +502,14 @@ sub bin_services_for_address {
 
         next unless $schedules->{next} or $schedules->{last};
 
+        my $containers = $service_to_containers{$_->{ServiceId}};
         my $row = {
             id => $_->{Id},
             service_id => $_->{ServiceId},
             service_name => $service_name_override{$_->{ServiceId}} || $_->{ServiceName},
+            request_allowed => $request_allowed{$_->{ServiceId}},
+            request_containers => $containers,
+            request_max => $quantity_max{$_->{ServiceId}},
             service_task_id => $servicetask->{Id},
             service_task_name => $servicetask->{TaskTypeName},
             service_task_type_id => $servicetask->{TaskTypeId},
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index 7344a0f5e..ae96924d8 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -35,15 +35,19 @@ sub restriction {
     return {};
 }
 
-# FixMyStreet needs to not show TfL reports...
+# FixMyStreet needs to not show TfL reports or Bromley waste reports
 sub problems_restriction {
     my ($self, $rs) = @_;
     my $table = ref $rs eq 'FixMyStreet::DB::ResultSet::Nearby' ? 'problem' : 'me';
-    return $rs->search({ "$table.cobrand" => { '!=' => 'tfl' } });
+    return $rs->search({
+        "$table.cobrand" => { '!=' => 'tfl' },
+        "$table.cobrand_data" => { '!=' => 'waste' },
+    });
 }
 sub problems_sql_restriction {
     my $self = shift;
     return "AND cobrand != 'tfl'";
+    # Doesn't need Bromley one as all waste reports non-public
 }
 
 sub relative_url_for_report {
@@ -61,6 +65,10 @@ sub munge_around_category_where {
         # can't determine the body
         $where->{send_method} = [ { '!=' => 'Triage' }, undef ];
     }
+    my $bromley = grep { $_->name eq 'Bromley Council' } @{ $self->{c}->stash->{around_bodies} };
+    if ($bromley) {
+        $where->{extra} = [ undef, { -not_like => '%Waste%' } ];
+    }
 }
 
 sub _iow_category_munge {
@@ -75,13 +83,16 @@ sub _iow_category_munge {
     @$categories = grep { $_->send_method && $_->send_method eq 'Triage' } @$categories;
 }
 
-sub munge_reports_categories_list {
+sub munge_reports_category_list {
     my ($self, $categories) = @_;
 
     my %bodies = map { $_->body->name => $_->body } @$categories;
     if ( my $body = $bodies{'Isle of Wight Council'} ) {
         return $self->_iow_category_munge($body, $categories);
     }
+    if ( $bodies{'Bromley Council'} ) {
+        @$categories = grep { grep { $_ ne 'Waste' } @{$_->groups} } @$categories;
+    }
 }
 
 sub munge_reports_area_list {
@@ -122,6 +133,9 @@ sub munge_report_new_contacts {
     if ( my $body = $bodies{'Isle of Wight Council'} ) {
         return $self->_iow_category_munge($body, $contacts);
     }
+    if ( $bodies{'Bromley Council'} ) {
+        @$contacts = grep { grep { $_ ne 'Waste' } @{$_->groups} } @$contacts;
+    }
     if ( $bodies{'TfL'} ) {
         # Presented categories vary if we're on/off a red route
         my $tfl = FixMyStreet::Cobrand->get_class_for_moniker( 'tfl' )->new({ c => $self->{c} });
diff --git a/t/app/controller/waste.t b/t/app/controller/waste.t
index 77b1ef5bc..454a593a6 100644
--- a/t/app/controller/waste.t
+++ b/t/app/controller/waste.t
@@ -1,8 +1,35 @@
 use Test::MockModule;
 use FixMyStreet::TestMech;
 
+FixMyStreet::App->log->disable('info');
+END { FixMyStreet::App->log->enable('info'); }
+
 my $mech = FixMyStreet::TestMech->new;
 
+my $body = $mech->create_body_ok(2482, 'Bromley Council');
+my $user = $mech->create_user_ok('test@example.net', name => 'Normal User');
+my $staff_user = $mech->create_user_ok('staff@example.org', from_body => $body, name => 'Staff User');
+$staff_user->user_body_permissions->create({ body => $body, permission_type => 'contribute_as_another_user' });
+$staff_user->user_body_permissions->create({ body => $body, permission_type => 'report_mark_private' });
+
+sub create_contact {
+    my ($params, @extra) = @_;
+    my $contact = $mech->create_contact_ok(body => $body, %$params);
+    $contact->set_extra_metadata(group => ['Waste']);
+    $contact->set_extra_fields(
+        { code => 'uprn', required => 1, automated => 'hidden_field' },
+        { code => 'service_id', required => 0, automated => 'hidden_field' },
+        @extra,
+    );
+    $contact->update;
+}
+
+create_contact({ category => 'Report missed collection', email => 'missed' });
+create_contact({ category => 'Request new container', email => 'request' },
+    { code => 'Quantity', required => 1, automated => 'hidden_field' },
+    { code => 'Container_Type', required => 1, automated => 'hidden_field' },
+);
+
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => ['bromley', 'fixmystreet'],
     COBRAND_FEATURES => { echo => { bromley => { sample_data => 1 } }, waste => { bromley => 1 } },
@@ -21,6 +48,64 @@ FixMyStreet::override_config {
         $mech->content_contains('2 Example Street');
         $mech->content_contains('Food Waste');
     };
+    subtest 'Report a missed bin' => sub {
+        $mech->follow_link_ok({ text => 'Report a missed collection' });
+        $mech->submit_form_ok({ form_number => 2 });
+        $mech->content_contains('Please specify what was missed');
+        $mech->submit_form_ok({ with_fields => { 'service-101' => 1 } });
+        $mech->submit_form_ok({ with_fields => { name => "Test" } });
+        $mech->content_contains('Please enter your full name');
+        $mech->content_contains('Please specify at least one of phone or email');
+        $mech->submit_form_ok({ with_fields => { name => "Test McTest", email => 'test@example.org' } });
+        $mech->content_contains('Refuse collection');
+        $mech->content_contains('Test McTest');
+        $mech->content_contains('test@example.org');
+        $mech->submit_form_ok({ form_number => 3 });
+        $mech->submit_form_ok({ with_fields => { name => "Test McTest", email => $user->email } });
+        $mech->content_contains($user->email);
+        $mech->submit_form_ok({ with_fields => { process => 'summary' } });
+        $mech->content_contains('Your report has been sent');
+
+        is $user->alerts->count, 1;
+    };
+    subtest 'Check report visibility' => sub {
+        my $report = FixMyStreet::DB->resultset("Problem")->first;
+        my $res = $mech->get('/report/' . $report->id);
+        is $res->code, 403;
+        $mech->log_in_ok($user->email);
+        $mech->get_ok('/report/' . $report->id);
+        $mech->log_in_ok($staff_user->email);
+        $mech->get_ok('/report/' . $report->id);
+
+        $mech->host('www.fixmystreet.com');
+        $res = $mech->get('/report/' . $report->id);
+        is $res->code, 404;
+        $mech->log_in_ok($user->email);
+        $res = $mech->get('/report/' . $report->id);
+        is $res->code, 404;
+        $mech->log_in_ok($staff_user->email);
+        $res = $mech->get('/report/' . $report->id);
+        is $res->code, 404;
+        $mech->host('bromley.fixmystreet.com');
+    };
+    subtest 'Request a new container' => sub {
+        $mech->get_ok('/waste/uprn/1000000002/request');
+        $mech->submit_form_ok({ form_number => 2 });
+        $mech->content_contains('Please specify what you need');
+        $mech->submit_form_ok({ with_fields => { 'container-1' => 1 } });
+        $mech->content_contains('Quantity field is required');
+        $mech->submit_form_ok({ with_fields => { 'container-1' => 1, 'quantity-1' => 2 } });
+        $mech->submit_form_ok({ with_fields => { name => "Test McTest", email => $user->email } });
+        $mech->content_contains('Green Box');
+        $mech->content_contains('Test McTest');
+        $mech->content_contains($user->email);
+        $mech->submit_form_ok({ with_fields => { process => 'summary' } });
+        $mech->content_contains('Your request has been sent');
+        my $report = FixMyStreet::DB->resultset("Problem")->search(undef, { order_by => { -desc => 'id' } })->first;
+        is $report->get_extra_field_value('uprn'), 1000000002;
+        is $report->get_extra_field_value('Quantity'), 2;
+        is $report->get_extra_field_value('Container_Type'), 1;
+    };
 };
 
 package SOAP::Result;
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index d26b10709..f2b1c7a39 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -26,6 +26,10 @@ $mech->create_contact_ok(
     email => 'tfl@example.org',
 );
 
+my $waste = $mech->create_contact_ok(body => $body, category => 'Report missed collection', email => 'missed');
+$waste->set_extra_metadata(group => ['Waste']);
+$waste->update;
+
 my @reports = $mech->create_problems_for_body( 1, $body->id, 'Test', {
     latitude => 51.402096,
     longitude => 0.015784,
@@ -177,7 +181,7 @@ for my $test (
     };
 }
 
-subtest 'check display of TfL reports' => sub {
+subtest 'check display of TfL and waste reports' => sub {
     $mech->create_problems_for_body( 1, $tfl->id, 'TfL Test', {
         latitude => 51.402096,
         longitude => 0.015784,
@@ -193,6 +197,7 @@ subtest 'check display of TfL reports' => sub {
     };
     $mech->content_like(qr{<a title="TfL Test[^>]*www.example.org[^>]*><img[^>]*grey});
     $mech->content_like(qr{<a title="Test Test[^>]*href="/[^>]*><img[^>]*yellow});
+    $mech->content_lacks('Report missed collection');
 };
 
 subtest 'check geolocation overrides' => sub {
diff --git a/templates/web/base/waste/confirmation.html b/templates/web/base/waste/confirmation.html
new file mode 100644
index 000000000..9bacd9a2b
--- /dev/null
+++ b/templates/web/base/waste/confirmation.html
@@ -0,0 +1,34 @@
+[%
+IF first_page == 'request';
+    title = 'Container request sent';
+ELSIF first_page == 'report';
+    title = 'Missed collection reported';
+ELSE;
+    title = 'Enquiry submitted';
+END ~%]
+[% INCLUDE header.html %]
+
+<div class="govuk-panel govuk-panel--confirmation">
+    <h1 class="govuk-panel__title">
+        [% title %]
+    </h1>
+    <div class="govuk-panel__body">
+        <p>Your [% first_page %] has been sent;
+          [% IF data.email %]
+            a copy has been sent to your email address, [% data.email %].
+          [% END %]
+        </p>
+        <p>
+          [% IF first_page == 'request' %]
+            Containers arrive typically within two weeks, but this may vary due to demand.
+          [% END %]
+          [% IF report_ids.size > 1 %]
+            Your reference numbers are: <strong>[% report_ids.join(', ') %]</strong>.
+          [% ELSE %]
+            Your reference number is <strong>[% report_ids.join(', ') %]</strong>.
+          [% END %]
+        </p>
+    </div>
+</div>
+
+[% INCLUDE footer.html %]
diff --git a/templates/web/base/waste/index.html b/templates/web/base/waste/index.html
index 8e02c5b71..0750ac82a 100644
--- a/templates/web/base/waste/index.html
+++ b/templates/web/base/waste/index.html
@@ -14,9 +14,6 @@
   [% END %]
 <form method="post">
   [% PROCESS form %]
-  <input type="hidden" name="token" value="[% csrf_token %]">
-  <input type="hidden" name="process" value="[% process %]">
-  <input type="hidden" name="saved_data" value="[% saved_data %]">
 </form>
 
 [% INCLUDE footer.html %]
diff --git a/templates/web/base/waste/summary.html b/templates/web/base/waste/summary.html
new file mode 100644
index 000000000..7fa79b05b
--- /dev/null
+++ b/templates/web/base/waste/summary.html
@@ -0,0 +1,70 @@
+[% SET bodyclass = 'waste' %]
+
+[% USE date(format = '%A, %-d~~~ %B') ~%]
+[% PROCESS 'waste/govuk/fields.html' ~%]
+[% INCLUDE header.html %]
+
+[% PROCESS errors %]
+[% SET data = form.saved_data ~%]
+
+<h1 class="govuk-heading-xl">[% title %]</h1>
+<p>Please review the information you’ve provided before you submit your [% thing %].</p>
+
+<div class="waste__summary">
+<dl class="govuk-summary-list">
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      [% summary_title %]
+    </dt>
+    <dd class="govuk-summary-list__value">
+    </dd>
+    <dd class="govuk-summary-list__actions">
+    <form method="post">
+        <input type="hidden" name="saved_data" value="[% form.fif.saved_data %]">
+        <input type="hidden" name="goto" value="[% step1 %]">
+        <input type="submit" class="govuk-button govuk-button--secondary govuk-!-margin-bottom-0" value="Change answers">
+    </form>
+    </dd>
+  </div>
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">Address</dt>
+        <dd class="govuk-summary-list__value">[% property.address %]</dd>
+    </div>
+    [% INCLUDE answers %]
+  
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      About you
+    </dt>
+    <dd class="govuk-summary-list__value">
+    </dd>
+    <dd class="govuk-summary-list__actions">
+    <form method="post">
+        <input type="hidden" name="saved_data" value="[% form.fif.saved_data %]">
+        <input type="hidden" name="goto" value="about_you">
+        <input type="submit" class="govuk-button govuk-button--secondary govuk-!-margin-bottom-0" value="Change answers">
+    </form>
+    </dd>
+  </div>
+
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">Your name</dt>
+        <dd class="govuk-summary-list__value">[% data.name %]</dd>
+    </div>
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">Telephone number</dt>
+        <dd class="govuk-summary-list__value">[% data.phone %]</dd>
+    </div>
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">Email</dt>
+        <dd class="govuk-summary-list__value">[% data.email %]</dd>
+    </div>
+
+</dl>
+
+<form method="post">
+    [% PROCESS form %]
+</form>
+</div>
+
+[% INCLUDE footer.html %]
diff --git a/templates/web/base/waste/summary_report.html b/templates/web/base/waste/summary_report.html
new file mode 100644
index 000000000..a67090e6e
--- /dev/null
+++ b/templates/web/base/waste/summary_report.html
@@ -0,0 +1,19 @@
+[%
+title = 'Submit missed bin report';
+thing = 'missed bin report';
+summary_title = 'Missed collection';
+step1 = 'report';
+%]
+
+[% BLOCK answers %]
+  [% FOR service IN data.keys.grep('^service-') %]
+    [% NEXT UNLESS data.$service %]
+    [% SET service_id = service.replace('service-', '') %]
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">[% services.$service_id.service_name %]</dt>
+        <dd class="govuk-summary-list__value">[% date.format(services.$service_id.last.date) | replace('~~~', services.$service_id.last.ordinal) %]</dd>
+    </div>
+  [% END %]
+[% END %]
+
+[% PROCESS waste/summary.html %]
diff --git a/templates/web/base/waste/summary_request.html b/templates/web/base/waste/summary_request.html
new file mode 100644
index 000000000..83c4091aa
--- /dev/null
+++ b/templates/web/base/waste/summary_request.html
@@ -0,0 +1,20 @@
+[%
+title = 'Submit container request';
+thing = 'container request';
+summary_title = 'Container requests';
+step1 = 'request';
+%]
+
+[% BLOCK answers %]
+  [% FOR container IN data.keys.grep('^container-') %]
+    [% NEXT UNLESS data.$container %]
+    [% SET container_id = container.replace('container-', '') %]
+    [% SET quantity_key = container.replace('container-', 'quantity-') %]
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">[% containers.$container_id %]</dt>
+        <dd class="govuk-summary-list__value">[% data.$quantity_key %]</dd>
+    </div>
+  [% END %]
+[% END %]
+
+[% PROCESS waste/summary.html %]
diff --git a/templates/web/bromley/waste/services.html b/templates/web/bromley/waste/services.html
index e69de29bb..2f683ab2f 100644
--- a/templates/web/bromley/waste/services.html
+++ b/templates/web/bromley/waste/services.html
@@ -0,0 +1,14 @@
+  [% any_report_allowed = 1 %]
+  <form method="post" action="[% c.uri_for_action('waste/report', [ uprn ]) %]">
+    <input type="hidden" name="token" value="[% csrf_token %]">
+    <input type="hidden" name="service-[% unit.service_id %]" value="1">
+    <input type="submit" value="Report a [% unit.service_name FILTER lower %] collection as missed" class="waste-service-descriptor waste-service-link">
+  </form>
+[% IF unit.request_allowed %]
+  [% any_request_allowed = 1 %]
+  <form method="post" action="[% c.uri_for_action('waste/request', [ uprn ]) %]">
+    <input type="hidden" name="token" value="[% csrf_token %]">
+    <input type="hidden" name="container-[% unit.request_containers.0 %]" value="1">
+    <input type="submit" value="Request a new [% unit.service_name FILTER lower %] container" class="waste-service-descriptor waste-service-link">
+  </form>
+[% END %]
-- 
cgit v1.2.3


From 613f45c6514ace275b3a49a5d50f7b83ed536b5f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 29 Jun 2020 16:08:54 +0100
Subject: [Bromley] Add general enquiries.

This adds general enquiries to the reporting flow.
---
 perllib/FixMyStreet/App/Controller/Waste.pm      | 72 ++++++++++++++++++++++++
 perllib/FixMyStreet/App/Form/Waste/Enquiry.pm    | 48 ++++++++++++++++
 t/app/controller/waste.t                         | 25 ++++++++
 templates/web/base/waste/enquiry.html            | 33 +++++++++++
 templates/web/base/waste/summary_enquiry.html    | 19 +++++++
 templates/web/bromley/waste/enquiry-problem.html | 13 +++++
 templates/web/bromley/waste/services.html        |  6 ++
 7 files changed, 216 insertions(+)
 create mode 100644 perllib/FixMyStreet/App/Form/Waste/Enquiry.pm
 create mode 100644 templates/web/base/waste/enquiry.html
 create mode 100644 templates/web/base/waste/summary_enquiry.html
 create mode 100644 templates/web/bromley/waste/enquiry-problem.html

diff --git a/perllib/FixMyStreet/App/Controller/Waste.pm b/perllib/FixMyStreet/App/Controller/Waste.pm
index 667edad10..a31c359f1 100644
--- a/perllib/FixMyStreet/App/Controller/Waste.pm
+++ b/perllib/FixMyStreet/App/Controller/Waste.pm
@@ -10,6 +10,7 @@ use FixMyStreet::App::Form::Waste::UPRN;
 use FixMyStreet::App::Form::Waste::AboutYou;
 use FixMyStreet::App::Form::Waste::Request;
 use FixMyStreet::App::Form::Waste::Report;
+use FixMyStreet::App::Form::Waste::Enquiry;
 
 sub auto : Private {
     my ( $self, $c ) = @_;
@@ -226,6 +227,77 @@ sub process_report_data : Private {
     return 1;
 }
 
+sub enquiry : Chained('uprn') : Args(0) {
+    my ($self, $c) = @_;
+
+    if (my $template = $c->get_param('template')) {
+        $c->stash->{template} = "waste/enquiry-$template.html";
+        $c->detach;
+    }
+
+    $c->forward('setup_categories_and_bodies');
+
+    my $category = $c->get_param('category');
+    my $service = $c->get_param('service_id');
+    if (!$category || !$service || !$c->stash->{services}{$service}) {
+        $c->res->redirect('/waste/uprn/' . $c->stash->{uprn});
+        $c->detach;
+    }
+    my ($contact) = grep { $_->category eq $category } @{$c->stash->{contacts}};
+    if (!$contact) {
+        $c->res->redirect('/waste/uprn/' . $c->stash->{uprn});
+        $c->detach;
+    }
+
+    my $field_list = [];
+    foreach (@{$contact->get_metadata_for_input}) {
+        next if $_->{code} eq 'service_id' || $_->{code} eq 'uprn';
+        my $type = 'Text';
+        $type = 'TextArea' if 'text' eq ($_->{datatype} || '');
+        my $required = $_->{required} eq 'true' ? 1 : 0;
+        push @$field_list, "extra_$_->{code}" => {
+            type => $type, label => $_->{description}, required => $required
+        };
+    }
+
+    $c->stash->{first_page} = 'enquiry';
+    $c->stash->{form_class} = 'FixMyStreet::App::Form::Waste::Enquiry';
+    $c->stash->{page_list} = [
+        enquiry => {
+            fields => [ 'category', 'service_id', grep { ! ref $_ } @$field_list, 'continue' ],
+            title => $category,
+            next => 'about_you',
+            update_field_list => sub {
+                my $form = shift;
+                my $c = $form->c;
+                return {
+                    category => { default => $c->get_param('category') },
+                    service_id => { default => $c->get_param('service_id') },
+                }
+            }
+        },
+    ];
+    $c->stash->{field_list} = $field_list;
+    $c->forward('form');
+}
+
+sub process_enquiry_data : Private {
+    my ($self, $c, $form) = @_;
+    my $data = $form->saved_data;
+    my $address = $c->stash->{property}->{address};
+    $data->{title} = $data->{category};
+    $data->{detail} = "$data->{category}\n\n$address";
+    # Read extra details in loop
+    foreach (grep { /^extra_/ } keys %$data) {
+        my ($id) = /^extra_(.*)/;
+        $c->set_param($id, $data->{$_});
+    }
+    $c->set_param('service_id', $data->{service_id});
+    $c->forward('add_report', [ $data ]) or return;
+    push @{$c->stash->{report_ids}}, $c->stash->{report}->id;
+    return 1;
+}
+
 sub load_form {
     my ($c, $previous_form) = @_;
 
diff --git a/perllib/FixMyStreet/App/Form/Waste/Enquiry.pm b/perllib/FixMyStreet/App/Form/Waste/Enquiry.pm
new file mode 100644
index 000000000..fa85d5d4c
--- /dev/null
+++ b/perllib/FixMyStreet/App/Form/Waste/Enquiry.pm
@@ -0,0 +1,48 @@
+package FixMyStreet::App::Form::Waste::Enquiry;
+
+use utf8;
+use HTML::FormHandler::Moose;
+extends 'FixMyStreet::App::Form::Waste';
+
+# First page has dynamic fields, so is set in code
+
+has_field category => ( type => 'Hidden' );
+has_field service_id => ( type => 'Hidden' );
+
+has_page about_you => (
+    fields => ['name', 'phone', 'email', 'continue'],
+    title => 'About you',
+    next => 'summary',
+);
+
+with 'FixMyStreet::App::Form::Waste::AboutYou';
+
+has_page summary => (
+    fields => ['submit'],
+    title => 'Submit missed collection',
+    template => 'waste/summary_enquiry.html',
+    finished => sub {
+        return $_[0]->wizard_finished('process_enquiry_data');
+    },
+    next => 'done',
+);
+
+has_page done => (
+    title => 'Enquiry sent',
+    template => 'waste/confirmation.html',
+);
+
+has_field continue => (
+    type => 'Submit',
+    value => 'Continue',
+    element_attr => { class => 'govuk-button' },
+    order => 999
+);
+
+has_field submit => (
+    type => 'Submit',
+    value => 'Submit',
+    element_attr => { class => 'govuk-button' }
+);
+
+1;
diff --git a/t/app/controller/waste.t b/t/app/controller/waste.t
index 454a593a6..bbd0cd00a 100644
--- a/t/app/controller/waste.t
+++ b/t/app/controller/waste.t
@@ -29,6 +29,8 @@ create_contact({ category => 'Request new container', email => 'request' },
     { code => 'Quantity', required => 1, automated => 'hidden_field' },
     { code => 'Container_Type', required => 1, automated => 'hidden_field' },
 );
+create_contact({ category => 'General enquiry', email => 'general' },
+    { code => 'Notes', description => 'Notes', required => 1, datatype => 'text' });
 
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => ['bromley', 'fixmystreet'],
@@ -106,6 +108,29 @@ FixMyStreet::override_config {
         is $report->get_extra_field_value('Quantity'), 2;
         is $report->get_extra_field_value('Container_Type'), 1;
     };
+    subtest 'General enquiry, bad data' => sub {
+        $mech->get_ok('/waste/uprn/1000000002/enquiry');
+        is $mech->uri->path, '/waste/uprn/1000000002';
+        $mech->get_ok('/waste/uprn/1000000002/enquiry?category=Bad');
+        is $mech->uri->path, '/waste/uprn/1000000002';
+        $mech->get_ok('/waste/uprn/1000000002/enquiry?service=1');
+        is $mech->uri->path, '/waste/uprn/1000000002';
+    };
+    subtest 'General enquiry, on behalf of someone else' => sub {
+        $mech->log_in_ok($staff_user->email);
+        $mech->get_ok('/waste/uprn/1000000002/enquiry?category=General+enquiry&service_id=537');
+        $mech->submit_form_ok({ with_fields => { extra_Notes => 'Some notes' } });
+        $mech->submit_form_ok({ with_fields => { name => "Test McTest", email => $user->email } });
+        $mech->content_contains('Some notes');
+        $mech->content_contains('Test McTest');
+        $mech->content_contains($user->email);
+        $mech->submit_form_ok({ with_fields => { process => 'summary' } });
+        $mech->content_contains('Your enquiry has been sent');
+        my $report = FixMyStreet::DB->resultset("Problem")->search(undef, { order_by => { -desc => 'id' } })->first;
+        is $report->get_extra_field_value('Notes'), 'Some notes';
+        is $report->user->email, $user->email;
+        is $report->get_extra_metadata('contributed_by'), $staff_user->id;
+    };
 };
 
 package SOAP::Result;
diff --git a/templates/web/base/waste/enquiry.html b/templates/web/base/waste/enquiry.html
new file mode 100644
index 000000000..8993b0fd8
--- /dev/null
+++ b/templates/web/base/waste/enquiry.html
@@ -0,0 +1,33 @@
+[% SET bodyclass = 'waste' %]
+[% INCLUDE header.html %]
+
+[% PROCESS 'waste/govuk/fields.html' %]
+[% PROCESS title %]
+[% SET service_id = c.req.params.service_id %]
+
+<dl class="waste__address">
+    <dt class="waste__address__title">Address</dt>
+    <dd class="waste__address__property">[% property.address %]</dd>
+</dl>
+
+<dl class="waste__address">
+    <dt class="waste__address__title">Service</dt>
+    <dd class="waste__address__property">[% services.$service_id.service_name %]</dd>
+</dl>
+
+<form method="get" action="[% c.uri_for_action('waste/enquiry', [ uprn ]) %]">
+    <div class="govuk-form-group">
+    [% PROCESS radio field = {
+      id = 'category',
+      html_name = 'category',
+      label = 'Category',
+      options = field_options
+    }
+    %]
+    </div>
+    <div class="govuk-form-group"><input type="submit" value="Continue" class="govuk-button"></div>
+
+  <input type="hidden" name="service_id" value="[% service_id %]">
+</form>
+
+[% INCLUDE footer.html %]
diff --git a/templates/web/base/waste/summary_enquiry.html b/templates/web/base/waste/summary_enquiry.html
new file mode 100644
index 000000000..8e5967a3b
--- /dev/null
+++ b/templates/web/base/waste/summary_enquiry.html
@@ -0,0 +1,19 @@
+[%
+title = 'Submit enquiry';
+thing = 'enquiry';
+summary_title = data.category;
+step1 = 'enquiry';
+%]
+
+[% BLOCK answers %]
+  [% FOR extra IN data.keys.grep('^extra_') %]
+    [% NEXT UNLESS data.$extra %]
+    [% SET extra_name = extra.replace('extra_', '') %]
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">[% extra_name | title %]</dt>
+        <dd class="govuk-summary-list__value">[% data.$extra %]</dd>
+    </div>
+  [% END %]
+[% END %]
+
+[% PROCESS waste/summary.html %]
diff --git a/templates/web/bromley/waste/enquiry-problem.html b/templates/web/bromley/waste/enquiry-problem.html
new file mode 100644
index 000000000..948cb91f3
--- /dev/null
+++ b/templates/web/bromley/waste/enquiry-problem.html
@@ -0,0 +1,13 @@
+[% PROCESS waste/enquiry.html
+    title = 'Report a problem'
+    field_options = [
+        { value = 'Gate not closed', label = 'A gate or enclosure wasn’t closed after the collection' },
+        { value = 'Waste spillage', label = 'Bin contents were spilled during the collection' },
+        { value = 'Bin not returned', label = 'A bin wasn’t returned after the collection' },
+        { value = 'Crew behaviour', label = 'There was a problem with the crew’s behaviour' },
+        { value = 'Wrongful removal', label = 'Something was wrongly removed during the collection' },
+        { value = 'Damage to 3rd party', label = 'Someone else’s vehicle was damaged' },
+        { value = 'Damage to Property', label = 'My property was damaged' },
+        { value = 'Failure to deliver bin', label = 'My bin was not delivered' },
+    ]
+%]
diff --git a/templates/web/bromley/waste/services.html b/templates/web/bromley/waste/services.html
index 2f683ab2f..2caf41738 100644
--- a/templates/web/bromley/waste/services.html
+++ b/templates/web/bromley/waste/services.html
@@ -4,6 +4,7 @@
     <input type="hidden" name="service-[% unit.service_id %]" value="1">
     <input type="submit" value="Report a [% unit.service_name FILTER lower %] collection as missed" class="waste-service-descriptor waste-service-link">
   </form>
+  <a href="[% c.uri_for_action('waste/enquiry', [ uprn ]) %]?template=problem&amp;service_id=[% unit.service_id %]" class="waste-service-link waste-service-descriptor">Report a problem with a [% unit.service_name FILTER lower %] collection</a>
 [% IF unit.request_allowed %]
   [% any_request_allowed = 1 %]
   <form method="post" action="[% c.uri_for_action('waste/request', [ uprn ]) %]">
@@ -12,3 +13,8 @@
     <input type="submit" value="Request a new [% unit.service_name FILTER lower %] container" class="waste-service-descriptor waste-service-link">
   </form>
 [% END %]
+  <form method="get" action="[% c.uri_for_action('waste/enquiry', [ uprn ]) %]">
+    <input type="hidden" name="service_id" value="[% unit.service_id %]">
+    <input type="hidden" name="category" id="category" value="General Enquiry">
+    <input type="submit" value="Contact us about a [% unit.service_name FILTER lower %] collection" class="waste-service-descriptor waste-service-link">
+  </form>
-- 
cgit v1.2.3


From c0f9b0dcb1fc7cecb4b98ad82715600f73707bf0 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 16 Jun 2020 16:25:07 +0100
Subject: [Waste] ICal generation, with Data::ICal.

---
 cpanfile                                    |  2 ++
 cpanfile.snapshot                           | 46 +++++++++++++++++++++++++++++
 perllib/Data/ICal/Entry/Event7986.pm        | 18 +++++++++++
 perllib/Data/ICal/RFC7986.pm                | 17 +++++++++++
 perllib/FixMyStreet/App/Controller/Waste.pm | 38 ++++++++++++++++++++++++
 templates/web/base/waste/bin_days.html      |  2 +-
 6 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 perllib/Data/ICal/Entry/Event7986.pm
 create mode 100644 perllib/Data/ICal/RFC7986.pm

diff --git a/cpanfile b/cpanfile
index 4485314b0..cf7250e21 100644
--- a/cpanfile
+++ b/cpanfile
@@ -136,6 +136,8 @@ feature 'uk', 'FixMyStreet.com specific requirements' => sub {
     requires 'SOAP::Lite', '1.20';
     # TfL
     requires 'Net::Subnet';
+    # Bromley
+    requires 'Data::ICal';
 };
 
 feature 'zurich', 'Zueri wie neu specific requirements' => sub {
diff --git a/cpanfile.snapshot b/cpanfile.snapshot
index cdb785a26..92a8535a3 100644
--- a/cpanfile.snapshot
+++ b/cpanfile.snapshot
@@ -947,6 +947,14 @@ DISTRIBUTIONS
       perl 5.006
       strict 0
       warnings 0
+  Class-ReturnValue-0.55
+    pathname: J/JE/JESSE/Class-ReturnValue-0.55.tar.gz
+    provides:
+      Class::ReturnValue 0.55
+    requirements:
+      Devel::StackTrace 0
+      ExtUtils::MakeMaker 0
+      Test::More 0
   Class-Singleton-1.4
     pathname: A/AB/ABW/Class-Singleton-1.4.tar.gz
     provides:
@@ -1723,6 +1731,36 @@ DISTRIBUTIONS
     requirements:
       ExtUtils::MakeMaker 6.42
       perl 5.006
+  Data-ICal-0.24
+    pathname: B/BP/BPS/Data-ICal-0.24.tar.gz
+    provides:
+      Data::ICal 0.24
+      Data::ICal::Entry undef
+      Data::ICal::Entry::Alarm undef
+      Data::ICal::Entry::Alarm::Audio undef
+      Data::ICal::Entry::Alarm::Display undef
+      Data::ICal::Entry::Alarm::Email undef
+      Data::ICal::Entry::Alarm::None undef
+      Data::ICal::Entry::Alarm::Procedure undef
+      Data::ICal::Entry::Alarm::URI undef
+      Data::ICal::Entry::Event undef
+      Data::ICal::Entry::FreeBusy undef
+      Data::ICal::Entry::Journal undef
+      Data::ICal::Entry::TimeZone undef
+      Data::ICal::Entry::TimeZone::Daylight undef
+      Data::ICal::Entry::TimeZone::Standard undef
+      Data::ICal::Entry::Todo undef
+      Data::ICal::Property 0.06
+    requirements:
+      Class::Accessor 0
+      Class::ReturnValue 0
+      ExtUtils::MakeMaker 6.36
+      MIME::QuotedPrint 0
+      Test::LongString 0
+      Test::More 0
+      Test::NoWarnings 0
+      Test::Warn 0
+      Text::vFile::asData 0
   Data-OptList-0.110
     pathname: R/RJ/RJBS/Data-OptList-0.110.tar.gz
     provides:
@@ -7931,6 +7969,14 @@ DISTRIBUTIONS
       Text::Unidecode 0.04
     requirements:
       ExtUtils::MakeMaker 0
+  Text-vFile-asData-0.08
+    pathname: R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz
+    provides:
+      Text::vFile::asData 0.08
+    requirements:
+      Class::Accessor::Chained 0
+      ExtUtils::MakeMaker 0
+      Test::More 0.88
   Throwable-0.200013
     pathname: R/RJ/RJBS/Throwable-0.200013.tar.gz
     provides:
diff --git a/perllib/Data/ICal/Entry/Event7986.pm b/perllib/Data/ICal/Entry/Event7986.pm
new file mode 100644
index 000000000..ae627861a
--- /dev/null
+++ b/perllib/Data/ICal/Entry/Event7986.pm
@@ -0,0 +1,18 @@
+package Data::ICal::Entry::Event7986;
+
+use parent 'Data::ICal::Entry::Event';
+
+sub optional_unique_properties {
+    return (
+        shift->SUPER::optional_unique_properties,
+        "color",
+    );
+}
+
+sub optional_repeatable_properties {
+    return (
+        shift->SUPER::optional_repeatable_properties,
+        "conference", "image",
+    );
+}
+
diff --git a/perllib/Data/ICal/RFC7986.pm b/perllib/Data/ICal/RFC7986.pm
new file mode 100644
index 000000000..01f9d354e
--- /dev/null
+++ b/perllib/Data/ICal/RFC7986.pm
@@ -0,0 +1,17 @@
+package Data::ICal::RFC7986;
+
+use parent 'Data::ICal';
+
+sub optional_unique_properties {
+    qw( calscale method
+		uid last-modified url refresh-interval source color
+	);
+}
+
+# name/description are only repeatable to provide
+# translations with language param
+sub optional_repeatable_properties {
+	qw( name description categories image );
+}
+
+1;
diff --git a/perllib/FixMyStreet/App/Controller/Waste.pm b/perllib/FixMyStreet/App/Controller/Waste.pm
index a31c359f1..e606b1d8c 100644
--- a/perllib/FixMyStreet/App/Controller/Waste.pm
+++ b/perllib/FixMyStreet/App/Controller/Waste.pm
@@ -92,6 +92,44 @@ sub bin_days : Chained('uprn') : PathPart('') : Args(0) {
     my ($self, $c) = @_;
 }
 
+sub calendar : Chained('uprn') : PathPart('calendar.ics') : Args(0) {
+    my ($self, $c) = @_;
+    $c->res->header(Content_Type => 'text/calendar');
+    require Data::ICal::RFC7986;
+    require Data::ICal::Entry::Event;
+    my $calendar = Data::ICal::RFC7986->new(
+        calname => 'Bin calendar',
+        rfc_strict => 1,
+        auto_uid => 1,
+    );
+    $calendar->add_properties(
+        prodid => '//FixMyStreet//Bin Collection Calendars//EN',
+        method => 'PUBLISH',
+        'refresh-interval' => [ 'P1D', { value => 'DURATION' } ],
+        'x-published-ttl' => 'P1D',
+        calscale => 'GREGORIAN',
+        'x-wr-timezone' => 'Europe/London',
+        source => [ $c->uri_for_action($c->action, [ $c->stash->{uprn} ]), { value => 'URI' } ],
+        url => $c->uri_for_action('waste/bin_days', [ $c->stash->{uprn} ]),
+    );
+
+    my $events = $c->cobrand->bin_future_collections;
+    my $stamp = DateTime->now->strftime('%Y%m%dT%H%M%SZ');
+    foreach (@$events) {
+        my $event = Data::ICal::Entry::Event->new;
+        $event->add_properties(
+            summary => $_->{summary},
+            description => $_->{desc},
+            dtstamp => $stamp,
+            dtstart => [ $_->{date}->ymd(''), { value => 'DATE' } ],
+            dtend => [ $_->{date}->add(days=>1)->ymd(''), { value => 'DATE' } ],
+        );
+        $calendar->add_entry($event);
+    }
+
+    $c->res->body($calendar->as_string);
+}
+
 sub construct_bin_request_form {
     my $c = shift;
 
diff --git a/templates/web/base/waste/bin_days.html b/templates/web/base/waste/bin_days.html
index 0b51e9a47..e5a1d41c5 100644
--- a/templates/web/base/waste/bin_days.html
+++ b/templates/web/base/waste/bin_days.html
@@ -71,7 +71,7 @@
         <div class="aside-download">
           <h3>Download your collection schedule</h3>
           <ul>
-            <li><a href="#">Add to your calendar (.ics file)</a></li>
+            <li><a href="[% c.uri_for_action('waste/calendar', [ uprn ]) %]">Add to your calendar (.ics file)</a></li>
           </ul>
         </div>
        [% IF any_report_allowed OR any_request_allowed %]
-- 
cgit v1.2.3


From bc19b9e00f3d59a2f0694f2fcc3aab54fef35e9e Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 19 Oct 2020 11:05:04 +0100
Subject: [Bromley] ICal generation.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 28 ++++++++++++++++
 perllib/Integrations/Echo.pm           | 58 ++++++++++++++++++++++++++++++++++
 t/app/controller/waste.t               | 12 +++++++
 3 files changed, 98 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 6441180e3..ed96eb1bb 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -561,5 +561,33 @@ sub _parse_schedules {
     };
 }
 
+sub bin_future_collections {
+    my $self = shift;
+
+    my $services = $self->{c}->stash->{service_data};
+    my @tasks;
+    my %names;
+    foreach (@$services) {
+        push @tasks, $_->{service_task_id};
+        $names{$_->{service_task_id}} = $_->{service_name};
+    }
+
+    my $echo = $self->feature('echo');
+    $echo = Integrations::Echo->new(%$echo);
+    my $result = $echo->GetServiceTaskInstances(@tasks);
+
+    my $events = [];
+    foreach (@$result) {
+        my $task_id = $_->{ServiceTaskRef}{Value}{anyType};
+        my $tasks = Integrations::Echo::force_arrayref($_->{Instances}, 'ScheduledTaskInfo');
+        foreach (@$tasks) {
+            my $dt = construct_bin_date($_->{CurrentScheduledDate});
+            my $summary = $names{$task_id} . ' collection';
+            my $desc = '';
+            push @$events, { date => $dt, summary => $summary, desc => $desc };
+        }
+    }
+    return $events;
+}
 
 1;
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index 3bcbfc69b..7dc2e6948 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -2,8 +2,10 @@ package Integrations::Echo;
 
 use strict;
 use warnings;
+use DateTime;
 use Moo;
 use Tie::IxHash;
+use FixMyStreet;
 
 has attr => ( is => 'ro', default => 'http://www.twistedfish.com/xmlns/echo/api/v1' );
 has action => ( is => 'lazy', default => sub { $_[0]->attr . "/Service/" } );
@@ -21,6 +23,7 @@ has endpoint => (
         SOAP::Lite->soapversion(1.2);
         my $soap = SOAP::Lite->on_action( sub { $self->action . $_[1]; } )->proxy($self->url);
         $soap->serializer->register_ns("http://schemas.microsoft.com/2003/10/Serialization/Arrays", 'msArray'),
+        $soap->serializer->register_ns("http://schemas.datacontract.org/2004/07/System", 'dataContract');
         return $soap;
     },
 );
@@ -248,6 +251,61 @@ sub GetServiceUnitsForObject {
     return force_arrayref($res, 'ServiceUnit');
 }
 
+sub GetServiceTaskInstances {
+    my ($self, @tasks) = @_;
+
+    my @objects;
+    foreach (@tasks) {
+        my $obj = ixhash(
+            Key => 'Id',
+            Type => 'ServiceTask',
+            Value => [
+                { 'msArray:anyType' => $_ },
+            ],
+        );
+        push @objects, { ObjectRef => $obj };
+    }
+    my $start = DateTime->now->set_time_zone(FixMyStreet->local_time_zone)->truncate( to => 'day' );
+    my $end = $start->clone->add(months => 3);
+    my $query = ixhash(
+        From => dt_to_hash($start),
+        To => dt_to_hash($end),
+    );
+    return [
+        { ServiceTaskRef => { Value => { anyType => 401 } },
+            Instances => { ScheduledTaskInfo => [
+                { CurrentScheduledDate => { DateTime => '2020-07-01T00:00:00Z' } },
+            ] }
+        },
+        { ServiceTaskRef => { Value => { anyType => 402 } },
+            Instances => { ScheduledTaskInfo => [
+                { CurrentScheduledDate => { DateTime => '2020-07-08T00:00:00Z' } },
+            ] }
+        },
+    ] if $self->sample_data;
+    # uncoverable statement
+    my $res = $self->call('GetServiceTaskInstances',
+        serviceTaskRefs => \@objects,
+        query => $query,
+    );
+    return force_arrayref($res, 'ServiceTaskInstances');
+}
+
+sub ixhash {
+    tie (my %data, 'Tie::IxHash', @_);
+    return \%data;
+}
+
+sub dt_to_hash {
+    my $dt = shift;
+    my $utc = $dt->clone->set_time_zone('UTC');
+    $dt = ixhash(
+        'dataContract:DateTime' => $utc->ymd . 'T' . $utc->hms . 'Z',
+        'dataContract:OffsetMinutes' => $dt->offset / 60,
+    );
+    return $dt;
+}
+
 sub force_arrayref {
     my ($res, $key) = @_;
     return [] unless $res;
diff --git a/t/app/controller/waste.t b/t/app/controller/waste.t
index bbd0cd00a..9bc03e169 100644
--- a/t/app/controller/waste.t
+++ b/t/app/controller/waste.t
@@ -116,6 +116,18 @@ FixMyStreet::override_config {
         $mech->get_ok('/waste/uprn/1000000002/enquiry?service=1');
         is $mech->uri->path, '/waste/uprn/1000000002';
     };
+    subtest 'Checking calendar' => sub {
+        $mech->follow_link_ok({ text => 'Add to your calendar (.ics file)' });
+        $mech->content_contains('BEGIN:VCALENDAR');
+        my @events = split /BEGIN:VEVENT/, $mech->encoded_content;
+        shift @events; # Header
+        my $i = 0;
+        foreach (@events) {
+            $i++ if /DTSTART;VALUE=DATE:20200701/ && /SUMMARY:Refuse collection/;
+            $i++ if /DTSTART;VALUE=DATE:20200708/ && /SUMMARY:Paper & Cardboard/;
+        }
+        is $i, 2, 'Two events from the sample data in the calendar';
+    };
     subtest 'General enquiry, on behalf of someone else' => sub {
         $mech->log_in_ok($staff_user->email);
         $mech->get_ok('/waste/uprn/1000000002/enquiry?category=General+enquiry&service_id=537');
-- 
cgit v1.2.3


From 6337ebfd91a87eaf5efa077c5f9a9eff286c1f76 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 15 Jun 2020 21:02:37 +0100
Subject: [Bromley] Report missed bin within 2 working days.

---
 perllib/FixMyStreet/App/Controller/Waste.pm |  2 +-
 perllib/FixMyStreet/Cobrand/Bromley.pm      | 22 ++++++++++++++++++++++
 perllib/FixMyStreet/Cobrand/UK.pm           |  6 ++++++
 t/app/controller/waste.t                    | 15 +++++++++++++++
 templates/web/bromley/waste/services.html   |  4 ++++
 5 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/App/Controller/Waste.pm b/perllib/FixMyStreet/App/Controller/Waste.pm
index e606b1d8c..7556781cf 100644
--- a/perllib/FixMyStreet/App/Controller/Waste.pm
+++ b/perllib/FixMyStreet/App/Controller/Waste.pm
@@ -217,7 +217,7 @@ sub construct_bin_report_form {
     my $field_list = [];
 
     foreach (@{$c->stash->{service_data}}) {
-        next unless $_->{last};
+        next unless $_->{last} && $_->{report_allowed};
         my $id = $_->{service_id};
         my $name = $_->{service_name};
         push @$field_list, "service-$id" => {
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index ed96eb1bb..176762323 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -10,6 +10,7 @@ use Integrations::Echo;
 use Sort::Key::Natural qw(natkeysort_inplace);
 use Try::Tiny;
 use FixMyStreet::DateRange;
+use FixMyStreet::WorkingDays;
 
 sub council_area_id { return 2482; }
 sub council_area { return 'Bromley'; }
@@ -507,6 +508,7 @@ sub bin_services_for_address {
             id => $_->{Id},
             service_id => $_->{ServiceId},
             service_name => $service_name_override{$_->{ServiceId}} || $_->{ServiceName},
+            report_allowed => within_working_days($schedules->{last}{date}, 2),
             request_allowed => $request_allowed{$_->{ServiceId}},
             request_containers => $containers,
             request_max => $quantity_max{$_->{ServiceId}},
@@ -590,4 +592,24 @@ sub bin_future_collections {
     return $events;
 }
 
+=over
+
+=item within_working_days
+
+Given a DateTime object and a number, return true if today is less than or
+equal to that number of working days (excluding weekends and bank holidays)
+after the date.
+
+=back
+
+=cut
+
+sub within_working_days {
+    my ($dt, $days) = @_;
+    my $wd = FixMyStreet::WorkingDays->new(public_holidays => FixMyStreet::Cobrand::UK::public_holidays());
+    $dt = $wd->add_days($dt, $days)->ymd;
+    my $today = DateTime->now->set_time_zone(FixMyStreet->local_time_zone)->ymd;
+    return $today le $dt;
+}
+
 1;
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index 3ede055b9..988458e0f 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -452,6 +452,12 @@ sub check_recaptcha {
         unless $res->{success};
 }
 
+sub public_holidays {
+    my $nation = shift || 'england-and-wales';
+    my $json = _get_bank_holiday_json();
+    return [ map { $_->{date} } @{$json->{$nation}{events}} ];
+}
+
 sub is_public_holiday {
     my %args = @_;
     $args{date} ||= localtime;
diff --git a/t/app/controller/waste.t b/t/app/controller/waste.t
index 9bc03e169..85536981b 100644
--- a/t/app/controller/waste.t
+++ b/t/app/controller/waste.t
@@ -1,9 +1,15 @@
+use utf8;
 use Test::MockModule;
+use Test::MockTime qw(:all);
 use FixMyStreet::TestMech;
 
 FixMyStreet::App->log->disable('info');
 END { FixMyStreet::App->log->enable('info'); }
 
+# Mock fetching bank holidays
+my $uk = Test::MockModule->new('FixMyStreet::Cobrand::UK');
+$uk->mock('_fetch_url', sub { '{}' });
+
 my $mech = FixMyStreet::TestMech->new;
 
 my $body = $mech->create_body_ok(2482, 'Bromley Council');
@@ -44,6 +50,7 @@ FixMyStreet::override_config {
         $mech->content_contains('can’t find your address');
     };
     subtest 'Address lookup' => sub {
+        set_fixed_time('2020-05-28T17:00:00Z'); # After sample data collection
         $mech->get_ok('/waste');
         $mech->submit_form_ok({ with_fields => { postcode => 'BR1 1AA' } });
         $mech->submit_form_ok({ with_fields => { address => '1000000002' } });
@@ -51,7 +58,15 @@ FixMyStreet::override_config {
         $mech->content_contains('Food Waste');
     };
     subtest 'Report a missed bin' => sub {
+        $mech->content_contains('service-101', 'Can report, last collection was 27th');
+        $mech->content_contains('service-537', 'Can report, last collection was 27th');
+        $mech->content_lacks('service-535', 'Cannot report, last collection was 20th');
+        $mech->content_lacks('service-542', 'Cannot report, last collection was 18th');
         $mech->follow_link_ok({ text => 'Report a missed collection' });
+        $mech->content_contains('service-101', 'Checkbox, last collection was 27th');
+        $mech->content_contains('service-537', 'Checkbox, last collection was 27th');
+        $mech->content_lacks('service-535', 'No checkbox, last collection was 20th');
+        $mech->content_lacks('service-542', 'No checkbox, last collection was 18th');
         $mech->submit_form_ok({ form_number => 2 });
         $mech->content_contains('Please specify what was missed');
         $mech->submit_form_ok({ with_fields => { 'service-101' => 1 } });
diff --git a/templates/web/bromley/waste/services.html b/templates/web/bromley/waste/services.html
index 2caf41738..3f9f47753 100644
--- a/templates/web/bromley/waste/services.html
+++ b/templates/web/bromley/waste/services.html
@@ -1,9 +1,13 @@
+[% IF unit.report_allowed %]
   [% any_report_allowed = 1 %]
   <form method="post" action="[% c.uri_for_action('waste/report', [ uprn ]) %]">
     <input type="hidden" name="token" value="[% csrf_token %]">
     <input type="hidden" name="service-[% unit.service_id %]" value="1">
     <input type="submit" value="Report a [% unit.service_name FILTER lower %] collection as missed" class="waste-service-descriptor waste-service-link">
   </form>
+[% ELSE %]
+  <span class="waste-service-descriptor">Please note that missed collections can only be reported within 2 working days of your scheduled collection day.</span>
+[% END %]
   <a href="[% c.uri_for_action('waste/enquiry', [ uprn ]) %]?template=problem&amp;service_id=[% unit.service_id %]" class="waste-service-link waste-service-descriptor">Report a problem with a [% unit.service_name FILTER lower %] collection</a>
 [% IF unit.request_allowed %]
   [% any_request_allowed = 1 %]
-- 
cgit v1.2.3


From ac82484fb2e2acc95012d8ba0894b1165743b8ea Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 17 Jun 2020 16:57:01 +0100
Subject: [Bromley] Send sent confirmation for waste reports

---
 perllib/FixMyStreet/App/Controller/Report/New.pm |  2 +-
 perllib/FixMyStreet/Cobrand/Bromley.pm           |  8 ++++++++
 perllib/FixMyStreet/Queue/Item/Report.pm         |  2 +-
 t/app/controller/waste.t                         | 14 +++++++++++---
 templates/email/bromley/confirm_report_sent.html |  1 +
 templates/email/bromley/confirm_report_sent.txt  |  1 +
 6 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 templates/email/bromley/confirm_report_sent.html
 create mode 100644 templates/email/bromley/confirm_report_sent.txt

diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 98ebd4972..f64a109e8 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -1676,7 +1676,7 @@ sub redirect_or_confirm_creation : Private {
         $c->forward( 'create_related_things' );
         if ($c->stash->{contributing_as_another_user} && $report->user->email
             && $report->user->id != $c->user->id
-            && !$c->cobrand->report_sent_confirmation_email) {
+            && !$c->cobrand->report_sent_confirmation_email($report)) {
                 $c->send_email( 'other-reported.txt', {
                     to => [ [ $report->user->email, $report->name ] ],
                 } );
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 176762323..5fc03eb81 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -379,6 +379,14 @@ sub munge_load_and_group_problems {
     }
 }
 
+# We want to send confirmation emails only for Waste reports
+sub report_sent_confirmation_email {
+    my ($self, $report) = @_;
+    my $contact = $report->contact or return;
+    return 'id' if grep { $_ eq 'Waste' } @{$report->contact->groups};
+    return '';
+}
+
 sub munge_around_category_where {
     my ($self, $where) = @_;
     $where->{extra} = [ undef, { -not_like => '%Waste%' } ];
diff --git a/perllib/FixMyStreet/Queue/Item/Report.pm b/perllib/FixMyStreet/Queue/Item/Report.pm
index 60e9ad3dc..070b244bb 100644
--- a/perllib/FixMyStreet/Queue/Item/Report.pm
+++ b/perllib/FixMyStreet/Queue/Item/Report.pm
@@ -243,7 +243,7 @@ sub _send {
 sub _post_send {
     my ($self, $result) = @_;
 
-    my $send_confirmation_email = $self->cobrand_handler->report_sent_confirmation_email;
+    my $send_confirmation_email = $self->cobrand_handler->report_sent_confirmation_email($self->report);
     unless ($result) {
         $self->report->update( {
             whensent => \'current_timestamp',
diff --git a/t/app/controller/waste.t b/t/app/controller/waste.t
index 85536981b..9c7b9a3ac 100644
--- a/t/app/controller/waste.t
+++ b/t/app/controller/waste.t
@@ -2,6 +2,7 @@ use utf8;
 use Test::MockModule;
 use Test::MockTime qw(:all);
 use FixMyStreet::TestMech;
+use FixMyStreet::Script::Reports;
 
 FixMyStreet::App->log->disable('info');
 END { FixMyStreet::App->log->enable('info'); }
@@ -30,17 +31,18 @@ sub create_contact {
     $contact->update;
 }
 
-create_contact({ category => 'Report missed collection', email => 'missed' });
-create_contact({ category => 'Request new container', email => 'request' },
+create_contact({ category => 'Report missed collection', email => 'missed@example.org' });
+create_contact({ category => 'Request new container', email => 'request@example.org' },
     { code => 'Quantity', required => 1, automated => 'hidden_field' },
     { code => 'Container_Type', required => 1, automated => 'hidden_field' },
 );
-create_contact({ category => 'General enquiry', email => 'general' },
+create_contact({ category => 'General enquiry', email => 'general@example.org' },
     { code => 'Notes', description => 'Notes', required => 1, datatype => 'text' });
 
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => ['bromley', 'fixmystreet'],
     COBRAND_FEATURES => { echo => { bromley => { sample_data => 1 } }, waste => { bromley => 1 } },
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $mech->host('bromley.fixmystreet.com');
     subtest 'Missing address lookup' => sub {
@@ -82,6 +84,12 @@ FixMyStreet::override_config {
         $mech->content_contains($user->email);
         $mech->submit_form_ok({ with_fields => { process => 'summary' } });
         $mech->content_contains('Your report has been sent');
+        FixMyStreet::Script::Reports::send();
+        my @emails = $mech->get_email;
+        is $emails[0]->header('To'), '"Bromley Council" <missed@example.org>';
+        is $emails[1]->header('To'), $user->email;
+        my $body = $mech->get_text_body_from_email($emails[1]);
+        like $body, qr/Your report to Bromley Council has been logged/;
 
         is $user->alerts->count, 1;
     };
diff --git a/templates/email/bromley/confirm_report_sent.html b/templates/email/bromley/confirm_report_sent.html
new file mode 100644
index 000000000..5a0c19f0d
--- /dev/null
+++ b/templates/email/bromley/confirm_report_sent.html
@@ -0,0 +1 @@
+[% INCLUDE 'other-reported.html' %]
\ No newline at end of file
diff --git a/templates/email/bromley/confirm_report_sent.txt b/templates/email/bromley/confirm_report_sent.txt
new file mode 100644
index 000000000..72fe01f6d
--- /dev/null
+++ b/templates/email/bromley/confirm_report_sent.txt
@@ -0,0 +1 @@
+[% INCLUDE 'other-reported.txt' %]
\ No newline at end of file
-- 
cgit v1.2.3


From b2735e814c73fe76c8526563b7c5473281938833 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 18 Jun 2020 13:43:49 +0100
Subject: [Bromley] No updates on waste reports.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm                      | 10 ++++++++++
 t/app/controller/waste.t                                    |  4 ++++
 .../web/bromley/report/_updates_disallowed_message.html     | 13 +++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 templates/web/bromley/report/_updates_disallowed_message.html

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 5fc03eb81..c9e85a484 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -406,6 +406,16 @@ sub munge_report_new_contacts {
     $self->SUPER::munge_report_new_contacts($categories);
 }
 
+sub updates_disallowed {
+    my $self = shift;
+    my ($problem) = @_;
+
+    # No updates on waste reports
+    return 'waste' if $problem->cobrand_data eq 'waste';
+
+    return $self->next::method(@_);
+}
+
 sub bin_addresses_for_postcode {
     my $self = shift;
     my $pc = shift;
diff --git a/t/app/controller/waste.t b/t/app/controller/waste.t
index 9c7b9a3ac..fe1b369d9 100644
--- a/t/app/controller/waste.t
+++ b/t/app/controller/waste.t
@@ -99,8 +99,12 @@ FixMyStreet::override_config {
         is $res->code, 403;
         $mech->log_in_ok($user->email);
         $mech->get_ok('/report/' . $report->id);
+        $mech->content_lacks('Provide an update');
+        $report->update({ state => 'fixed - council' });
         $mech->log_in_ok($staff_user->email);
         $mech->get_ok('/report/' . $report->id);
+        $mech->content_lacks('Provide an update');
+        $mech->content_contains( '<a href="/waste/uprn/1000000002">See your bin collections</a>' );
 
         $mech->host('www.fixmystreet.com');
         $res = $mech->get('/report/' . $report->id);
diff --git a/templates/web/bromley/report/_updates_disallowed_message.html b/templates/web/bromley/report/_updates_disallowed_message.html
new file mode 100644
index 000000000..436bc6354
--- /dev/null
+++ b/templates/web/bromley/report/_updates_disallowed_message.html
@@ -0,0 +1,13 @@
+[% IF c.cobrand.updates_disallowed(problem) == 'waste';
+    SET uprn = problem.get_extra_field_value('uprn');
+%]
+<p>
+   <a href="/waste[% IF uprn %]/uprn/[% uprn %][% END %]">See your bin collections</a>.
+</p>
+[% ELSE %]
+<p>[% loc('This report is now closed to updates.') %]
+   [% tprintf(loc('You can <a href="%s">make a new report in the same location</a>.'),
+          c.uri_for( '/report/new', { longitude = longitude, latitude = latitude } )
+      ) %]
+</p>
+[% END %]
-- 
cgit v1.2.3


From e8127dd563cb823a369104e505795e8897d2c1ad Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Wed, 30 Sep 2020 10:53:01 +0100
Subject: [Bromley] Add partner logos to bottom of waste pages

---
 templates/web/bromley/footer.html                  |   8 +++++
 .../report/_updates_disallowed_message.html        |   9 ++++++
 web/cobrands/bromley/base.scss                     |  34 +++++++++++++++++++++
 web/cobrands/bromley/images/logo-societyworks.png  | Bin 0 -> 3987 bytes
 web/cobrands/bromley/images/logo-societyworks.svg  |   1 +
 web/cobrands/bromley/images/logo-veolia.png        | Bin 0 -> 2546 bytes
 web/cobrands/bromley/images/logo-veolia.svg        |   1 +
 web/cobrands/bromley/layout.scss                   |   4 +++
 8 files changed, 57 insertions(+)
 create mode 100644 web/cobrands/bromley/images/logo-societyworks.png
 create mode 100644 web/cobrands/bromley/images/logo-societyworks.svg
 create mode 100644 web/cobrands/bromley/images/logo-veolia.png
 create mode 100644 web/cobrands/bromley/images/logo-veolia.svg

diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html
index 914ba3ace..47ffc4161 100644
--- a/templates/web/bromley/footer.html
+++ b/templates/web/bromley/footer.html
@@ -2,6 +2,14 @@
                     <footer role="contentinfo">
                         [% INCLUDE 'front/footer-marketing.html' %]
                     </footer>
+                    [% ELSIF bodyclass == 'waste' %]
+                    <div class="bromley-waste-credits">
+                        <p>Powered by</p>
+                        <p>
+                            <a href="https://www.veolia.co.uk">Veolia</a>
+                            <a href="https://www.societyworks.org/services/waste/">SocietyWorks</a>
+                        </p>
+                    </div>
                     [% END %]
                 </div><!-- .content role=main -->
             </div><!-- .container -->
diff --git a/templates/web/bromley/report/_updates_disallowed_message.html b/templates/web/bromley/report/_updates_disallowed_message.html
index 436bc6354..904846004 100644
--- a/templates/web/bromley/report/_updates_disallowed_message.html
+++ b/templates/web/bromley/report/_updates_disallowed_message.html
@@ -4,6 +4,15 @@
 <p>
    <a href="/waste[% IF uprn %]/uprn/[% uprn %][% END %]">See your bin collections</a>.
 </p>
+
+<div class="bromley-waste-credits">
+    <p>Powered by</p>
+    <p>
+        <a href="https://www.veolia.co.uk">Veolia</a>
+        <a href="https://www.societyworks.org/services/waste/">SocietyWorks</a>
+    </p>
+</div>
+
 [% ELSE %]
 <p>[% loc('This report is now closed to updates.') %]
    [% tprintf(loc('You can <a href="%s">make a new report in the same location</a>.'),
diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss
index ab4a476e8..e37b2e0fe 100644
--- a/web/cobrands/bromley/base.scss
+++ b/web/cobrands/bromley/base.scss
@@ -490,3 +490,37 @@ body.mappage {
   }
 }
 
+.bromley-waste-credits {
+  margin-top: 6em;
+  margin-bottom: 1em;
+
+  p {
+    font-size: 0.875em;
+    color: #666;
+    margin-bottom: 0;
+  }
+
+  a {
+    display: inline-block;
+    height: 0;
+    padding-top: 40px;
+    overflow: hidden;
+    margin-right: 1.5em;
+    margin-top: 0.5em;
+
+    &[href*="veolia"] {
+      width: 160px;
+      background: transparent none 0 0 no-repeat;
+      @include svg-background-image('/cobrands/bromley/images/logo-veolia');
+      background-size: 160px 40px;
+    }
+
+    &[href*="societyworks"] {
+      width: 193px;
+      background: transparent none 0 0 no-repeat;
+      @include svg-background-image('/cobrands/bromley/images/logo-societyworks');
+      background-size: 193px 40px;
+      vertical-align: -4px;
+    }
+  }
+}
diff --git a/web/cobrands/bromley/images/logo-societyworks.png b/web/cobrands/bromley/images/logo-societyworks.png
new file mode 100644
index 000000000..e6cdde1d1
Binary files /dev/null and b/web/cobrands/bromley/images/logo-societyworks.png differ
diff --git a/web/cobrands/bromley/images/logo-societyworks.svg b/web/cobrands/bromley/images/logo-societyworks.svg
new file mode 100644
index 000000000..baf03d2dc
--- /dev/null
+++ b/web/cobrands/bromley/images/logo-societyworks.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="193" height="40" viewBox="0 0 193 40"><g fill="none"><path fill="#3B3F44" d="M53.036 10.658c-.097.17-.227.32-.382.439a.824.824 0 01-.512.146 1.241 1.241 0 01-.597-.175l-.728-.4a5.945 5.945 0 00-.93-.396 3.675 3.675 0 00-1.183-.175 2.536 2.536 0 00-1.707.507c-.378.338-.585.83-.562 1.34-.007.333.12.655.353.892.258.257.56.464.89.61.409.187.829.345 1.259.472.47.142.954.3 1.445.474.494.177.976.384 1.445.618.457.23.875.53 1.24.89.378.384.68.839.888 1.338.245.602.365 1.249.353 1.9a6.238 6.238 0 01-.424 2.31 5.328 5.328 0 01-1.226 1.874 5.706 5.706 0 01-1.983 1.26 7.4 7.4 0 01-2.678.458 8.441 8.441 0 01-1.675-.172 10.009 10.009 0 01-1.654-.482 9.454 9.454 0 01-1.494-.739 6.45 6.45 0 01-1.223-.953l1.212-1.932a.972.972 0 01.375-.357c.158-.09.337-.136.519-.135.261.006.515.088.731.235.248.154.523.325.834.51.338.204.693.376 1.06.515.454.162.933.24 1.414.232a2.676 2.676 0 001.728-.496c.44-.394.67-.976.618-1.568a1.488 1.488 0 00-.353-1.014 2.63 2.63 0 00-.89-.65 7.721 7.721 0 00-1.252-.45 37.316 37.316 0 01-1.438-.435 10.218 10.218 0 01-1.438-.586 4.54 4.54 0 01-1.254-.917 4.327 4.327 0 01-.887-1.428 5.662 5.662 0 01-.354-2.096 5.053 5.053 0 011.572-3.653 5.758 5.758 0 011.898-1.192 6.977 6.977 0 012.576-.447 9.553 9.553 0 011.58.129 8.14 8.14 0 012.745.978c.382.222.738.486 1.06.79l-.971 1.93zm8.774 1.375c.9-.012 1.794.14 2.639.448a5.677 5.677 0 013.37 3.328 7.3 7.3 0 01.473 2.696 7.413 7.413 0 01-.474 2.72 5.858 5.858 0 01-1.326 2.058 5.831 5.831 0 01-2.043 1.302 7.346 7.346 0 01-2.639.455 7.458 7.458 0 01-2.656-.455 6.008 6.008 0 01-2.062-1.302 5.833 5.833 0 01-1.337-2.058 7.412 7.412 0 01-.47-2.72 7.3 7.3 0 01.47-2.696c.295-.765.75-1.46 1.337-2.037a5.983 5.983 0 012.062-1.29c.85-.308 1.75-.46 2.656-.449zm0 10.209a2.158 2.158 0 001.943-.91c.416-.616.62-1.544.62-2.795 0-1.252-.204-2.177-.62-2.788a2.157 2.157 0 00-1.943-.918 2.226 2.226 0 00-1.975.91c-.416.612-.624 1.542-.624 2.788 0 1.252.208 2.18.624 2.795.45.629 1.2.977 1.975.918zm17.731-7.03a2.062 2.062 0 01-.328.331.715.715 0 01-.453.121.98.98 0 01-.506-.135l-.507-.298a3.96 3.96 0 00-.66-.296 2.74 2.74 0 00-.938-.135 2.628 2.628 0 00-1.201.256 2.23 2.23 0 00-.838.711c-.235.354-.4.749-.489 1.163-.11.51-.162 1.03-.157 1.55 0 1.21.232 2.134.713 2.788a2.249 2.249 0 001.933.974 2.71 2.71 0 001.045-.163 3.11 3.11 0 00.653-.356l.496-.355a.911.911 0 01.567-.171.782.782 0 01.68.327l1.1 1.351c-.357.42-.771.786-1.231 1.088a6.07 6.07 0 01-1.327.658c-.44.156-.896.267-1.359.33-.44.06-.885.09-1.33.09a5.722 5.722 0 01-2.215-.438 5.396 5.396 0 01-1.858-1.273 6.106 6.106 0 01-1.27-2.048 7.649 7.649 0 01-.466-2.777 7.83 7.83 0 01.406-2.55c.257-.76.669-1.46 1.21-2.054a5.567 5.567 0 011.978-1.37 6.908 6.908 0 012.725-.497 6.672 6.672 0 012.614.473c.76.324 1.449.796 2.026 1.387l-1.013 1.319zm6.638-6.497c.002.291-.06.578-.182.843a2.226 2.226 0 01-.498.707c-.215.2-.464.36-.736.474a2.312 2.312 0 01-.896.174 2.144 2.144 0 01-.865-.174 2.427 2.427 0 01-.711-.474 2.193 2.193 0 01-.487-.707 2.033 2.033 0 01-.178-.843c-.002-.295.059-.588.178-.86a2.24 2.24 0 01.487-.707c.205-.201.446-.362.711-.474a2.19 2.19 0 01.865-.17 2.336 2.336 0 011.632.644c.21.202.38.442.498.708.121.27.183.563.182.86zm-.438 3.44v12.56h-3.774v-12.56h3.774zm8.194-.122c.772-.01 1.54.12 2.267.388a4.924 4.924 0 011.749 1.13 5.174 5.174 0 011.147 1.818c.287.779.427 1.605.413 2.436.004.238-.007.475-.035.71a1.11 1.11 0 01-.13.427.52.52 0 01-.258.22 1.224 1.224 0 01-.413.06h-7.157c.119 1.066.434 1.819.948 2.291.542.487 1.25.742 1.973.71.378.008.754-.045 1.116-.156a5.93 5.93 0 00.829-.355l.671-.355c.198-.103.418-.157.64-.156a.765.765 0 01.672.327l1.078 1.35a5.51 5.51 0 01-1.239 1.086 6.279 6.279 0 01-1.367.657 7.336 7.336 0 01-1.4.33c-.443.059-.89.089-1.336.09a6.901 6.901 0 01-2.449-.43 5.667 5.667 0 01-1.997-1.283 6.081 6.081 0 01-1.354-2.13 7.98 7.98 0 01-.497-2.942c-.003-.818.141-1.629.427-2.394a5.78 5.78 0 013.148-3.331 6.238 6.238 0 012.554-.498zm.074 2.6a2.223 2.223 0 00-1.655.615 3.22 3.22 0 00-.79 1.776h4.638c0-.297-.038-.592-.116-.877a2.087 2.087 0 00-.37-.757 1.887 1.887 0 00-.676-.543 2.275 2.275 0 00-1.031-.214zm12.009 10.407a4.602 4.602 0 01-1.605-.256 3.076 3.076 0 01-1.888-1.88 4.399 4.399 0 01-.244-1.501V14.97h-1.077a.728.728 0 01-.503-.186.693.693 0 01-.212-.547v-1.452l2.029-.386.75-3.037a.756.756 0 01.836-.575h1.99v3.637h3.097v2.546h-3.098v6.18c-.007.25.069.496.216.702.145.19.378.295.62.28a1.245 1.245 0 00.607-.137l.198-.094a.505.505 0 01.212-.042.442.442 0 01.276.077.9.9 0 01.215.245l1.156 1.754a5.258 5.258 0 01-1.658.835 6.647 6.647 0 01-1.917.27zm10.825 3.483a1.063 1.063 0 01-1.19.73h-2.815l2.424-5.095-5.018-11.473h3.324c.241-.014.48.055.677.194.16.117.283.277.355.461l2.062 5.421c.19.49.349.993.475 1.503.078-.259.167-.51.266-.762.1-.252.188-.507.28-.765l1.868-5.397a.939.939 0 01.379-.468c.182-.121.395-.186.613-.187h3.034l-6.734 15.838z"/><path fill="#9E9A98" d="M125.203 7.163h1.954c.187-.007.371.05.522.161.134.1.232.24.28.4l3.593 12.2c.064.222.125.458.178.716.053.258.103.519.152.795.054-.276.11-.544.167-.802.053-.242.118-.48.195-.716l4.094-12.2a.876.876 0 01.283-.382.776.776 0 01.515-.18h.68a.807.807 0 01.519.162c.13.103.229.242.283.4l4.069 12.207c.159.479.288.966.387 1.46.05-.271.092-.53.134-.772.037-.233.09-.462.156-.688l3.608-12.2a.751.751 0 01.273-.39.79.79 0 01.514-.17h1.834l-5.427 17.552h-2.11l-4.41-13.387a7.207 7.207 0 01-.24-.884c-.043.164-.079.322-.118.472-.039.15-.074.286-.113.412l-4.43 13.387h-2.129l-5.413-17.553zm28.956 4.87a6.309 6.309 0 012.428.449c.7.285 1.328.722 1.841 1.279.52.58.917 1.26 1.165 2a8.662 8.662 0 010 5.249 5.669 5.669 0 01-1.165 1.994c-.512.555-1.14.99-1.84 1.272a6.914 6.914 0 01-4.858 0 5.111 5.111 0 01-1.848-1.272 5.637 5.637 0 01-1.175-1.994 8.52 8.52 0 010-5.248 5.64 5.64 0 011.175-2.001 5.172 5.172 0 011.848-1.28 6.309 6.309 0 012.429-.447zm0 10.995c1.21 0 2.115-.407 2.715-1.222.6-.815.898-1.952.896-3.411 0-1.467-.3-2.61-.896-3.43-.597-.82-1.502-1.229-2.715-1.229a3.772 3.772 0 00-1.6.316c-.447.206-.837.52-1.133.914-.32.433-.55.926-.68 1.45a8.738 8.738 0 000 3.908 4.09 4.09 0 00.669 1.482c.3.388.689.7 1.133.906.507.223 1.057.33 1.61.316zm8.117 1.688V12.24h1.185a.651.651 0 01.465.137.864.864 0 01.173.468l.139 1.946a5.638 5.638 0 011.493-2.036 3.163 3.163 0 012.084-.72 3.18 3.18 0 01.883.115c.256.075.503.185.733.328l-.268 1.637a.345.345 0 01-.36.31 1.69 1.69 0 01-.5-.12 3.064 3.064 0 00-.94-.115 2.565 2.565 0 00-1.808.666 5.039 5.039 0 00-1.212 1.932v7.93h-2.067zM173.865 6.83v10.525h.556c.136.004.271-.018.399-.064.133-.068.253-.16.352-.273l3.878-4.165c.105-.118.224-.224.353-.315a.849.849 0 01.483-.124h1.953l-4.527 4.82a3.28 3.28 0 01-.331.355 1.958 1.958 0 01-.37.28c.143.095.275.207.391.334.123.132.234.276.331.429l4.78 6.084h-1.931a.894.894 0 01-.451-.107 1.176 1.176 0 01-.353-.319l-4.019-5.04a.937.937 0 00-.352-.334 1.43 1.43 0 00-.543-.078h-.6v5.878h-2.157V6.83h2.158zm17.01 7.747a.477.477 0 01-.449.266.853.853 0 01-.416-.131c-.152-.087-.34-.187-.566-.298a5.53 5.53 0 00-.796-.304 3.867 3.867 0 00-1.096-.139 3.26 3.26 0 00-.985.139 2.373 2.373 0 00-.751.382c-.197.151-.359.344-.473.564-.113.219-.17.462-.167.708-.01.288.088.57.274.79.202.224.443.409.711.546.329.164.672.3 1.025.404.38.117.771.244 1.173.376.402.13.794.283 1.174.442.368.156.712.36 1.025.606.296.246.538.55.711.893.194.394.288.83.274 1.269a4.008 4.008 0 01-.302 1.57c-.202.478-.51.905-.904 1.247a4.273 4.273 0 01-1.458.832 6.034 6.034 0 01-2 .301 6.25 6.25 0 01-2.336-.418 5.967 5.967 0 01-1.779-1.063l.509-.822a.77.77 0 01.23-.244.667.667 0 01.357-.085.82.82 0 01.462.17c.16.113.356.237.59.375.267.154.548.28.84.376.4.124.816.181 1.234.17.377.008.752-.047 1.11-.163.29-.094.559-.244.79-.443.203-.175.364-.395.47-.641a2.04 2.04 0 00.152-.776 1.293 1.293 0 00-.273-.843 2.325 2.325 0 00-.712-.57 5.744 5.744 0 00-1.028-.412c-.384-.117-.779-.24-1.18-.354a12.417 12.417 0 01-1.182-.443 4.035 4.035 0 01-1.017-.663 2.797 2.797 0 01-.712-.928 3.009 3.009 0 01-.274-1.34 3.252 3.252 0 01.292-1.353 3.31 3.31 0 01.854-1.137 4.18 4.18 0 011.376-.783 5.48 5.48 0 011.86-.29 5.894 5.894 0 012.185.382c.623.24 1.193.602 1.675 1.063l-.498.772z"/><path fill="#FFD877" d="M33.792 25.93V19.094l.03-.032-.03-.028-3.364-15.645L14.442 0 0 14.052V20.978l3.365 15.644L19.343 40l14.453-14.052-.029-.028.025.01zM11.53 21.356l4.477-4.352 6.291 1.333.101.473-4.467 4.352-6.29-1.333-.112-.473z"/><path fill="#3B3F44" d="M16.013 10.211l-5.694 5.606 1.326 6.256 6.293 1.348 5.693-5.605-1.325-6.256-6.293-1.349zM14.447 0l15.98 3.416 3.365 15.82.03.029-14.462 14.23L3.376 30.08.011 14.26l.018-.018L0 14.213 14.447 0z"/></g></svg>
\ No newline at end of file
diff --git a/web/cobrands/bromley/images/logo-veolia.png b/web/cobrands/bromley/images/logo-veolia.png
new file mode 100644
index 000000000..c4fd283d3
Binary files /dev/null and b/web/cobrands/bromley/images/logo-veolia.png differ
diff --git a/web/cobrands/bromley/images/logo-veolia.svg b/web/cobrands/bromley/images/logo-veolia.svg
new file mode 100644
index 000000000..9bd4f073b
--- /dev/null
+++ b/web/cobrands/bromley/images/logo-veolia.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="160" height="40" viewBox="0 0 160 40"><path fill="#ED1C24" d="M17.555 39.304C9.293 37.994 2.9 31.937 1.203 23.816.87 22.224.76 19.277.973 17.65 2.112 8.888 8.634 2.19 17.426.746c1.705-.28 5.114-.202 6.743.155 6.965 1.524 12.409 6.38 14.608 13.028.666 2.015.967 3.9.967 6.07 0 9.139-6.26 16.941-15.27 19.033-1.424.33-5.531.492-6.92.272zm2.02-8.845c-1.019-1.188-2.58-3.67-3.057-4.86-.433-1.082-.48-1.342-.481-2.737-.003-1.394.038-1.63.421-2.461.755-1.635 2.129-2.549 3.845-2.559 2.51-.014 4.356 2.142 4.344 5.075-.007 1.922-1.011 4.17-3.006 6.73l-1.153 1.479 1.114-.101a13.75 13.75 0 008.563-4.073c1.233-1.256 1.86-2.15 2.614-3.723.992-2.075 1.292-3.433 1.298-5.873.003-1.643-.06-2.315-.32-3.348C32.085 7.335 25.645 2.84 18.862 3.611 13.14 4.262 8.37 8.432 6.972 14.008c-.464 1.855-.459 4.888.013 6.651 1.42 5.304 5.643 9.247 10.934 10.207.578.105 1.308.197 1.62.204l.57.013-.535-.624zm77.501.988c-1.414-.26-3.139-.84-4.028-1.354-2.125-1.227-3.51-3.533-3.988-6.644-.214-1.39-.082-4.44.247-5.726.582-2.275 1.778-4.058 3.512-5.234 1.731-1.175 5.331-1.84 8.31-1.537 3.045.311 4.882 1.06 6.428 2.623 1.153 1.165 1.77 2.33 2.246 4.233.438 1.755.47 5.459.062 7.036-.89 3.441-2.936 5.51-6.329 6.398-1.56.41-4.795.512-6.46.205zm4.984-3.72c1.103-.49 1.595-.935 2.116-1.913.634-1.189.897-2.527.897-4.567 0-4.752-1.672-6.824-5.5-6.818-1.768.003-2.768.315-3.704 1.157-1.26 1.133-1.8 2.83-1.8 5.66 0 3.922 1.222 6.107 3.776 6.75.988.249 3.395.095 4.215-.27zM54.445 30.92c-.075-.193-1.993-4.54-4.262-9.66-2.269-5.121-4.125-9.366-4.125-9.434 0-.067.848-.122 1.885-.122 1.69 0 1.953.035 2.533.34.359.19.815.599 1.025.918.207.317 1.456 3.12 2.774 6.23 1.318 3.108 2.443 5.742 2.5 5.851.062.12 1.07-2.215 2.49-5.764 1.313-3.28 2.528-6.173 2.701-6.428.173-.256.606-.619.962-.806.59-.311.833-.341 2.736-.341h2.089l-4.032 8.919c-2.218 4.905-4.196 9.134-4.396 9.397-.617.81-1.372 1.091-3.164 1.176-1.56.074-1.581.071-1.716-.276zm20.756-.009c-2.753-.52-5.079-2.952-5.972-6.244-.458-1.69-.456-4.94.004-6.569.712-2.519 2.165-4.531 3.963-5.49 1.664-.887 2.22-.958 7.584-.968l4.845-.01v3.524l-4.188.073-4.188.074-.967.476c-.675.332-1.09.654-1.377 1.068-.405.584-.805 1.802-.805 2.45v.333l5.542.039 5.542.038v3.377l-5.542.038-5.542.039v.319c0 .175.108.704.24 1.174.325 1.161 1.12 2.052 2.223 2.49.79.312 1.09.336 4.987.387l4.148.055v3.5l-4.882-.017c-2.685-.01-5.212-.08-5.615-.156zm43.288-.12c-.578-.15-1.33-.417-1.672-.592-.884-.45-2.006-1.63-2.427-2.547-.662-1.446-.712-2.093-.718-9.268l-.005-6.754h1.541c1.333 0 1.611.044 2.056.322.982.616.946.366 1.027 7.24l.074 6.239.367.653c.264.47.572.758 1.096 1.027.714.367.806.376 4.295.423l3.565.049v3.5l-4.075-.008c-3.495-.007-4.223-.047-5.124-.283zm12.02-8.774c.04-8.624.055-9.086.32-9.477.465-.686 1.037-.889 2.694-.956l1.505-.06v9.053c0 9.99.032 9.635-.924 10.219-.39.237-.742.286-2.053.287h-1.583l.041-9.066zm6.944 8.894c.042-.107 1.783-4.126 3.871-8.93 4.25-9.783 4.284-9.842 5.738-10.217 1.023-.264 3.582-.28 3.787-.024.116.145 7.959 18.101 8.34 19.094.087.227-.08.25-1.834.25-2.857 0-3.311-.289-4.427-2.812l-.672-1.52-3.919-.039-3.918-.039-.15.396c-.083.217-.44.999-.795 1.736-.514 1.072-.768 1.429-1.265 1.773-.606.42-.672.432-2.726.478-1.7.039-2.09.01-2.03-.146zm13.68-7.94c-1.12-2.688-2.656-6.231-2.74-6.321-.089-.096-1.17 2.278-2.744 6.028l-.2.477h2.88c2.247 0 2.864-.04 2.804-.183z"/></svg>
\ No newline at end of file
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index f2e6c41c8..c802a2dd9 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -165,3 +165,7 @@ footer,
     }
   }
 }
+
+.bromley-waste-credits {
+  margin-bottom: 0;
+}
-- 
cgit v1.2.3


From d7aca19faade6fb8f4aa47213d0f38b14cb9854a Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 17 Jun 2020 15:56:04 +0100
Subject: [Bromley] Restrict waste lookups per day.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 14 ++++++++++++--
 perllib/Memcached.pm                   | 11 +++++++++++
 t/cobrand/bromley.t                    | 24 ++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index c9e85a484..263549e71 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -11,6 +11,7 @@ use Sort::Key::Natural qw(natkeysort_inplace);
 use Try::Tiny;
 use FixMyStreet::DateRange;
 use FixMyStreet::WorkingDays;
+use Memcached;
 
 sub council_area_id { return 2482; }
 sub council_area { return 'Bromley'; }
@@ -435,8 +436,17 @@ sub look_up_property {
     my $self = shift;
     my $uprn = shift;
 
-    my $echo = $self->feature('echo');
-    $echo = Integrations::Echo->new(%$echo);
+    my $cfg = $self->feature('echo');
+    my $echo = Integrations::Echo->new(%$cfg);
+
+    if ($cfg->{max_per_day}) {
+        my $today = DateTime->today->set_time_zone(FixMyStreet->local_time_zone)->ymd;
+        my $ip = $self->{c}->req->address;
+        my $key = FixMyStreet->test_mode ? "bromley-test" : "bromley-$ip-$today";
+        my $count = Memcached::increment($key, 86400) || 0;
+        $self->{c}->detach('/page_error_403_access_denied', []) if $count > $cfg->{max_per_day};
+    }
+
     my $result = $echo->GetPointAddress($uprn);
     return {
         id => $result->{Id},
diff --git a/perllib/Memcached.pm b/perllib/Memcached.pm
index d03897e5a..099440f82 100644
--- a/perllib/Memcached.pm
+++ b/perllib/Memcached.pm
@@ -33,4 +33,15 @@ sub delete {
     instance->delete(@_);
 }
 
+sub increment {
+    my $key = shift;
+    my $timeout = shift;
+    my $count = instance->incr($key);
+    if (!defined $count) {
+        instance->add($key, 0, $timeout);
+        $count = instance->incr($key);
+    };
+    return $count;
+}
+
 1;
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index f2b1c7a39..045fdd56d 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -1,8 +1,13 @@
 use CGI::Simple;
+use Test::MockModule;
 use FixMyStreet::TestMech;
 use FixMyStreet::Script::Reports;
 my $mech = FixMyStreet::TestMech->new;
 
+# Mock fetching bank holidays
+my $uk = Test::MockModule->new('FixMyStreet::Cobrand::UK');
+$uk->mock('_fetch_url', sub { '{}' });
+
 # Create test data
 my $user = $mech->create_user_ok( 'bromley@example.com', name => 'Bromley' );
 my $body = $mech->create_body_ok( 2482, 'Bromley Council');
@@ -247,4 +252,23 @@ subtest 'check heatmap page' => sub {
     };
 };
 
+subtest 'test waste max-per-day' => sub {
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => 'bromley',
+        COBRAND_FEATURES => {
+            echo => { bromley => { max_per_day => 1, sample_data => 1 } },
+            waste => { bromley => 1 }
+        },
+    }, sub {
+        SKIP: {
+            skip( "No memcached", 2 ) unless Memcached::increment('bromley-test');
+            Memcached::delete("bromley-test");
+            $mech->get_ok('/waste/uprn/12345');
+            $mech->get('/waste/uprn/12345');
+            is $mech->res->code, 403, 'Now forbidden';
+        }
+    };
+
+};
+
 done_testing();
-- 
cgit v1.2.3


From d90e1157ee31c374248da0db42b70456c37ddd5b Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 19 Jun 2020 14:56:07 +0100
Subject: [Bromley] Look for open events.

---
 perllib/FixMyStreet/App/Controller/Waste.pm |  4 +--
 perllib/FixMyStreet/Cobrand/Bromley.pm      | 37 ++++++++++++++++++++++++++
 perllib/Integrations/Echo.pm                | 40 +++++++++++++++++++++++++++++
 t/app/controller/waste.t                    |  7 +++++
 templates/web/bromley/waste/services.html   | 14 ++++++++--
 web/cobrands/sass/_waste.scss               |  4 +++
 6 files changed, 102 insertions(+), 4 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Waste.pm b/perllib/FixMyStreet/App/Controller/Waste.pm
index 7556781cf..7587795c8 100644
--- a/perllib/FixMyStreet/App/Controller/Waste.pm
+++ b/perllib/FixMyStreet/App/Controller/Waste.pm
@@ -136,7 +136,7 @@ sub construct_bin_request_form {
     my $field_list = [];
 
     foreach (@{$c->stash->{service_data}}) {
-        next unless $_->{next};
+        next unless $_->{next} && !$_->{request_open};
         my $name = $_->{service_name};
         my $containers = $_->{request_containers};
         my $max = $_->{request_max};
@@ -217,7 +217,7 @@ sub construct_bin_report_form {
     my $field_list = [];
 
     foreach (@{$c->stash->{service_data}}) {
-        next unless $_->{last} && $_->{report_allowed};
+        next unless $_->{last} && $_->{report_allowed} && !$_->{report_open};
         my $id = $_->{service_id};
         my $name = $_->{service_name};
         push @$field_list, "service-$id" => {
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 263549e71..8b6924f2d 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -522,6 +522,9 @@ sub bin_services_for_address {
     my $result = $echo->GetServiceUnitsForObject($property->{uprn});
     return [] unless @$result;
 
+    my $events = $echo->GetEventsForObject($property->{id});
+    my $open = $self->_parse_open_events($events);
+
     my @out;
     foreach (@$result) {
         next unless $_->{ServiceTasks};
@@ -532,12 +535,15 @@ sub bin_services_for_address {
         next unless $schedules->{next} or $schedules->{last};
 
         my $containers = $service_to_containers{$_->{ServiceId}};
+        my ($open_request) = grep { $_ } map { $open->{request}->{$_} } @$containers;
         my $row = {
             id => $_->{Id},
             service_id => $_->{ServiceId},
             service_name => $service_name_override{$_->{ServiceId}} || $_->{ServiceName},
             report_allowed => within_working_days($schedules->{last}{date}, 2),
+            report_open => $open->{missed}->{$_->{ServiceId}},
             request_allowed => $request_allowed{$_->{ServiceId}},
+            request_open => $open_request,
             request_containers => $containers,
             request_max => $quantity_max{$_->{ServiceId}},
             service_task_id => $servicetask->{Id},
@@ -553,6 +559,37 @@ sub bin_services_for_address {
     return \@out;
 }
 
+sub _parse_open_events {
+    my $self = shift;
+    my $events = shift;
+    my $open;
+    foreach (@$events) {
+        next if $_->{ResolvedDate} || $_->{ResolutionCodeId}; # Is this the right field?
+        my $event_type = $_->{EventTypeId};
+        my $service_id = $_->{ServiceId};
+        if ($event_type == 2104) { # Request
+            my $data = $_->{Data}{ExtensibleDatum};
+            my $container;
+            DATA: foreach (@$data) {
+                if ($_->{ChildData}) {
+                    foreach (@{$_->{ChildData}{ExtensibleDatum}}) {
+                        if ($_->{DatatypeName} eq 'Container Type') {
+                            $container = $_->{Value};
+                            last DATA;
+                        }
+                    }
+                }
+            }
+            my $report = $self->problems->search({ external_id => $_->{Guid} })->first;
+            $open->{request}->{$container} = $report ? { report => $report } : 1;
+        } elsif (2095 <= $event_type && $event_type <= 2103) { # Missed collection
+            my $report = $self->problems->search({ external_id => $_->{Guid} })->first;
+            $open->{missed}->{$service_id} = $report ? { report => $report } : 1;
+        }
+    }
+    return $open;
+}
+
 sub _parse_schedules {
     my $servicetask = shift;
     my $schedules = $servicetask->{ServiceTaskSchedules}{ServiceTaskSchedule};
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index 7dc2e6948..205e1178f 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -291,6 +291,46 @@ sub GetServiceTaskInstances {
     return force_arrayref($res, 'ServiceTaskInstances');
 }
 
+sub GetEventsForObject {
+    my ($self, $id, $type) = @_;
+    my $from = DateTime->now->set_time_zone(FixMyStreet->local_time_zone)->subtract(months => 3);
+    return [ {
+        # Missed collection for service 542
+        EventTypeId => 2100,
+        ServiceId => 542,
+    }, {
+        # Request for a new paper container
+        EventTypeId => 2104,
+        Data => { ExtensibleDatum => [
+            { Value => 2, DatatypeName => 'Source' },
+            {
+                ChildData => { ExtensibleDatum => [
+                    { Value => 1, DatatypeName => 'Action' },
+                    { Value => 12, DatatypeName => 'Container Type' },
+                ] },
+            },
+        ] },
+        ServiceId => 535,
+    } ] if $self->sample_data;
+    # uncoverable statement
+    my $res = $self->call('GetEventsForObject',
+        objectRef => ixhash(
+            Key => 'Id',
+            Type => 'PointAddress',
+            Value => { 'msArray:anyType' => $id },
+        ),
+        query => ixhash(
+            $type ? (EventTypeRef => ixhash(
+                Key => 'Id',
+                Type => 'EventType',
+                Value => { 'msArray:anyType' => $type },
+            )) : (),
+            From => dt_to_hash($from),
+        ),
+    );
+    return force_arrayref($res, 'Event');
+}
+
 sub ixhash {
     tie (my %data, 'Tie::IxHash', @_);
     return \%data;
diff --git a/t/app/controller/waste.t b/t/app/controller/waste.t
index fe1b369d9..aac898da9 100644
--- a/t/app/controller/waste.t
+++ b/t/app/controller/waste.t
@@ -59,6 +59,9 @@ FixMyStreet::override_config {
         $mech->content_contains('2 Example Street');
         $mech->content_contains('Food Waste');
     };
+    subtest 'Thing already requested' => sub {
+        $mech->content_contains('A food waste collection has been reported as missed');
+    };
     subtest 'Report a missed bin' => sub {
         $mech->content_contains('service-101', 'Can report, last collection was 27th');
         $mech->content_contains('service-537', 'Can report, last collection was 27th');
@@ -135,6 +138,10 @@ FixMyStreet::override_config {
         is $report->get_extra_field_value('Quantity'), 2;
         is $report->get_extra_field_value('Container_Type'), 1;
     };
+    subtest 'Thing already requested' => sub {
+        $mech->get_ok('/waste/uprn/1000000002');
+        $mech->content_contains('A new paper &amp; cardboard container request has been made');
+    };
     subtest 'General enquiry, bad data' => sub {
         $mech->get_ok('/waste/uprn/1000000002/enquiry');
         is $mech->uri->path, '/waste/uprn/1000000002';
diff --git a/templates/web/bromley/waste/services.html b/templates/web/bromley/waste/services.html
index 3f9f47753..41684ad8b 100644
--- a/templates/web/bromley/waste/services.html
+++ b/templates/web/bromley/waste/services.html
@@ -1,4 +1,9 @@
-[% IF unit.report_allowed %]
+[% IF unit.report_open %]
+  <span class="waste-service-descriptor">
+    A [% unit.service_name FILTER lower %] collection has been reported as missed
+    [% IF unit.report_open.report %] – <a href="[% unit.report_open.report.url %]" class="waste-service-link">check status</a>[% END %]
+  </span>
+[% ELSIF unit.report_allowed %]
   [% any_report_allowed = 1 %]
   <form method="post" action="[% c.uri_for_action('waste/report', [ uprn ]) %]">
     <input type="hidden" name="token" value="[% csrf_token %]">
@@ -9,7 +14,12 @@
   <span class="waste-service-descriptor">Please note that missed collections can only be reported within 2 working days of your scheduled collection day.</span>
 [% END %]
   <a href="[% c.uri_for_action('waste/enquiry', [ uprn ]) %]?template=problem&amp;service_id=[% unit.service_id %]" class="waste-service-link waste-service-descriptor">Report a problem with a [% unit.service_name FILTER lower %] collection</a>
-[% IF unit.request_allowed %]
+[% IF unit.request_open %]
+  <span class="waste-service-descriptor">
+    A new [% unit.service_name FILTER lower %] container request has been made
+    [% IF unit.request_open.report %] – <a href="[% unit.request_open.report.url %]" class="waste-service-link">check status</a>[% END %]
+  </span>
+[% ELSIF unit.request_allowed %]
   [% any_request_allowed = 1 %]
   <form method="post" action="[% c.uri_for_action('waste/request', [ uprn ]) %]">
     <input type="hidden" name="token" value="[% csrf_token %]">
diff --git a/web/cobrands/sass/_waste.scss b/web/cobrands/sass/_waste.scss
index 9ea957131..798335578 100644
--- a/web/cobrands/sass/_waste.scss
+++ b/web/cobrands/sass/_waste.scss
@@ -97,6 +97,7 @@ body.waste {
   transition: all 200ms ease-out;
   z-index: inherit;
   position: relative;
+  max-width: 100%;
   .js &.hidden-js {
     display: block;
     opacity: 0;
@@ -136,6 +137,9 @@ input[type="submit"].waste-service-link {
   &:focus {
     text-decoration: underline;
   }
+  &:visited {
+    color: $link-color;
+  }
 }
 
 .waste-service-name-link {
-- 
cgit v1.2.3


From b8fb6677b54f99e53105de0e242be94969a53567 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 19 Jun 2020 17:28:47 +0100
Subject: [Bromley] Treat some enquiries same as missed.

In terms of within-two-day and no existing open event.
---
 perllib/FixMyStreet/Cobrand/Bromley.pm           |  3 ++
 perllib/Integrations/Echo.pm                     |  5 +++-
 t/cobrand/bromley.t                              | 18 +++++++++++
 templates/web/bromley/waste/enquiry-problem.html | 38 +++++++++++++++++-------
 4 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 8b6924f2d..24210e3d6 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -546,6 +546,7 @@ sub bin_services_for_address {
             request_open => $open_request,
             request_containers => $containers,
             request_max => $quantity_max{$_->{ServiceId}},
+            enquiry_open_events => $open->{enquiry},
             service_task_id => $servicetask->{Id},
             service_task_name => $servicetask->{TaskTypeName},
             service_task_type_id => $servicetask->{TaskTypeId},
@@ -585,6 +586,8 @@ sub _parse_open_events {
         } elsif (2095 <= $event_type && $event_type <= 2103) { # Missed collection
             my $report = $self->problems->search({ external_id => $_->{Guid} })->first;
             $open->{missed}->{$service_id} = $report ? { report => $report } : 1;
+        } else { # General enquiry of some sort
+            $open->{enquiry}->{$event_type} = 1;
         }
     }
     return $open;
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index 205e1178f..48a0edc6c 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -295,9 +295,12 @@ sub GetEventsForObject {
     my ($self, $id, $type) = @_;
     my $from = DateTime->now->set_time_zone(FixMyStreet->local_time_zone)->subtract(months => 3);
     return [ {
-        # Missed collection for service 542
+        # Missed collection for service 542 (food waste)
         EventTypeId => 2100,
         ServiceId => 542,
+    }, { # And a gate not closed
+        EventTypeId => 2118,
+        ServiceId => 542,
     }, {
         # Request for a new paper container
         EventTypeId => 2104,
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index 045fdd56d..b31908f7d 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -1,5 +1,6 @@
 use CGI::Simple;
 use Test::MockModule;
+use Test::MockTime qw(:all);
 use FixMyStreet::TestMech;
 use FixMyStreet::Script::Reports;
 my $mech = FixMyStreet::TestMech->new;
@@ -252,6 +253,23 @@ subtest 'check heatmap page' => sub {
     };
 };
 
+subtest 'test open enquiries' => sub {
+    set_fixed_time('2020-05-19T12:00:00Z'); # After sample food waste collection
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => 'bromley',
+        COBRAND_FEATURES => {
+            echo => { bromley => { sample_data => 1 } },
+            waste => { bromley => 1 }
+        },
+    }, sub {
+        $mech->get_ok('/waste/uprn/12345');
+        $mech->follow_link_ok({ text => 'Report a problem with a food waste collection' });
+        $mech->content_contains('Waste spillage');
+        $mech->content_lacks('Gate not closed');
+    };
+
+};
+
 subtest 'test waste max-per-day' => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => 'bromley',
diff --git a/templates/web/bromley/waste/enquiry-problem.html b/templates/web/bromley/waste/enquiry-problem.html
index 948cb91f3..db4cb1848 100644
--- a/templates/web/bromley/waste/enquiry-problem.html
+++ b/templates/web/bromley/waste/enquiry-problem.html
@@ -1,13 +1,29 @@
-[% PROCESS waste/enquiry.html
+[%
+
+f = [];
+service_id = c.req.params.service_id;
+service = services.$service_id;
+IF service.report_allowed;
+    IF !service.enquiry_open_events.2118;
+        f.push( { value = 'Gate not closed', label = 'A gate or enclosure wasn’t closed after the collection' } );
+    END;
+    IF !service.enquiry_open_events.2119;
+        f.push( { value = 'Waste spillage', label = 'Bin contents were spilled during the collection' } );
+    END;
+    IF !service.enquiry_open_events.2120;
+        f.push( { value = 'Bin not returned', label = 'A bin wasn’t returned after the collection' } );
+    END;
+END;
+f.push(
+    { value = 'Crew behaviour', label = 'There was a problem with the crew’s behaviour' },
+    { value = 'Wrongful removal', label = 'Something was wrongly removed during the collection' },
+    { value = 'Damage to 3rd party', label = 'Someone else’s vehicle was damaged' },
+    { value = 'Damage to Property', label = 'My property was damaged' },
+    { value = 'Failure to deliver bin', label = 'My bin was not delivered' },
+);
+
+PROCESS waste/enquiry.html
     title = 'Report a problem'
-    field_options = [
-        { value = 'Gate not closed', label = 'A gate or enclosure wasn’t closed after the collection' },
-        { value = 'Waste spillage', label = 'Bin contents were spilled during the collection' },
-        { value = 'Bin not returned', label = 'A bin wasn’t returned after the collection' },
-        { value = 'Crew behaviour', label = 'There was a problem with the crew’s behaviour' },
-        { value = 'Wrongful removal', label = 'Something was wrongly removed during the collection' },
-        { value = 'Damage to 3rd party', label = 'Someone else’s vehicle was damaged' },
-        { value = 'Damage to Property', label = 'My property was damaged' },
-        { value = 'Failure to deliver bin', label = 'My bin was not delivered' },
-    ]
+    field_options = f;
+
 %]
-- 
cgit v1.2.3


From 09209f4168fed34837d11fb828aec33523b71737 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 23 Jun 2020 16:42:42 +0100
Subject: [Bromley] Only change endpoint config when needed.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm   | 2 +-
 t/open311/post-service-request-updates.t | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 24210e3d6..ff2a80b21 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -224,7 +224,7 @@ sub open311_config_updates {
     $params->{endpoints} = {
         service_request_updates => 'update.xml',
         update => 'update.xml'
-    };
+    } if $params->{endpoint} =~ /bromley.gov.uk/;
 }
 
 sub open311_pre_send {
diff --git a/t/open311/post-service-request-updates.t b/t/open311/post-service-request-updates.t
index 75711bd2d..03fcbeae4 100644
--- a/t/open311/post-service-request-updates.t
+++ b/t/open311/post-service-request-updates.t
@@ -16,7 +16,10 @@ my $params = {
     endpoint => 'endpoint',
     jurisdiction => 'home',
 };
-my $bromley = $mech->create_body_ok(2482, 'Bromley', { %$params, send_extended_statuses => 1, can_be_devolved => 1 });
+my $bromley = $mech->create_body_ok(2482, 'Bromley', { %$params,
+    endpoint => 'www.bromley.gov.uk',
+    send_extended_statuses => 1,
+    can_be_devolved => 1 });
 my $oxon = $mech->create_body_ok(2237, 'Oxfordshire', { %$params, id => "5" . $bromley->id });
 my $bucks = $mech->create_body_ok(2217, 'Buckinghamshire', $params);
 my $lewisham = $mech->create_body_ok(2492, 'Lewisham', $params);
@@ -34,6 +37,7 @@ subtest 'Check Open311 params' => sub {
     my %conf = $o->open311_params($bromley);
     is_deeply \%conf, {
         %$result,
+        endpoint => 'www.bromley.gov.uk',
         extended_statuses => 1,
         endpoints => { service_request_updates => 'update.xml', update => 'update.xml' },
         fixmystreet_body => $bromley,
-- 
cgit v1.2.3


From cabc4f91d55b952ab2521ec85ec745de4c354d8c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 23 Jun 2020 17:29:04 +0100
Subject: [Bromley] Script to update open waste reports.

---
 bin/fixmystreet.com/bromley-fetch-waste |  24 +++++
 perllib/FixMyStreet/Cobrand/Bromley.pm  | 149 +++++++++++++++++++++++++++++++-
 perllib/Integrations/Echo.pm            |  18 ++++
 t/cobrand/bromley.t                     | 124 +++++++++++++++++++++++++-
 4 files changed, 311 insertions(+), 4 deletions(-)
 create mode 100755 bin/fixmystreet.com/bromley-fetch-waste

diff --git a/bin/fixmystreet.com/bromley-fetch-waste b/bin/fixmystreet.com/bromley-fetch-waste
new file mode 100755
index 000000000..392905c83
--- /dev/null
+++ b/bin/fixmystreet.com/bromley-fetch-waste
@@ -0,0 +1,24 @@
+#!/usr/bin/env perl
+
+use v5.14;
+use warnings;
+
+BEGIN {
+    use File::Basename qw(dirname);
+    use File::Spec;
+    my $d = dirname(File::Spec->rel2abs($0));
+    require "$d/../../setenv.pl";
+}
+
+use Getopt::Long::Descriptive;
+use FixMyStreet::Cobrand::Bromley;
+
+my ($opts, $usage) = describe_options(
+    '%c %o',
+    ['verbose|v', 'more verbose output'],
+    ['help|h', "print usage message and exit" ],
+);
+$usage->die if $opts->help;
+
+my $cobrand = FixMyStreet::Cobrand::Bromley->new;
+$cobrand->waste_fetch_events($opts->verbose);
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index ff2a80b21..1e1212d7b 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -11,6 +11,7 @@ use Sort::Key::Natural qw(natkeysort_inplace);
 use Try::Tiny;
 use FixMyStreet::DateRange;
 use FixMyStreet::WorkingDays;
+use Open311::GetServiceRequestUpdates;
 use Memcached;
 
 sub council_area_id { return 2482; }
@@ -668,8 +669,6 @@ Given a DateTime object and a number, return true if today is less than or
 equal to that number of working days (excluding weekends and bank holidays)
 after the date.
 
-=back
-
 =cut
 
 sub within_working_days {
@@ -680,4 +679,150 @@ sub within_working_days {
     return $today le $dt;
 }
 
+=item waste_fetch_events
+
+Loop through all open waste events to see if there have been any updates
+
+=back
+
+=cut
+
+sub waste_fetch_events {
+    my ($self, $verbose) = @_;
+
+    my $body = $self->body;
+    my @contacts = $body->contacts->search({
+        send_method => 'Open311',
+        endpoint => { '!=', '' },
+    })->all;
+    die "Could not find any devolved contacts\n" unless @contacts;
+
+    my %open311_conf = (
+        endpoint => $contacts[0]->endpoint || '',
+        api_key => $contacts[0]->api_key || '',
+        jurisdiction => $contacts[0]->jurisdiction || '',
+        extended_statuses => $body->send_extended_statuses,
+    );
+    my $cobrand = $body->get_cobrand_handler;
+    $cobrand->call_hook(open311_config_updates => \%open311_conf)
+        if $cobrand;
+    my $open311 = Open311->new(%open311_conf);
+
+    my $updates = Open311::GetServiceRequestUpdates->new(
+        current_open311 => $open311,
+        current_body => $body,
+        system_user => $body->comment_user,
+        suppress_alerts => 0,
+        blank_updates_permitted => $body->blank_updates_permitted,
+    );
+
+    my $echo = $self->feature('echo');
+    $echo = Integrations::Echo->new(%$echo);
+
+    my $cfg = {
+        verbose => $verbose,
+        updates => $updates,
+        echo => $echo,
+        event_types => {},
+    };
+
+    my $reports = $self->problems->search({
+        external_id => { '!=', '' },
+        state => [ FixMyStreet::DB::Result::Problem->open_states() ],
+        category => [ map { $_->category } @contacts ],
+    });
+
+    while (my $report = $reports->next) {
+        print 'Fetching data for report ' . $report->id . "\n" if $verbose;
+
+        my $event = $cfg->{echo}->GetEvent($report->external_id);
+        my $request = $self->construct_waste_open311_update($cfg, $event) or next;
+
+        next if !$request->{status} || $request->{status} eq 'confirmed'; # Still in initial state
+        next unless $self->waste_check_last_update(
+            $cfg, $report, $request->{status}, $request->{external_status_code});
+
+        my $last_updated = construct_bin_date($event->{LastUpdatedDate});
+        $request->{comment_time} = $last_updated;
+
+        print "  Updating report to state $request->{status}, $request->{description} ($request->{external_status_code})\n" if $cfg->{verbose};
+        $cfg->{updates}->process_update($request, $report);
+    }
+}
+
+sub construct_waste_open311_update {
+    my ($self, $cfg, $event) = @_;
+
+    my $event_type = $cfg->{event_types}{$event->{EventTypeId}} ||= $self->waste_get_event_type($cfg, $event->{EventTypeId});
+    my $state_id = $event->{EventStateId};
+    my $resolution_id = $event->{ResolutionCodeId} || '';
+    my $status = $event_type->{states}{$state_id}{state};
+    my $description = $event_type->{resolution}{$resolution_id} || $event_type->{states}{$state_id}{name};
+    return {
+        description => $description,
+        status => $status,
+        update_id => 'waste',
+        external_status_code => $resolution_id,
+    };
+}
+
+sub waste_get_event_type {
+    my ($self, $cfg, $id) = @_;
+
+    my $event_type = $cfg->{echo}->GetEventType($id);
+
+    my $state_map = {
+        New => { New => 'confirmed' },
+        Pending => {
+            Unallocated => 'investigating',
+            'Allocated to Crew' => 'action scheduled',
+        },
+        Closed => {
+            Completed => 'fixed - council',
+            'Not Completed' => 'unable to fix',
+            Rejected => 'closed',
+        },
+    };
+
+    my $states = $event_type->{Workflow}->{States}->{State};
+    my $data;
+    foreach (@$states) {
+        my $core = $_->{CoreState}; # New/Pending/Closed
+        my $name = $_->{Name}; # New : Unallocated/Allocated to Crew : Completed/Not Completed/Rejected
+        $data->{states}{$_->{Id}} = {
+            core => $core,
+            name => $name,
+            state => $state_map->{$core}{$name},
+        };
+        my $codes = Integrations::Echo::force_arrayref($_->{ResolutionCodes}, 'StateResolutionCode');
+        foreach (@$codes) {
+            my $name = $_->{Name};
+            my $id = $_->{ResolutionCodeId};
+            $data->{resolution}{$id} = $name;
+        }
+    }
+    return $data;
+}
+
+# We only have the report's current state, no history, so must check current
+# against latest received update to see if state the same, and skip if so
+sub waste_check_last_update {
+    my ($self, $cfg, $report, $status, $resolution_id) = @_;
+
+    my $latest = $report->comments->search(
+        { external_id => 'waste', },
+        { order_by => { -desc => 'id' } }
+    )->first;
+
+    if ($latest) {
+        my $state = $cfg->{updates}->current_open311->map_state($status);
+        my $code = $latest->get_extra_metadata('external_status_code') || '';
+        if ($latest->problem_state eq $state && $code eq $resolution_id) {
+            print "  Latest update matches fetched state, skipping\n" if $cfg->{verbose};
+            return;
+        }
+    }
+    return 1;
+}
+
 1;
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index 48a0edc6c..9a5b65ec2 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -291,6 +291,24 @@ sub GetServiceTaskInstances {
     return force_arrayref($res, 'ServiceTaskInstances');
 }
 
+sub GetEvent {
+    my ($self, $guid) = @_;
+    $self->call('GetEvent', ref => ixhash(
+        Key => 'Guid',
+        Type => 'Event',
+        Value => { 'msArray:anyType' => $guid },
+    ));
+}
+
+sub GetEventType {
+    my ($self, $id) = @_;
+    $self->call('GetEventType', ref => ixhash(
+        Key => 'Id',
+        Type => 'EventType',
+        Value => { 'msArray:anyType' => $id },
+    ));
+}
+
 sub GetEventsForObject {
     my ($self, $id, $type) = @_;
     my $from = DateTime->now->set_time_zone(FixMyStreet->local_time_zone)->subtract(months => 3);
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index b31908f7d..3f3e8ed5d 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -1,6 +1,7 @@
 use CGI::Simple;
 use Test::MockModule;
 use Test::MockTime qw(:all);
+use Test::Output;
 use FixMyStreet::TestMech;
 use FixMyStreet::Script::Reports;
 my $mech = FixMyStreet::TestMech->new;
@@ -11,7 +12,8 @@ $uk->mock('_fetch_url', sub { '{}' });
 
 # Create test data
 my $user = $mech->create_user_ok( 'bromley@example.com', name => 'Bromley' );
-my $body = $mech->create_body_ok( 2482, 'Bromley Council');
+my $body = $mech->create_body_ok( 2482, 'Bromley Council',
+    { can_be_devolved => 1, comment_user => $user });
 my $contact = $mech->create_contact_ok(
     body_id => $body->id,
     category => 'Other',
@@ -32,7 +34,13 @@ $mech->create_contact_ok(
     email => 'tfl@example.org',
 );
 
-my $waste = $mech->create_contact_ok(body => $body, category => 'Report missed collection', email => 'missed');
+my $waste = $mech->create_contact_ok(
+    body => $body,
+    category => 'Report missed collection',
+    email => 'missed',
+    send_method => 'Open311',
+    endpoint => 'waste-endpoint',
+);
 $waste->set_extra_metadata(group => ['Waste']);
 $waste->update;
 
@@ -289,4 +297,116 @@ subtest 'test waste max-per-day' => sub {
 
 };
 
+package SOAP::Result;
+sub result { return $_[0]->{result}; }
+sub new { my $c = shift; bless { @_ }, $c; }
+
+package main;
+
+subtest 'updating of waste reports' => sub {
+    my $integ = Test::MockModule->new('SOAP::Lite');
+    $integ->mock(call => sub {
+        my ($cls, @args) = @_;
+        my $method = $args[0]->name;
+        if ($method eq 'GetEvent') {
+            my ($key, $type, $value) = ${$args[3]->value}->value;
+            my $external_id = ${$value->value}->value->value;
+            my ($waste, $event_state_id, $resolution_code) = split /-/, $external_id;
+            return SOAP::Result->new(result => {
+                EventStateId => $event_state_id,
+                EventTypeId => '2104',
+                LastUpdatedDate => { OffsetMinutes => 60, DateTime => '2020-06-24T14:00:00Z' },
+                ResolutionCodeId => $resolution_code,
+            });
+        } elsif ($method eq 'GetEventType') {
+            return SOAP::Result->new(result => {
+                Workflow => { States => { State => [
+                    { CoreState => 'New', Name => 'New', Id => 15001 },
+                    { CoreState => 'Pending', Name => 'Unallocated', Id => 15002 },
+                    { CoreState => 'Pending', Name => 'Allocated to Crew', Id => 15003 },
+                    { CoreState => 'Closed', Name => 'Completed', Id => 15004,
+                      ResolutionCodes => { StateResolutionCode => [
+                        { ResolutionCodeId => 201, Name => '' },
+                        { ResolutionCodeId => 202, Name => 'Spillage on Arrival' },
+                      ] } },
+                    { CoreState => 'Closed', Name => 'Not Completed', Id => 15005,
+                      ResolutionCodes => { StateResolutionCode => [
+                        { ResolutionCodeId => 203, Name => 'Nothing Found' },
+                        { ResolutionCodeId => 204, Name => 'Too Heavy' },
+                        { ResolutionCodeId => 205, Name => 'Inclement Weather' },
+                      ] } },
+                    { CoreState => 'Closed', Name => 'Rejected', Id => 15006,
+                      ResolutionCodes => { StateResolutionCode => [
+                        { ResolutionCodeId => 206, Name => 'Out of Time' },
+                        { ResolutionCodeId => 207, Name => 'Duplicate' },
+                      ] } },
+                ] } },
+            });
+        } else {
+            is $method, 'UNKNOWN';
+        }
+    });
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => 'bromley',
+        COBRAND_FEATURES => {
+            echo => { bromley => { url => 'https://www.example.org/' } },
+            waste => { bromley => 1 }
+        },
+    }, sub {
+        @reports = $mech->create_problems_for_body(2, $body->id, 'Report missed collection', {
+            category => 'Report missed collection',
+            cobrand_data => 'waste',
+        });
+        $reports[1]->update({ external_id => 'something-else' }); # To test loop
+        $report = $reports[0];
+        my $cobrand = FixMyStreet::Cobrand::Bromley->new;
+
+        $report->update({ external_id => 'waste-15001-' });
+        stdout_like {
+            $cobrand->waste_fetch_events(1);
+        } qr/Fetching data for report/;
+        $report->discard_changes;
+        is $report->comments->count, 0, 'No new update';
+        is $report->state, 'confirmed', 'No state change';
+
+        $report->update({ external_id => 'waste-15003-' });
+        stdout_like {
+            $cobrand->waste_fetch_events(1);
+        } qr/Updating report to state action scheduled, Allocated to Crew/;
+        $report->discard_changes;
+        is $report->comments->count, 1, 'A new update';
+        is $report->state, 'action scheduled', 'A state change';
+
+        $report->update({ external_id => 'waste-15003-' });
+        stdout_like {
+            $cobrand->waste_fetch_events(1);
+        } qr/Latest update matches fetched state/;
+        $report->discard_changes;
+        is $report->comments->count, 1, 'No new update';
+        is $report->state, 'action scheduled', 'State unchanged';
+
+        $report->update({ external_id => 'waste-15004-201' });
+        stdout_like {
+            $cobrand->waste_fetch_events(1);
+        } qr/Updating report to state fixed - council, Completed/;
+        $report->discard_changes;
+        is $report->comments->count, 2, 'A new update';
+        is $report->state, 'fixed - council', 'Changed to fixed';
+
+        $reports[1]->update({ state => 'fixed - council' });
+        stdout_like {
+            $cobrand->waste_fetch_events(1);
+        } qr/^$/, 'No open reports';
+
+        $report->update({ external_id => 'waste-15005-205', state => 'confirmed' });
+        stdout_like {
+            $cobrand->waste_fetch_events(1);
+        } qr/Updating report to state unable to fix, Inclement Weather/;
+        $report->discard_changes;
+        is $report->comments->count, 3, 'A new update';
+        is $report->state, 'unable to fix', 'A state change';
+    };
+};
+
 done_testing();
-- 
cgit v1.2.3


From 26ca5c069d168eded92b95abd3be0d7b7349b430 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 24 Jun 2020 22:44:37 +0100
Subject: [Bromley] Push notification from Echo.

Make sure a 200 response is always sent for a valid notification.
---
 .../FixMyStreet/App/Controller/Open311/Updates.pm  |  18 +++-
 perllib/FixMyStreet/App/Controller/Waste.pm        | 107 +++++++++++++++++++++
 t/cobrand/bromley.t                                |  84 +++++++++++++++-
 3 files changed, 204 insertions(+), 5 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Open311/Updates.pm b/perllib/FixMyStreet/App/Controller/Open311/Updates.pm
index d5754bab7..8881a1b87 100644
--- a/perllib/FixMyStreet/App/Controller/Open311/Updates.pm
+++ b/perllib/FixMyStreet/App/Controller/Open311/Updates.pm
@@ -43,6 +43,12 @@ sub receive : Regex('^open311/v2/servicerequestupdates.(xml|json)$') : Args(0) {
         $request->{$_} = $c->get_param($_) || $c->detach('bad_request', [ $_ ]);
     }
 
+    $c->forward('process_update', [ $body, $request ]);
+}
+
+sub process_update : Private {
+    my ($self, $c, $body, $request) = @_;
+
     my $updates = Open311::GetServiceRequestUpdates->new(
         system_user => $body->comment_user,
         current_body => $body,
@@ -51,16 +57,22 @@ sub receive : Regex('^open311/v2/servicerequestupdates.(xml|json)$') : Args(0) {
     my $p = $updates->find_problem($request);
     $c->detach('bad_request', [ 'not found' ]) unless $p;
 
-    my $comment = $p->comments->search( { external_id => $request->{update_id} } )->first;
-    $c->detach('bad_request', [ 'already exists' ]) if $comment;
+    $c->forward('check_existing', [ $p, $request, $updates ]);
 
-    $comment = $updates->process_update($request, $p);
+    my $comment = $updates->process_update($request, $p);
 
     my $data = { service_request_updates => { update_id => $comment->id } };
 
     $c->forward('/open311/format_output', [ $data ]);
 }
 
+sub check_existing : Private {
+    my ($self, $c, $p, $request, $updates) = @_;
+
+    my $comment = $p->comments->search( { external_id => $request->{update_id} } )->first;
+    $c->detach('bad_request', [ 'already exists' ]) if $comment;
+}
+
 sub bad_request : Private {
     my ($self, $c, $comment) = @_;
     $c->response->status(400);
diff --git a/perllib/FixMyStreet/App/Controller/Waste.pm b/perllib/FixMyStreet/App/Controller/Waste.pm
index 7587795c8..152c7c28e 100644
--- a/perllib/FixMyStreet/App/Controller/Waste.pm
+++ b/perllib/FixMyStreet/App/Controller/Waste.pm
@@ -11,6 +11,7 @@ use FixMyStreet::App::Form::Waste::AboutYou;
 use FixMyStreet::App::Form::Waste::Request;
 use FixMyStreet::App::Form::Waste::Report;
 use FixMyStreet::App::Form::Waste::Enquiry;
+use Open311::GetServiceRequestUpdates;
 
 sub auto : Private {
     my ( $self, $c ) = @_;
@@ -457,6 +458,112 @@ sub setup_categories_and_bodies : Private {
     @$contacts = grep { grep { $_ eq 'Waste' } @{$_->groups} } @$contacts;
 }
 
+sub receive_echo_event_notification : Path('/waste/echo') : Args(0) {
+    my ($self, $c) = @_;
+    $c->stash->{format} = 'xml';
+    $c->response->header(Content_Type => 'application/soap+xml');
+
+    require SOAP::Lite;
+
+    $c->detach('soap_error', [ 'Invalid method', 405 ]) unless $c->req->method eq 'POST';
+
+    my $echo = $c->cobrand->feature('echo');
+    $c->detach('soap_error', [ 'Missing config', 500 ]) unless $echo;
+
+    # Make sure we log entire request for debugging
+    $c->detach('soap_error', [ 'Missing body' ]) unless $c->req->body;
+    my $soap = join('', $c->req->body->getlines);
+    $c->log->info($soap);
+
+    my $body = $c->cobrand->body;
+    $c->detach('soap_error', [ 'Bad jurisdiction' ]) unless $body;
+
+    my $env = SOAP::Deserializer->deserialize($soap);
+
+    my $header = $env->header;
+    $c->detach('soap_error', [ 'Missing SOAP header' ]) unless $header;
+    my $action = $header->{Action};
+    $c->detach('soap_error', [ 'Incorrect Action' ]) unless $action && $action eq $echo->{receive_action};
+    $header = $header->{Security};
+    $c->detach('soap_error', [ 'Missing Security header' ]) unless $header;
+    my $token = $header->{UsernameToken};
+    $c->detach('soap_error', [ 'Authentication failed' ])
+        unless $token && $token->{Username} eq $echo->{receive_username} && $token->{Password} eq $echo->{receive_password};
+
+    my $event = $env->result;
+
+    my $cfg = { echo => Integrations::Echo->new(%$echo) };
+    my $request = $c->cobrand->construct_waste_open311_update($cfg, $event);
+    $request->{updated_datetime} = DateTime::Format::W3CDTF->format_datetime(DateTime->now);
+    $request->{service_request_id} = $event->{Guid};
+
+    my $updates = Open311::GetServiceRequestUpdates->new(
+        system_user => $body->comment_user,
+        current_body => $body,
+    );
+
+    my $p = $updates->find_problem($request);
+    if ($p) {
+        $c->forward('check_existing_update', [ $p, $request, $updates ]);
+        my $comment = $updates->process_update($request, $p);
+    }
+    # Still want to say it is okay, even if we did nothing with it
+    $c->forward('soap_ok');
+}
+
+sub soap_error : Private {
+    my ($self, $c, $comment, $code) = @_;
+    $code ||= 400;
+    $c->response->status($code);
+    my $type = $code == 500 ? 'Server' : 'Client';
+    $c->response->body(SOAP::Serializer->fault($type, "Bad request: $comment", soap_header()));
+}
+
+sub soap_ok : Private {
+    my ($self, $c) = @_;
+    $c->response->status(200);
+    my $method = SOAP::Data->name("NotifyEventUpdatedResponse")->attr({
+        xmlns => "http://www.twistedfish.com/xmlns/echo/api/v1"
+    });
+    $c->response->body(SOAP::Serializer->envelope(method => $method, soap_header()));
+}
+
+sub soap_header {
+    my $attr = "http://www.twistedfish.com/xmlns/echo/api/v1";
+    my $action = "NotifyEventUpdatedResponse";
+    my $header = SOAP::Header->name("Action")->attr({
+        xmlns => 'http://www.w3.org/2005/08/addressing',
+        'soap:mustUnderstand' => 1,
+    })->value("$attr/ReceiverService/$action");
+
+    my $dt = DateTime->now();
+    my $dt2 = $dt->clone->add(minutes => 5);
+    my $w3c = DateTime::Format::W3CDTF->new;
+    my $header2 = SOAP::Header->name("Security")->attr({
+        'soap:mustUnderstand' => 'true',
+        'xmlns' => 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'
+    })->value(
+        \SOAP::Header->name(
+            "Timestamp" => \SOAP::Header->value(
+                SOAP::Header->name('Created', $w3c->format_datetime($dt)),
+                SOAP::Header->name('Expires', $w3c->format_datetime($dt2)),
+            )
+        )->attr({
+            xmlns => "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd",
+        })
+    );
+    return ($header, $header2);
+}
+
+sub check_existing_update : Private {
+    my ($self, $c, $p, $request, $updates) = @_;
+
+    my $cfg = { updates => $updates };
+    $c->detach('soap_ok')
+        unless $c->cobrand->waste_check_last_update(
+            $cfg, $p, $request->{status}, $request->{external_status_code});
+}
+
 __PACKAGE__->meta->make_immutable;
 
 1;
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index 3f3e8ed5d..bb43890a2 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -13,7 +13,7 @@ $uk->mock('_fetch_url', sub { '{}' });
 # Create test data
 my $user = $mech->create_user_ok( 'bromley@example.com', name => 'Bromley' );
 my $body = $mech->create_body_ok( 2482, 'Bromley Council',
-    { can_be_devolved => 1, comment_user => $user });
+    { can_be_devolved => 1, send_extended_statuses => 1, comment_user => $user });
 my $contact = $mech->create_contact_ok(
     body_id => $body->id,
     category => 'Other',
@@ -275,7 +275,7 @@ subtest 'test open enquiries' => sub {
         $mech->content_contains('Waste spillage');
         $mech->content_lacks('Gate not closed');
     };
-
+    restore_time();
 };
 
 subtest 'test waste max-per-day' => sub {
@@ -407,6 +407,86 @@ subtest 'updating of waste reports' => sub {
         is $report->comments->count, 3, 'A new update';
         is $report->state, 'unable to fix', 'A state change';
     };
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => 'bromley',
+        COBRAND_FEATURES => {
+            echo => { bromley => {
+                url => 'https://www.example.org/',
+                receive_action => 'action',
+                receive_username => 'un',
+                receive_password => 'password',
+            } },
+            waste => { bromley => 1 }
+        },
+    }, sub {
+        FixMyStreet::App->log->disable('info');
+
+        $mech->get('/waste/echo');
+        is $mech->res->code, 405, 'Cannot GET';
+
+        $mech->post('/waste/echo', Content_Type => 'text/xml');
+        is $mech->res->code, 400, 'No body';
+
+        my $in = '<Envelope><Header><Action>bad-action</Action></Header><Body></Body></Envelope>';
+        $mech->post('/waste/echo', Content_Type => 'text/xml', Content => $in);
+        is $mech->res->code, 400, 'Bad action';
+
+        $in = '<Envelope><Header><Action>action</Action><Security><UsernameToken><Username></Username><Password></Password></UsernameToken></Security></Header><Body></Body></Envelope>';
+        $mech->post('/waste/echo', Content_Type => 'text/xml', Content => $in);
+        is $mech->res->code, 400, 'Bad auth';
+
+        $in = <<EOF;
+<?xml version="1.0" encoding="UTF-8"?>
+<Envelope>
+  <Header>
+    <Action>action</Action>
+    <Security><UsernameToken><Username>un</Username><Password>password</Password></UsernameToken></Security>
+  </Header>
+  <Body>
+    <NotifyEventUpdated>
+      <event>
+        <Guid>waste-15005-XXX</Guid>
+        <EventTypeId>2104</EventTypeId>
+        <EventStateId>15006</EventStateId>
+        <ResolutionCodeId>207</ResolutionCodeId>
+      </event>
+    </NotifyEventUpdated>
+  </Body>
+</Envelope>
+EOF
+
+        $mech->post('/waste/echo', Content_Type => 'text/xml', Content => $in);
+        is $mech->res->code, 200, 'OK response, even though event does not exist';
+        is $report->comments->count, 3, 'No new update';
+
+        $in = <<EOF;
+<?xml version="1.0" encoding="UTF-8"?>
+<Envelope>
+  <Header>
+    <Action>action</Action>
+    <Security><UsernameToken><Username>un</Username><Password>password</Password></UsernameToken></Security>
+  </Header>
+  <Body>
+    <NotifyEventUpdated>
+      <event>
+        <Guid>waste-15005-205</Guid>
+        <EventTypeId>2104</EventTypeId>
+        <EventStateId>15006</EventStateId>
+        <ResolutionCodeId>207</ResolutionCodeId>
+      </event>
+    </NotifyEventUpdated>
+  </Body>
+</Envelope>
+EOF
+        $mech->post('/waste/echo', Content_Type => 'text/xml', Content => $in);
+        #$report->update({ external_id => 'waste-15005-205', state => 'confirmed' });
+        is $report->comments->count, 4, 'A new update';
+        $report->discard_changes;
+        is $report->state, 'closed', 'A state change';
+
+        FixMyStreet::App->log->enable('info');
+    };
 };
 
 done_testing();
-- 
cgit v1.2.3


From 49dff7e4e4b7b6572cbf75ccb94383fe516f0e7c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 13 Jul 2020 17:43:09 +0100
Subject: [Bromley] Fetch/show completion date/resolution.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 20 ++++++++++++++++++++
 perllib/Integrations/Echo.pm           | 11 ++++++++++-
 t/cobrand/bromley.t                    | 26 ++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 1e1212d7b..4b1406316 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -527,6 +527,7 @@ sub bin_services_for_address {
     my $open = $self->_parse_open_events($events);
 
     my @out;
+    my %task_ref_to_row;
     foreach (@$result) {
         next unless $_->{ServiceTasks};
 
@@ -555,8 +556,26 @@ sub bin_services_for_address {
             last => $schedules->{last},
             next => $schedules->{next},
         };
+        if ($row->{last}) {
+            my $ref = join(',', @{$row->{last}{ref}});
+            $task_ref_to_row{$ref} = $row;
+        }
         push @out, $row;
     }
+    if (%task_ref_to_row) {
+        my $tasks = $echo->GetTasks(map { $_->{last}{ref} } values %task_ref_to_row);
+        foreach (@$tasks) {
+            my $ref = join(',', @{$_->{Ref}{Value}{anyType}});
+            my $completed = construct_bin_date($_->{CompletedDate});
+            my $state = $_->{State}{Name} || '';
+            my $resolution = $_->{Resolution}{Name} || '';
+
+            my $row = $task_ref_to_row{$ref};
+            $row->{last}{state} = $state;
+            $row->{last}{completed} = $completed;
+            $row->{last}{resolution} = $resolution;
+        }
+    }
 
     return \@out;
 }
@@ -622,6 +641,7 @@ sub _parse_schedules {
             $max_last = {
                 date => $d,
                 ordinal => ordinal($d->day),
+                ref => $last->{Ref}{Value}{anyType},
             };
         }
     }
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index 9a5b65ec2..c9eab0cfc 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -91,7 +91,12 @@ sub GetTasks {
 
     return [
         { Ref => { Value => { anyType => [ 123, 456 ] } }, CompletedDate => undef },
-        { Ref => { Value => { anyType => [ 234, 567 ] } }, CompletedDate => { DateTime => '2020-05-27T10:00:00Z' } },
+        {
+            Ref => { Value => { anyType => [ 234, 567 ] } },
+            State => { Name => 'Completed' },
+            Resolution => { Name => 'Wrong Bin Out' },
+            CompletedDate => { DateTime => '2020-05-27T10:00:00Z' }
+        },
         { Ref => { Value => { anyType => [ 345, 678 ] } }, CompletedDate => undef },
         { Ref => { Value => { anyType => [ 456, 789 ] } }, CompletedDate => undef },
     ] if $self->sample_data;
@@ -176,6 +181,7 @@ sub GetServiceUnitsForObject {
                 },
                 LastInstance => {
                     CurrentScheduledDate => { DateTime => '2020-05-27T00:00:00Z' },
+                    Ref => { Value => { anyType => [ 123, 456 ] } },
                 },
             } },
         } },
@@ -194,6 +200,7 @@ sub GetServiceUnitsForObject {
                 },
                 LastInstance => {
                     CurrentScheduledDate => { DateTime => '2020-05-27T00:00:00Z' },
+                    Ref => { Value => { anyType => [ 234, 567 ] } },
                 },
             } },
         } },
@@ -212,6 +219,7 @@ sub GetServiceUnitsForObject {
                 },
                 LastInstance => {
                     CurrentScheduledDate => { DateTime => '2020-05-20T00:00:00Z' },
+                    Ref => { Value => { anyType => [ 345, 678 ] } },
                 },
             } },
         } },
@@ -235,6 +243,7 @@ sub GetServiceUnitsForObject {
                 },
                 LastInstance => {
                     CurrentScheduledDate => { DateTime => '2020-05-18T00:00:00Z' },
+                    Ref => { Value => { anyType => [ 456, 789 ] } },
                 },
             } ] },
         } },
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index bb43890a2..3578f10fb 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -278,6 +278,32 @@ subtest 'test open enquiries' => sub {
     restore_time();
 };
 
+subtest 'test reporting before/after completion' => sub {
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => 'bromley',
+        COBRAND_FEATURES => {
+            echo => { bromley => { sample_data => 1 } },
+            waste => { bromley => 1 }
+        },
+    }, sub {
+        set_fixed_time('2020-05-27T11:00:00Z');
+        $mech->get_ok('/waste/uprn/12345');
+        $mech->content_contains('(completed at 10:00am)');
+        $mech->content_contains('Wrong Bin Out');
+        $mech->content_contains('Report a paper &amp; cardboard collection as missed');
+        set_fixed_time('2020-05-28T12:00:00Z');
+        $mech->get_ok('/waste/uprn/12345');
+        $mech->content_contains('Report a paper &amp; cardboard collection as missed');
+        set_fixed_time('2020-05-29T12:00:00Z');
+        $mech->get_ok('/waste/uprn/12345');
+        $mech->content_contains('Report a paper &amp; cardboard collection as missed');
+        set_fixed_time('2020-05-30T12:00:00Z');
+        $mech->get_ok('/waste/uprn/12345');
+        $mech->content_lacks('Report a paper &amp; cardboard collection as missed');
+    };
+    restore_time();
+};
+
 subtest 'test waste max-per-day' => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => 'bromley',
-- 
cgit v1.2.3


From 627daaad7d21817a301bcf604e15d230a4dca1c1 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 13 Jul 2020 17:43:56 +0100
Subject: [Bromley] No report allowed on day, not completed.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 6 +++++-
 t/cobrand/bromley.t                    | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 4b1406316..e84ea6f30 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -542,7 +542,6 @@ sub bin_services_for_address {
             id => $_->{Id},
             service_id => $_->{ServiceId},
             service_name => $service_name_override{$_->{ServiceId}} || $_->{ServiceName},
-            report_allowed => within_working_days($schedules->{last}{date}, 2),
             report_open => $open->{missed}->{$_->{ServiceId}},
             request_allowed => $request_allowed{$_->{ServiceId}},
             request_open => $open_request,
@@ -564,6 +563,7 @@ sub bin_services_for_address {
     }
     if (%task_ref_to_row) {
         my $tasks = $echo->GetTasks(map { $_->{last}{ref} } values %task_ref_to_row);
+        my $now = DateTime->now->set_time_zone(FixMyStreet->local_time_zone);
         foreach (@$tasks) {
             my $ref = join(',', @{$_->{Ref}{Value}{anyType}});
             my $completed = construct_bin_date($_->{CompletedDate});
@@ -574,6 +574,10 @@ sub bin_services_for_address {
             $row->{last}{state} = $state;
             $row->{last}{completed} = $completed;
             $row->{last}{resolution} = $resolution;
+            $row->{report_allowed} = within_working_days($row->{last}{date}, 2);
+            if (!$completed && $row->{last}{date}->ymd eq $now->ymd) {
+                $row->{report_allowed} = 0;
+            }
         }
     }
 
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index 3578f10fb..a60f72b0d 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -290,6 +290,7 @@ subtest 'test reporting before/after completion' => sub {
         $mech->get_ok('/waste/uprn/12345');
         $mech->content_contains('(completed at 10:00am)');
         $mech->content_contains('Wrong Bin Out');
+        $mech->content_lacks('Report a refuse collection');
         $mech->content_contains('Report a paper &amp; cardboard collection as missed');
         set_fixed_time('2020-05-28T12:00:00Z');
         $mech->get_ok('/waste/uprn/12345');
-- 
cgit v1.2.3


From 1a90fc2428eeca48347c8dc31f00ca6053e772bf Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 28 Jul 2020 14:23:04 +0100
Subject: [Bromley] Check service unit as well as property.

If someone else in a block of flats has reported a missed collection,
others in the same service unit should not be able to report also.

Fixes https://github.com/mysociety/fixmystreet-commercial/issues/1945
---
 perllib/FixMyStreet/Cobrand/Bromley.pm |  7 ++--
 perllib/Integrations/Echo.pm           | 66 ++++++++++++++++++++--------------
 t/app/controller/waste.t               |  5 +--
 t/cobrand/bromley.t                    | 10 +++---
 4 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index e84ea6f30..d91570f83 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -523,7 +523,7 @@ sub bin_services_for_address {
     my $result = $echo->GetServiceUnitsForObject($property->{uprn});
     return [] unless @$result;
 
-    my $events = $echo->GetEventsForObject($property->{id});
+    my $events = $echo->GetEventsForObject('PointAddress', $property->{id});
     my $open = $self->_parse_open_events($events);
 
     my @out;
@@ -536,13 +536,16 @@ sub bin_services_for_address {
 
         next unless $schedules->{next} or $schedules->{last};
 
+        my $events = $echo->GetEventsForObject('ServiceUnit', $_->{Id});
+        my $open_unit = $self->_parse_open_events($events);
+
         my $containers = $service_to_containers{$_->{ServiceId}};
         my ($open_request) = grep { $_ } map { $open->{request}->{$_} } @$containers;
         my $row = {
             id => $_->{Id},
             service_id => $_->{ServiceId},
             service_name => $service_name_override{$_->{ServiceId}} || $_->{ServiceName},
-            report_open => $open->{missed}->{$_->{ServiceId}},
+            report_open => $open->{missed}->{$_->{ServiceId}} || $open_unit->{missed}->{$_->{ServiceId}},
             request_allowed => $request_allowed{$_->{ServiceId}},
             request_open => $open_request,
             request_containers => $containers,
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index c9eab0cfc..ec21da8fa 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -90,13 +90,16 @@ sub GetTasks {
     }
 
     return [
-        { Ref => { Value => { anyType => [ 123, 456 ] } }, CompletedDate => undef },
         {
-            Ref => { Value => { anyType => [ 234, 567 ] } },
+            Ref => { Value => { anyType => [ 123, 456 ] } },
             State => { Name => 'Completed' },
             Resolution => { Name => 'Wrong Bin Out' },
             CompletedDate => { DateTime => '2020-05-27T10:00:00Z' }
         },
+        {
+            Ref => { Value => { anyType => [ 234, 567 ] } },
+            CompletedDate => undef
+        },
         { Ref => { Value => { anyType => [ 345, 678 ] } }, CompletedDate => undef },
         { Ref => { Value => { anyType => [ 456, 789 ] } }, CompletedDate => undef },
     ] if $self->sample_data;
@@ -319,41 +322,50 @@ sub GetEventType {
 }
 
 sub GetEventsForObject {
-    my ($self, $id, $type) = @_;
+    my ($self, $type, $id, $event_type) = @_;
     my $from = DateTime->now->set_time_zone(FixMyStreet->local_time_zone)->subtract(months => 3);
-    return [ {
-        # Missed collection for service 542 (food waste)
-        EventTypeId => 2100,
-        ServiceId => 542,
-    }, { # And a gate not closed
-        EventTypeId => 2118,
-        ServiceId => 542,
-    }, {
-        # Request for a new paper container
-        EventTypeId => 2104,
-        Data => { ExtensibleDatum => [
-            { Value => 2, DatatypeName => 'Source' },
-            {
-                ChildData => { ExtensibleDatum => [
-                    { Value => 1, DatatypeName => 'Action' },
-                    { Value => 12, DatatypeName => 'Container Type' },
-                ] },
-            },
-        ] },
-        ServiceId => 535,
-    } ] if $self->sample_data;
+    if ($self->sample_data) {
+        return [ {
+            # Missed collection for service 542 (food waste)
+            EventTypeId => 2100,
+            ServiceId => 542,
+        }, { # And a gate not closed
+            EventTypeId => 2118,
+            ServiceId => 542,
+        }, {
+            # Request for a new paper container
+            EventTypeId => 2104,
+            Data => { ExtensibleDatum => [
+                { Value => 2, DatatypeName => 'Source' },
+                {
+                    ChildData => { ExtensibleDatum => [
+                        { Value => 1, DatatypeName => 'Action' },
+                        { Value => 12, DatatypeName => 'Container Type' },
+                    ] },
+                },
+            ] },
+            ServiceId => 535,
+        } ] if $type eq 'PointAddress';
+        return [ {
+            # Missed collection for service 537 (paper)
+            EventTypeId => 2099,
+            ServiceId => 537,
+        } ] if $type eq 'ServiceUnit' && $id == 1002;
+        return [];
+    }
+
     # uncoverable statement
     my $res = $self->call('GetEventsForObject',
         objectRef => ixhash(
             Key => 'Id',
-            Type => 'PointAddress',
+            Type => $type,
             Value => { 'msArray:anyType' => $id },
         ),
         query => ixhash(
-            $type ? (EventTypeRef => ixhash(
+            $event_type ? (EventTypeRef => ixhash(
                 Key => 'Id',
                 Type => 'EventType',
-                Value => { 'msArray:anyType' => $type },
+                Value => { 'msArray:anyType' => $event_type },
             )) : (),
             From => dt_to_hash($from),
         ),
diff --git a/t/app/controller/waste.t b/t/app/controller/waste.t
index aac898da9..c86802631 100644
--- a/t/app/controller/waste.t
+++ b/t/app/controller/waste.t
@@ -61,15 +61,16 @@ FixMyStreet::override_config {
     };
     subtest 'Thing already requested' => sub {
         $mech->content_contains('A food waste collection has been reported as missed');
+        $mech->content_contains('A paper &amp; cardboard collection has been reported as missed'); # as part of service unit, not property
     };
     subtest 'Report a missed bin' => sub {
         $mech->content_contains('service-101', 'Can report, last collection was 27th');
-        $mech->content_contains('service-537', 'Can report, last collection was 27th');
+        $mech->content_lacks('service-537', 'Cannot report, last collection was 27th but the service unit has a report');
         $mech->content_lacks('service-535', 'Cannot report, last collection was 20th');
         $mech->content_lacks('service-542', 'Cannot report, last collection was 18th');
         $mech->follow_link_ok({ text => 'Report a missed collection' });
         $mech->content_contains('service-101', 'Checkbox, last collection was 27th');
-        $mech->content_contains('service-537', 'Checkbox, last collection was 27th');
+        $mech->content_lacks('service-537', 'No checkbox, last collection was 27th but the service unit has a report');
         $mech->content_lacks('service-535', 'No checkbox, last collection was 20th');
         $mech->content_lacks('service-542', 'No checkbox, last collection was 18th');
         $mech->submit_form_ok({ form_number => 2 });
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index a60f72b0d..c8683c017 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -290,17 +290,17 @@ subtest 'test reporting before/after completion' => sub {
         $mech->get_ok('/waste/uprn/12345');
         $mech->content_contains('(completed at 10:00am)');
         $mech->content_contains('Wrong Bin Out');
-        $mech->content_lacks('Report a refuse collection');
-        $mech->content_contains('Report a paper &amp; cardboard collection as missed');
+        $mech->content_lacks('Report a paper &amp; cardboard collection');
+        $mech->content_contains('Report a refuse collection');
         set_fixed_time('2020-05-28T12:00:00Z');
         $mech->get_ok('/waste/uprn/12345');
-        $mech->content_contains('Report a paper &amp; cardboard collection as missed');
+        $mech->content_contains('Report a refuse collection');
         set_fixed_time('2020-05-29T12:00:00Z');
         $mech->get_ok('/waste/uprn/12345');
-        $mech->content_contains('Report a paper &amp; cardboard collection as missed');
+        $mech->content_contains('Report a refuse collection');
         set_fixed_time('2020-05-30T12:00:00Z');
         $mech->get_ok('/waste/uprn/12345');
-        $mech->content_lacks('Report a paper &amp; cardboard collection as missed');
+        $mech->content_lacks('Report a refuse collection');
     };
     restore_time();
 };
-- 
cgit v1.2.3


From 6e51feec73dc05237055575e9409f38134271faf Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 28 Jul 2020 16:43:34 +0100
Subject: [Bromley] No missed reporting if task not okay.

Not Completed or Excess Waste Completed.

Fixes https://github.com/mysociety/fixmystreet-commercial/issues/1948
---
 perllib/FixMyStreet/Cobrand/Bromley.pm |  3 +++
 perllib/Integrations/Echo.pm           |  5 ++++-
 t/cobrand/bromley.t                    | 39 +++++++++++++++++-----------------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index d91570f83..add6ac6bb 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -581,6 +581,9 @@ sub bin_services_for_address {
             if (!$completed && $row->{last}{date}->ymd eq $now->ymd) {
                 $row->{report_allowed} = 0;
             }
+            if ($state eq 'Not Completed' || ($state eq 'Completed' && $resolution eq 'Excess Waste')) {
+                $row->{report_allowed} = 0;
+            }
         }
     }
 
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index ec21da8fa..2bd98b777 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -100,7 +100,10 @@ sub GetTasks {
             Ref => { Value => { anyType => [ 234, 567 ] } },
             CompletedDate => undef
         },
-        { Ref => { Value => { anyType => [ 345, 678 ] } }, CompletedDate => undef },
+        {
+            Ref => { Value => { anyType => [ 345, 678 ] } },
+            State => { Name => 'Not Completed' }
+        },
         { Ref => { Value => { anyType => [ 456, 789 ] } }, CompletedDate => undef },
     ] if $self->sample_data;
 
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index c8683c017..1925a44ca 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -261,31 +261,30 @@ subtest 'check heatmap page' => sub {
     };
 };
 
-subtest 'test open enquiries' => sub {
-    set_fixed_time('2020-05-19T12:00:00Z'); # After sample food waste collection
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => 'bromley',
-        COBRAND_FEATURES => {
-            echo => { bromley => { sample_data => 1 } },
-            waste => { bromley => 1 }
-        },
-    }, sub {
+FixMyStreet::override_config {
+    ALLOWED_COBRANDS => 'bromley',
+    COBRAND_FEATURES => {
+        echo => { bromley => { sample_data => 1 } },
+        waste => { bromley => 1 }
+    },
+}, sub {
+    subtest 'test open enquiries' => sub {
+        set_fixed_time('2020-05-19T12:00:00Z'); # After sample food waste collection
         $mech->get_ok('/waste/uprn/12345');
         $mech->follow_link_ok({ text => 'Report a problem with a food waste collection' });
         $mech->content_contains('Waste spillage');
         $mech->content_lacks('Gate not closed');
+        restore_time();
     };
-    restore_time();
-};
 
-subtest 'test reporting before/after completion' => sub {
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => 'bromley',
-        COBRAND_FEATURES => {
-            echo => { bromley => { sample_data => 1 } },
-            waste => { bromley => 1 }
-        },
-    }, sub {
+    subtest 'test crew reported issue' => sub {
+        set_fixed_time('2020-05-21T12:00:00Z'); # After sample container mix
+        $mech->get_ok('/waste/uprn/12345');
+        $mech->content_lacks('Report a mixed recycling ');
+        restore_time();
+    };
+
+    subtest 'test reporting before/after completion' => sub {
         set_fixed_time('2020-05-27T11:00:00Z');
         $mech->get_ok('/waste/uprn/12345');
         $mech->content_contains('(completed at 10:00am)');
@@ -301,8 +300,8 @@ subtest 'test reporting before/after completion' => sub {
         set_fixed_time('2020-05-30T12:00:00Z');
         $mech->get_ok('/waste/uprn/12345');
         $mech->content_lacks('Report a refuse collection');
+        restore_time();
     };
-    restore_time();
 };
 
 subtest 'test waste max-per-day' => sub {
-- 
cgit v1.2.3


From 8bcba7034241ec4fd0cdcd66d7c0fa2ba3686a6a Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 28 Jul 2020 17:07:00 +0100
Subject: [Bromley] Treat out-of-stock requests as open.

Even though it has a resolution code, it is still an open event.

Fixes https://github.com/mysociety/fixmystreet-commercial/issues/1946
---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 3 ++-
 perllib/Integrations/Echo.pm           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index add6ac6bb..45cafeb8d 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -595,7 +595,8 @@ sub _parse_open_events {
     my $events = shift;
     my $open;
     foreach (@$events) {
-        next if $_->{ResolvedDate} || $_->{ResolutionCodeId}; # Is this the right field?
+        next if $_->{ResolvedDate};
+        next if $_->{ResolutionCodeId} && $_->{ResolutionCodeId} != 584; # Out of Stock
         my $event_type = $_->{EventTypeId};
         my $service_id = $_->{ServiceId};
         if ($event_type == 2104) { # Request
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index 2bd98b777..d8608708e 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -336,7 +336,7 @@ sub GetEventsForObject {
             EventTypeId => 2118,
             ServiceId => 542,
         }, {
-            # Request for a new paper container
+            # Request for a new paper container, currently out of stock
             EventTypeId => 2104,
             Data => { ExtensibleDatum => [
                 { Value => 2, DatatypeName => 'Source' },
@@ -348,6 +348,7 @@ sub GetEventsForObject {
                 },
             ] },
             ServiceId => 535,
+            ResolutionCodeId => 584,
         } ] if $type eq 'PointAddress';
         return [ {
             # Missed collection for service 537 (paper)
-- 
cgit v1.2.3


From 45bd2f6427e81890fde87748280d6f75370bb13d Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 12 Oct 2020 10:34:00 +0100
Subject: [Bromley] Different lock out from time out message

---
 perllib/FixMyStreet/Cobrand/Bromley.pm    | 1 +
 t/cobrand/bromley.t                       | 1 +
 templates/web/bromley/waste/services.html | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 45cafeb8d..8175138ed 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -583,6 +583,7 @@ sub bin_services_for_address {
             }
             if ($state eq 'Not Completed' || ($state eq 'Completed' && $resolution eq 'Excess Waste')) {
                 $row->{report_allowed} = 0;
+                $row->{report_locked_out} = 1;
             }
         }
     }
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index 1925a44ca..dfd7cce1d 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -280,6 +280,7 @@ FixMyStreet::override_config {
     subtest 'test crew reported issue' => sub {
         set_fixed_time('2020-05-21T12:00:00Z'); # After sample container mix
         $mech->get_ok('/waste/uprn/12345');
+        $mech->content_contains('A missed collection cannot be reported, please see the last collection status above.');
         $mech->content_lacks('Report a mixed recycling ');
         restore_time();
     };
diff --git a/templates/web/bromley/waste/services.html b/templates/web/bromley/waste/services.html
index 41684ad8b..c417e1790 100644
--- a/templates/web/bromley/waste/services.html
+++ b/templates/web/bromley/waste/services.html
@@ -10,6 +10,8 @@
     <input type="hidden" name="service-[% unit.service_id %]" value="1">
     <input type="submit" value="Report a [% unit.service_name FILTER lower %] collection as missed" class="waste-service-descriptor waste-service-link">
   </form>
+[% ELSIF unit.report_locked_out %]
+  <span class="waste-service-descriptor">A missed collection cannot be reported, please see the last collection status above.</span>
 [% ELSE %]
   <span class="waste-service-descriptor">Please note that missed collections can only be reported within 2 working days of your scheduled collection day.</span>
 [% END %]
-- 
cgit v1.2.3


From 5e645b3e795e0d9a60425f0d8240c2263dc5a89d Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 21 Aug 2020 13:01:55 +0100
Subject: [Bromley] Check templates for completion message.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 11 ++++++++++-
 perllib/Integrations/Echo.pm           |  2 +-
 t/cobrand/bromley.t                    |  9 +++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 8175138ed..c984f1728 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -571,7 +571,16 @@ sub bin_services_for_address {
             my $ref = join(',', @{$_->{Ref}{Value}{anyType}});
             my $completed = construct_bin_date($_->{CompletedDate});
             my $state = $_->{State}{Name} || '';
+
             my $resolution = $_->{Resolution}{Name} || '';
+            my $resolution_id = $_->{Resolution}{Ref}{Value}{anyType};
+            if ($resolution_id) {
+                my $template = FixMyStreet::DB->resultset('ResponseTemplate')->search({
+                    'me.body_id' => $self->body->id,
+                    'me.external_status_code' => $resolution_id,
+                })->first;
+                $resolution = $template->text if $template;
+            }
 
             my $row = $task_ref_to_row{$ref};
             $row->{last}{state} = $state;
@@ -581,7 +590,7 @@ sub bin_services_for_address {
             if (!$completed && $row->{last}{date}->ymd eq $now->ymd) {
                 $row->{report_allowed} = 0;
             }
-            if ($state eq 'Not Completed' || ($state eq 'Completed' && $resolution eq 'Excess Waste')) {
+            if ($state eq 'Not Completed' || ($state eq 'Completed' && $_->{Resolution}{Name} eq 'Excess Waste')) {
                 $row->{report_allowed} = 0;
                 $row->{report_locked_out} = 1;
             }
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index d8608708e..5878cdfa1 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -93,7 +93,7 @@ sub GetTasks {
         {
             Ref => { Value => { anyType => [ 123, 456 ] } },
             State => { Name => 'Completed' },
-            Resolution => { Name => 'Wrong Bin Out' },
+            Resolution => { Ref => { Value => { anyType => 187 } }, Name => 'Wrong Bin Out' },
             CompletedDate => { DateTime => '2020-05-27T10:00:00Z' }
         },
         {
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index dfd7cce1d..8b2285458 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -290,6 +290,15 @@ FixMyStreet::override_config {
         $mech->get_ok('/waste/uprn/12345');
         $mech->content_contains('(completed at 10:00am)');
         $mech->content_contains('Wrong Bin Out');
+        FixMyStreet::DB->resultset('ResponseTemplate')->create({
+            body_id => $body->id,
+            title => 'Wrong bin',
+            text => 'We could not collect your waste as it was not correctly presented.',
+            external_status_code => 187,
+        });
+        $mech->get_ok('/waste/uprn/12345');
+        $mech->content_contains('(completed at 10:00am)');
+        $mech->content_contains('We could not collect your waste as it was not correctly presented.');
         $mech->content_lacks('Report a paper &amp; cardboard collection');
         $mech->content_contains('Report a refuse collection');
         set_fixed_time('2020-05-28T12:00:00Z');
-- 
cgit v1.2.3


From 2e1c10996a0a08b9bf50af05300fef5c253854e7 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 5 Oct 2020 14:16:42 +0100
Subject: [Bromley] Nuanced template resolution codes.

Have the response template external status code be a combination
of resolution code, task type ID, and task state.
---
 .../FixMyStreet/App/Controller/Admin/Templates.pm  |  5 ++++-
 perllib/FixMyStreet/Cobrand/Bromley.pm             | 22 ++++++++++++++++++--
 perllib/Integrations/Echo.pm                       |  1 +
 t/cobrand/bromley.t                                | 18 ++++++++++++----
 templates/web/base/admin/templates/_external.html  | 12 +++++++++++
 templates/web/base/admin/templates/edit.html       | 13 +-----------
 .../web/bromley/admin/templates/_external.html     | 24 ++++++++++++++++++++++
 7 files changed, 76 insertions(+), 19 deletions(-)
 create mode 100644 templates/web/base/admin/templates/_external.html
 create mode 100644 templates/web/bromley/admin/templates/_external.html

diff --git a/perllib/FixMyStreet/App/Controller/Admin/Templates.pm b/perllib/FixMyStreet/App/Controller/Admin/Templates.pm
index f933c5f8a..9fb401e2b 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Templates.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Templates.pm
@@ -100,7 +100,10 @@ sub edit : Path : Args(2) {
 
             $template->text( $c->get_param('text') );
             $template->state( $c->get_param('state') );
-            $template->external_status_code( $c->get_param('external_status_code') );
+
+            my $ext_code = $c->cobrand->call_hook('admin_templates_external_status_code_hook');
+            $ext_code ||= $c->get_param('external_status_code');
+            $template->external_status_code($ext_code);
 
             if ( $template->state && $template->external_status_code ) {
                 $c->stash->{errors} ||= {};
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index c984f1728..e098815db 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -571,13 +571,20 @@ sub bin_services_for_address {
             my $ref = join(',', @{$_->{Ref}{Value}{anyType}});
             my $completed = construct_bin_date($_->{CompletedDate});
             my $state = $_->{State}{Name} || '';
+            my $task_type_id = $_->{TaskTypeId} || '';
 
             my $resolution = $_->{Resolution}{Name} || '';
             my $resolution_id = $_->{Resolution}{Ref}{Value}{anyType};
             if ($resolution_id) {
                 my $template = FixMyStreet::DB->resultset('ResponseTemplate')->search({
                     'me.body_id' => $self->body->id,
-                    'me.external_status_code' => $resolution_id,
+                    'me.external_status_code' => [
+                        "$resolution_id,$task_type_id,$state",
+                        "$resolution_id,$task_type_id,",
+                        "$resolution_id,,$state",
+                        "$resolution_id,,",
+                        $resolution_id,
+                    ],
                 })->first;
                 $resolution = $template->text if $template;
             }
@@ -803,7 +810,7 @@ sub construct_waste_open311_update {
         description => $description,
         status => $status,
         update_id => 'waste',
-        external_status_code => $resolution_id,
+        external_status_code => "$resolution_id,,",
     };
 }
 
@@ -866,4 +873,15 @@ sub waste_check_last_update {
     return 1;
 }
 
+sub admin_templates_external_status_code_hook {
+    my ($self) = @_;
+    my $c = $self->{c};
+
+    my $res_code = $c->get_param('resolution_code') || '';
+    my $task_type = $c->get_param('task_type') || '';
+    my $task_state = $c->get_param('task_state') || '';
+
+    return "$res_code,$task_type,$task_state";
+}
+
 1;
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index 5878cdfa1..0216240da 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -94,6 +94,7 @@ sub GetTasks {
             Ref => { Value => { anyType => [ 123, 456 ] } },
             State => { Name => 'Completed' },
             Resolution => { Ref => { Value => { anyType => 187 } }, Name => 'Wrong Bin Out' },
+            TaskTypeId => 3216,
             CompletedDate => { DateTime => '2020-05-27T10:00:00Z' }
         },
         {
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index 8b2285458..3b01d308f 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -290,12 +290,22 @@ FixMyStreet::override_config {
         $mech->get_ok('/waste/uprn/12345');
         $mech->content_contains('(completed at 10:00am)');
         $mech->content_contains('Wrong Bin Out');
-        FixMyStreet::DB->resultset('ResponseTemplate')->create({
-            body_id => $body->id,
+    };
+
+    subtest 'test template creation' => sub {
+        $mech->log_in_ok('superuser@example.com');
+        $mech->get_ok('/admin/templates/' . $body->id . '/new');
+        $mech->submit_form_ok({ with_fields => {
             title => 'Wrong bin',
             text => 'We could not collect your waste as it was not correctly presented.',
-            external_status_code => 187,
-        });
+            resolution_code => 187,
+            task_type => 3216,
+            task_state => 'Completed',
+        } });
+        $mech->log_out_ok;
+    };
+
+    subtest 'test reporting before/after completion' => sub {
         $mech->get_ok('/waste/uprn/12345');
         $mech->content_contains('(completed at 10:00am)');
         $mech->content_contains('We could not collect your waste as it was not correctly presented.');
diff --git a/templates/web/base/admin/templates/_external.html b/templates/web/base/admin/templates/_external.html
new file mode 100644
index 000000000..d25d2b39c
--- /dev/null
+++ b/templates/web/base/admin/templates/_external.html
@@ -0,0 +1,12 @@
+[% IF errors.external_status_code %]
+    <div class="form-error">[% errors.external_status_code %]</div>
+[% END %]
+<div class="admin-hint">
+  <p>
+    [% loc('If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here.') %]
+  </p>
+</div>
+<p>
+  <label for="external_status_code">[% loc('External status code') %]</label>
+  <input type="text" id="external_status_code" name="external_status_code" class="form-control" size="30" value="[% rt.external_status_code | html %]">
+</p>
diff --git a/templates/web/base/admin/templates/edit.html b/templates/web/base/admin/templates/edit.html
index 7ce67f96f..f52c26b49 100644
--- a/templates/web/base/admin/templates/edit.html
+++ b/templates/web/base/admin/templates/edit.html
@@ -51,18 +51,7 @@
       [% INCLUDE 'report/inspect/state_groups_select.html' current_state=rt.state include_empty=1 %]
     </p>
 
-    [% IF errors.external_status_code %]
-        <div class="form-error">[% errors.external_status_code %]</div>
-    [% END %]
-    <div class="admin-hint">
-      <p>
-        [% loc('If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here.') %]
-      </p>
-    </div>
-    <p>
-      <label for="external_status_code">[% loc('External status code') %]</label>
-      <input type="text" name="external_status_code" class="form-control" size="30" value="[% rt.external_status_code | html %]">
-    </p>
+    [% PROCESS 'admin/templates/_external.html' %]
 
     [% IF errors.auto_response %]
         <div class="form-error">[% errors.auto_response %]</div>
diff --git a/templates/web/bromley/admin/templates/_external.html b/templates/web/bromley/admin/templates/_external.html
new file mode 100644
index 000000000..6015950de
--- /dev/null
+++ b/templates/web/bromley/admin/templates/_external.html
@@ -0,0 +1,24 @@
+[% parts = rt.external_status_code.split(',') ~%]
+
+[% IF errors.external_status_code %]
+    <div class="form-error">[% errors.external_status_code %]</div>
+[% END %]
+<p>
+  <label for="resolution_code">External status code / Resolution Code ID</label>
+  <input type="text" id="resolution_code" name="resolution_code" class="form-control" size="30" value="[% parts.0 %]">
+</p>
+
+<p>
+  <label for="task_type">Task type ID</label>
+  <input type="text" id="task_type" name="task_type" class="form-control" size="30" value="[% parts.1 %]">
+</p>
+
+<p>
+  <label for="task_state">Task state</label>
+  <select class="form-control" name="task_state" id="task_state">
+      <option value="">---</option>
+    [% FOR opt IN ['Completed', 'Not Completed'] %]
+      <option value="[% opt %]"[% ' selected' IF parts.2 == opt %]>[% opt %]</option>
+    [% END %]
+  </select>
+</p>
-- 
cgit v1.2.3


From fb8e4d6f48c4354fc9cf071db287ead876fc0269 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Tue, 6 Oct 2020 17:05:41 +0100
Subject: [Bromley] Add text about small electricals.

For kerbside domestic collections.
---
 templates/web/bromley/waste/services.html       | 3 +++
 templates/web/bromley/waste/services_extra.html | 7 +++++++
 2 files changed, 10 insertions(+)
 create mode 100644 templates/web/bromley/waste/services_extra.html

diff --git a/templates/web/bromley/waste/services.html b/templates/web/bromley/waste/services.html
index c417e1790..121c6a2a3 100644
--- a/templates/web/bromley/waste/services.html
+++ b/templates/web/bromley/waste/services.html
@@ -1,3 +1,6 @@
+[% IF unit.service_id == 531 ~%]
+[% domestic_collection = 1 ~%]
+[% END ~%]
 [% IF unit.report_open %]
   <span class="waste-service-descriptor">
     A [% unit.service_name FILTER lower %] collection has been reported as missed
diff --git a/templates/web/bromley/waste/services_extra.html b/templates/web/bromley/waste/services_extra.html
new file mode 100644
index 000000000..5c6fd8c4c
--- /dev/null
+++ b/templates/web/bromley/waste/services_extra.html
@@ -0,0 +1,7 @@
+[% IF domestic_collection %]
+<h3 class="govuk-heading-m waste-service-name">Batteries, small electrical items and textiles</h3>
+
+<p>Please only present one small bag each week as we cannot handle high
+volumes. If we do not collect your items, please bring them back inside and
+present them for collection next week.</p>
+[% END %]
-- 
cgit v1.2.3


From 22b89e27ac4368bcc4e288bd1fe2faf53f13ac9e Mon Sep 17 00:00:00 2001
From: Martin Wright <martin@mysociety.org>
Date: Mon, 19 Oct 2020 12:28:10 +0100
Subject: [Bromley] Service images.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm             |  18 +++++
 templates/web/base/waste/bin_days.html             |  77 ++++++++++++---------
 templates/web/bromley/waste/services_extra.html    |  16 +++--
 .../images/container-images/battery-bag.png        | Bin 0 -> 29477 bytes
 .../images/container-images/battery-bag@2x.png     | Bin 0 -> 71701 bytes
 .../electricals-batteries-textiles.png             | Bin 0 -> 59568 bytes
 .../electricals-batteries-textiles@2x.png          | Bin 0 -> 150269 bytes
 .../images/container-images/food-communal.png      | Bin 0 -> 7849 bytes
 .../images/container-images/food-communal@2x.png   | Bin 0 -> 16195 bytes
 .../images/container-images/food-green-caddy.png   | Bin 0 -> 8049 bytes
 .../container-images/food-green-caddy@2x.png       | Bin 0 -> 11300 bytes
 .../images/container-images/garden-waste-bin.png   | Bin 0 -> 9341 bytes
 .../container-images/garden-waste-bin@2x.png       | Bin 0 -> 22666 bytes
 .../container-images/kerbside-black-box-paper.png  | Bin 0 -> 14826 bytes
 .../kerbside-black-box-paper@2x.png                | Bin 0 -> 27076 bytes
 .../container-images/kerbside-green-box-mix.png    | Bin 0 -> 16691 bytes
 .../container-images/kerbside-green-box-mix@2x.png | Bin 0 -> 28446 bytes
 .../container-images/large-communal-black.png      | Bin 0 -> 11981 bytes
 .../container-images/large-communal-black@2x.png   | Bin 0 -> 24266 bytes
 .../images/container-images/refuse-black-sack.png  | Bin 0 -> 8294 bytes
 .../container-images/refuse-black-sack@2x.png      | Bin 0 -> 14643 bytes
 .../images/container-images/small-communal-mix.png | Bin 0 -> 10385 bytes
 .../container-images/small-communal-mix@2x.png     | Bin 0 -> 18125 bytes
 .../container-images/small-communal-paper.png      | Bin 0 -> 10419 bytes
 .../container-images/small-communal-paper@2x.png   | Bin 0 -> 17600 bytes
 .../images/container-images/textile-bag.png        | Bin 0 -> 39911 bytes
 .../images/container-images/textile-bag@2x.png     | Bin 0 -> 97071 bytes
 .../bromley/images/container-images/weee-bag.png   | Bin 0 -> 26358 bytes
 .../images/container-images/weee-bag@2x.png        | Bin 0 -> 62025 bytes
 web/cobrands/sass/_waste.scss                      |  15 +++-
 30 files changed, 88 insertions(+), 38 deletions(-)
 create mode 100644 web/cobrands/bromley/images/container-images/battery-bag.png
 create mode 100644 web/cobrands/bromley/images/container-images/battery-bag@2x.png
 create mode 100644 web/cobrands/bromley/images/container-images/electricals-batteries-textiles.png
 create mode 100644 web/cobrands/bromley/images/container-images/electricals-batteries-textiles@2x.png
 create mode 100644 web/cobrands/bromley/images/container-images/food-communal.png
 create mode 100644 web/cobrands/bromley/images/container-images/food-communal@2x.png
 create mode 100644 web/cobrands/bromley/images/container-images/food-green-caddy.png
 create mode 100644 web/cobrands/bromley/images/container-images/food-green-caddy@2x.png
 create mode 100644 web/cobrands/bromley/images/container-images/garden-waste-bin.png
 create mode 100644 web/cobrands/bromley/images/container-images/garden-waste-bin@2x.png
 create mode 100644 web/cobrands/bromley/images/container-images/kerbside-black-box-paper.png
 create mode 100644 web/cobrands/bromley/images/container-images/kerbside-black-box-paper@2x.png
 create mode 100644 web/cobrands/bromley/images/container-images/kerbside-green-box-mix.png
 create mode 100644 web/cobrands/bromley/images/container-images/kerbside-green-box-mix@2x.png
 create mode 100644 web/cobrands/bromley/images/container-images/large-communal-black.png
 create mode 100644 web/cobrands/bromley/images/container-images/large-communal-black@2x.png
 create mode 100644 web/cobrands/bromley/images/container-images/refuse-black-sack.png
 create mode 100644 web/cobrands/bromley/images/container-images/refuse-black-sack@2x.png
 create mode 100644 web/cobrands/bromley/images/container-images/small-communal-mix.png
 create mode 100644 web/cobrands/bromley/images/container-images/small-communal-mix@2x.png
 create mode 100644 web/cobrands/bromley/images/container-images/small-communal-paper.png
 create mode 100644 web/cobrands/bromley/images/container-images/small-communal-paper@2x.png
 create mode 100644 web/cobrands/bromley/images/container-images/textile-bag.png
 create mode 100644 web/cobrands/bromley/images/container-images/textile-bag@2x.png
 create mode 100644 web/cobrands/bromley/images/container-images/weee-bag.png
 create mode 100644 web/cobrands/bromley/images/container-images/weee-bag@2x.png

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index e098815db..93dd35539 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -474,6 +474,24 @@ sub construct_bin_date {
     return $date;
 }
 
+sub image_for_service {
+    my ($self, $service_id) = @_;
+    my $base = '/cobrands/bromley/images/container-images';
+    my $images = {
+        531 => "$base/refuse-black-sack",
+        532 => "$base/refuse-black-sack",
+        533 => "$base/large-communal-black",
+        535 => "$base/kerbside-green-box-mix",
+        536 => "$base/small-communal-mix",
+        537 => "$base/kerbside-black-box-paper",
+        541 => "$base/small-communal-paper",
+        542 => "$base/food-green-caddy",
+        544 => "$base/food-communal",
+        545 => "$base/garden-waste-bin",
+    };
+    return $images->{$service_id};
+}
+
 sub bin_services_for_address {
     my $self = shift;
     my $property = shift;
diff --git a/templates/web/base/waste/bin_days.html b/templates/web/base/waste/bin_days.html
index e5a1d41c5..12f965e5f 100644
--- a/templates/web/base/waste/bin_days.html
+++ b/templates/web/base/waste/bin_days.html
@@ -20,42 +20,53 @@
 [% FOR unit IN service_data %]
 
 <h3 class="govuk-heading-m waste-service-name">[% unit.service_name %]</h3>
-
-<dl class="govuk-summary-list">
-  <div class="govuk-summary-list__row">
-    <dt class="govuk-summary-list__key">Frequency</dt>
-    <dd class="govuk-summary-list__value">[% unit.schedule %]</dd>
-  </div>
-  <div class="govuk-summary-list__row">
-    <dt class="govuk-summary-list__key">Next collection</dt>
-    <dd class="govuk-summary-list__value">
-      [% IF unit.next %]
-        [% date.format(unit.next.date) | replace('~~~', unit.next.ordinal) %]
-        [% IF unit.next.changed %](this collection has been adjusted from its usual time)[% END %]
-      [% ELSE %]
-        <i>None</i>
-      [% END %]
-    </dd>
-  </div>
-  <div class="govuk-summary-list__row">
-    <dt class="govuk-summary-list__key">Last collection</dt>
-    <dd class="govuk-summary-list__value">
-      [% IF unit.last %]
-        [% date.format(unit.last.date) | replace('~~~', unit.last.ordinal) %]
-        [% IF unit.last.completed %](completed at [% date.format(unit.last.completed, '%l:%M%p') | lower ~%])[% END ~%]
-        [% IF unit.last.resolution %][% unit.last.resolution | staff_html_markup({ is_body_user => 1 }) %][% END ~%]
-      [% ELSE %]
-        <i>None</i>
-      [% END %]
-    </dd>
+<div class="govuk-grid-row">
+ [% SET image = c.cobrand.image_for_service(unit.service_id) ~%]
+ [% IF image %]
+  <div class="govuk-grid-column-one-quarter text-centered">
+    <img src="[% image %].png" srcset="[% image %].png 1x, [% image %]@2x.png 2x" alt="" class="waste-service-image">
   </div>
-</dl>
-<p class="waste-panel-toggle hidden-nojs"><a data-toggle-visibility="#panel-[% unit.service_id %]" class="waste-service-name-link govuk-button govuk-button--secondary">[% unit.service_name %] services</a></p>
+  <div class="govuk-grid-column-three-quarters">
+ [% ELSE %]
+  <div class="govuk-grid-column-full">
+ [% END %]
+    <dl class="govuk-summary-list">
+      <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">Frequency</dt>
+        <dd class="govuk-summary-list__value">[% unit.schedule %]</dd>
+      </div>
+      <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">Next collection</dt>
+        <dd class="govuk-summary-list__value">
+          [% IF unit.next %]
+            [% date.format(unit.next.date) | replace('~~~', unit.next.ordinal) %]
+            [% IF unit.next.changed %](this collection has been adjusted from its usual time)[% END %]
+          [% ELSE %]
+            <i>None</i>
+          [% END %]
+        </dd>
+      </div>
+      <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">Last collection</dt>
+        <dd class="govuk-summary-list__value">
+          [% IF unit.last %]
+            [% date.format(unit.last.date) | replace('~~~', unit.last.ordinal) %]
+            [% IF unit.last.completed %](completed at [% date.format(unit.last.completed, '%l:%M%p') | lower ~%])[% END ~%]
+            [% IF unit.last.resolution %][% unit.last.resolution | staff_html_markup({ is_body_user => 1 }) %][% END ~%]
+          [% ELSE %]
+            <i>None</i>
+          [% END %]
+        </dd>
+      </div>
+    </dl>
 
-<div class="waste-services-launch-panel hidden-js" id="panel-[% unit.service_id %]">
-    [% PROCESS waste/services.html %]
-</div>
+    <p class="waste-panel-toggle hidden-nojs"><a data-toggle-visibility="#panel-[% unit.service_id %]" class="waste-service-name-link govuk-button govuk-button--secondary">[% unit.service_name %] services</a></p>
 
+    <div class="waste-services-launch-panel hidden-js" id="panel-[% unit.service_id %]">
+        [% PROCESS waste/services.html %]
+    </div>
+  </div>
+</div>
 [% END %]
 [% IF NOT service_data.size %]
     <p>This property has no collections.</p>
diff --git a/templates/web/bromley/waste/services_extra.html b/templates/web/bromley/waste/services_extra.html
index 5c6fd8c4c..d635c843f 100644
--- a/templates/web/bromley/waste/services_extra.html
+++ b/templates/web/bromley/waste/services_extra.html
@@ -1,7 +1,15 @@
 [% IF domestic_collection %]
 <h3 class="govuk-heading-m waste-service-name">Batteries, small electrical items and textiles</h3>
-
-<p>Please only present one small bag each week as we cannot handle high
-volumes. If we do not collect your items, please bring them back inside and
-present them for collection next week.</p>
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-one-quarter text-centered">
+    <img src="/cobrands/bromley/images/container-images/electricals-batteries-textiles.png"
+        srcset="/cobrands/bromley/images/container-images/electricals-batteries-textiles.png 1x, /cobrands/bromley/images/container-images/electricals-batteries-textiles@2x.png 2x"
+        alt="" class="waste-service-image">
+  </div>
+  <div class="govuk-grid-column-three-quarters">
+    <p>Please only present one small bag each week as we cannot handle high
+    volumes. If we do not collect your items, please bring them back inside and
+    present them for collection next week.</p>
+  </div>
+</div>
 [% END %]
diff --git a/web/cobrands/bromley/images/container-images/battery-bag.png b/web/cobrands/bromley/images/container-images/battery-bag.png
new file mode 100644
index 000000000..8f9c75d74
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/battery-bag.png differ
diff --git a/web/cobrands/bromley/images/container-images/battery-bag@2x.png b/web/cobrands/bromley/images/container-images/battery-bag@2x.png
new file mode 100644
index 000000000..16131bf35
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/battery-bag@2x.png differ
diff --git a/web/cobrands/bromley/images/container-images/electricals-batteries-textiles.png b/web/cobrands/bromley/images/container-images/electricals-batteries-textiles.png
new file mode 100644
index 000000000..268726215
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/electricals-batteries-textiles.png differ
diff --git a/web/cobrands/bromley/images/container-images/electricals-batteries-textiles@2x.png b/web/cobrands/bromley/images/container-images/electricals-batteries-textiles@2x.png
new file mode 100644
index 000000000..579295009
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/electricals-batteries-textiles@2x.png differ
diff --git a/web/cobrands/bromley/images/container-images/food-communal.png b/web/cobrands/bromley/images/container-images/food-communal.png
new file mode 100644
index 000000000..51dc74042
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/food-communal.png differ
diff --git a/web/cobrands/bromley/images/container-images/food-communal@2x.png b/web/cobrands/bromley/images/container-images/food-communal@2x.png
new file mode 100644
index 000000000..6720b14fd
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/food-communal@2x.png differ
diff --git a/web/cobrands/bromley/images/container-images/food-green-caddy.png b/web/cobrands/bromley/images/container-images/food-green-caddy.png
new file mode 100644
index 000000000..9483fe19c
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/food-green-caddy.png differ
diff --git a/web/cobrands/bromley/images/container-images/food-green-caddy@2x.png b/web/cobrands/bromley/images/container-images/food-green-caddy@2x.png
new file mode 100644
index 000000000..db3b71ed5
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/food-green-caddy@2x.png differ
diff --git a/web/cobrands/bromley/images/container-images/garden-waste-bin.png b/web/cobrands/bromley/images/container-images/garden-waste-bin.png
new file mode 100644
index 000000000..3c88a9035
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/garden-waste-bin.png differ
diff --git a/web/cobrands/bromley/images/container-images/garden-waste-bin@2x.png b/web/cobrands/bromley/images/container-images/garden-waste-bin@2x.png
new file mode 100644
index 000000000..3b5803d7b
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/garden-waste-bin@2x.png differ
diff --git a/web/cobrands/bromley/images/container-images/kerbside-black-box-paper.png b/web/cobrands/bromley/images/container-images/kerbside-black-box-paper.png
new file mode 100644
index 000000000..b9befa604
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/kerbside-black-box-paper.png differ
diff --git a/web/cobrands/bromley/images/container-images/kerbside-black-box-paper@2x.png b/web/cobrands/bromley/images/container-images/kerbside-black-box-paper@2x.png
new file mode 100644
index 000000000..a01ef8a9a
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/kerbside-black-box-paper@2x.png differ
diff --git a/web/cobrands/bromley/images/container-images/kerbside-green-box-mix.png b/web/cobrands/bromley/images/container-images/kerbside-green-box-mix.png
new file mode 100644
index 000000000..108cf0d59
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/kerbside-green-box-mix.png differ
diff --git a/web/cobrands/bromley/images/container-images/kerbside-green-box-mix@2x.png b/web/cobrands/bromley/images/container-images/kerbside-green-box-mix@2x.png
new file mode 100644
index 000000000..764f26f7b
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/kerbside-green-box-mix@2x.png differ
diff --git a/web/cobrands/bromley/images/container-images/large-communal-black.png b/web/cobrands/bromley/images/container-images/large-communal-black.png
new file mode 100644
index 000000000..d9e030038
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/large-communal-black.png differ
diff --git a/web/cobrands/bromley/images/container-images/large-communal-black@2x.png b/web/cobrands/bromley/images/container-images/large-communal-black@2x.png
new file mode 100644
index 000000000..4f06dc47b
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/large-communal-black@2x.png differ
diff --git a/web/cobrands/bromley/images/container-images/refuse-black-sack.png b/web/cobrands/bromley/images/container-images/refuse-black-sack.png
new file mode 100644
index 000000000..0ecd7956b
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/refuse-black-sack.png differ
diff --git a/web/cobrands/bromley/images/container-images/refuse-black-sack@2x.png b/web/cobrands/bromley/images/container-images/refuse-black-sack@2x.png
new file mode 100644
index 000000000..e880b1c4e
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/refuse-black-sack@2x.png differ
diff --git a/web/cobrands/bromley/images/container-images/small-communal-mix.png b/web/cobrands/bromley/images/container-images/small-communal-mix.png
new file mode 100644
index 000000000..f19b7991d
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/small-communal-mix.png differ
diff --git a/web/cobrands/bromley/images/container-images/small-communal-mix@2x.png b/web/cobrands/bromley/images/container-images/small-communal-mix@2x.png
new file mode 100644
index 000000000..0118142ba
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/small-communal-mix@2x.png differ
diff --git a/web/cobrands/bromley/images/container-images/small-communal-paper.png b/web/cobrands/bromley/images/container-images/small-communal-paper.png
new file mode 100644
index 000000000..28da47315
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/small-communal-paper.png differ
diff --git a/web/cobrands/bromley/images/container-images/small-communal-paper@2x.png b/web/cobrands/bromley/images/container-images/small-communal-paper@2x.png
new file mode 100644
index 000000000..17790b663
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/small-communal-paper@2x.png differ
diff --git a/web/cobrands/bromley/images/container-images/textile-bag.png b/web/cobrands/bromley/images/container-images/textile-bag.png
new file mode 100644
index 000000000..f89fda6a7
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/textile-bag.png differ
diff --git a/web/cobrands/bromley/images/container-images/textile-bag@2x.png b/web/cobrands/bromley/images/container-images/textile-bag@2x.png
new file mode 100644
index 000000000..0b69f2d0c
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/textile-bag@2x.png differ
diff --git a/web/cobrands/bromley/images/container-images/weee-bag.png b/web/cobrands/bromley/images/container-images/weee-bag.png
new file mode 100644
index 000000000..1837fbecc
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/weee-bag.png differ
diff --git a/web/cobrands/bromley/images/container-images/weee-bag@2x.png b/web/cobrands/bromley/images/container-images/weee-bag@2x.png
new file mode 100644
index 000000000..adbdd963d
Binary files /dev/null and b/web/cobrands/bromley/images/container-images/weee-bag@2x.png differ
diff --git a/web/cobrands/sass/_waste.scss b/web/cobrands/sass/_waste.scss
index 798335578..70a73b255 100644
--- a/web/cobrands/sass/_waste.scss
+++ b/web/cobrands/sass/_waste.scss
@@ -26,7 +26,7 @@ body.waste {
 .waste__summary {
   .govuk-summary-list {
     font-size: 1em;
-    border-top: 1px solid #808080;
+    padding-bottom: 0.66em;
     background-color: white;
   }
 
@@ -44,6 +44,13 @@ body.waste {
   }
 }
 
+.waste-service-image {
+  max-width: 100%;
+  max-height: 140px;
+  height: auto;
+  margin-bottom: 1em;
+}
+
 .waste__summary {
   .govuk-button--secondary {
     font-size: 1em;
@@ -109,6 +116,8 @@ body.waste {
 
 .waste-service-name.govuk-heading-m {
   margin-top: 1.5em;
+  border-bottom: 1px solid #808080;
+  padding-bottom: 0.5em;
 }
 
 .waste-service-descriptor {
@@ -150,3 +159,7 @@ input[type="submit"].waste-service-link {
     font-size: 1rem;
   }
 }
+
+.text-centered {
+  text-align: center;
+}
-- 
cgit v1.2.3


From 3f70d1f0b4d543072eda2d1b59092a5b9e6b3253 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Mon, 19 Oct 2020 16:39:45 +0100
Subject: =?UTF-8?q?[Bromley]=20Handle=20today=E2=80=99s=20collection=20bet?=
 =?UTF-8?q?ter.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If task is outstanding and before 5pm, show it as next collection and in
progress. Allow reporting after 5pm.
---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 16 ++++++++++++++--
 perllib/Integrations/Echo.pm           |  1 +
 t/cobrand/bromley.t                    | 13 +++++++++++--
 templates/web/base/waste/bin_days.html |  2 ++
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 93dd35539..f80bdaa12 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -612,9 +612,21 @@ sub bin_services_for_address {
             $row->{last}{completed} = $completed;
             $row->{last}{resolution} = $resolution;
             $row->{report_allowed} = within_working_days($row->{last}{date}, 2);
-            if (!$completed && $row->{last}{date}->ymd eq $now->ymd) {
-                $row->{report_allowed} = 0;
+
+            # Special handling if last instance is today
+            if ($row->{last}{date}->ymd eq $now->ymd) {
+                # If it's before 5pm and outstanding, show it as in progress
+                if ($state eq 'Outstanding' && $now->hour < 17) {
+                    $row->{next} = $row->{last};
+                    $row->{next}{state} = 'In progress';
+                    delete $row->{last};
+                }
+                if (!$completed && $now->hour < 17) {
+                    $row->{report_allowed} = 0;
+                }
             }
+
+            # If the task is ended and could not be done, do not allow reporting
             if ($state eq 'Not Completed' || ($state eq 'Completed' && $_->{Resolution}{Name} eq 'Excess Waste')) {
                 $row->{report_allowed} = 0;
                 $row->{report_locked_out} = 1;
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index 0216240da..28dd1e9bc 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -99,6 +99,7 @@ sub GetTasks {
         },
         {
             Ref => { Value => { anyType => [ 234, 567 ] } },
+            State => { Name => 'Outstanding' },
             CompletedDate => undef
         },
         {
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index 3b01d308f..fb34f1b6d 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -288,8 +288,17 @@ FixMyStreet::override_config {
     subtest 'test reporting before/after completion' => sub {
         set_fixed_time('2020-05-27T11:00:00Z');
         $mech->get_ok('/waste/uprn/12345');
-        $mech->content_contains('(completed at 10:00am)');
-        $mech->content_contains('Wrong Bin Out');
+        $mech->content_like(qr/Refuse collection.*?Last collection<\/dt>\s*<dd[^>]*>\s*Wednesday, 27th May\s+\(completed at 10:00am\)\s*<p>\s*Wrong Bin Out/s);
+        $mech->content_like(qr/Paper &amp; Cardboard.*?Next collection<\/dt>\s*<dd[^>]*>\s*Wednesday, 27th May\s+\(in progress\)/s);
+        $mech->follow_link_ok({ text => 'Report a problem with a paper & cardboard collection' });
+        $mech->content_lacks('Waste spillage');
+
+        set_fixed_time('2020-05-27T19:00:00Z');
+        $mech->get_ok('/waste/uprn/12345');
+        $mech->content_like(qr/Refuse collection.*?Last collection<\/dt>\s*<dd[^>]*>\s*Wednesday, 27th May\s+\(completed at 10:00am\)\s*<p>\s*Wrong Bin Out/s);
+        $mech->content_like(qr/Paper &amp; Cardboard.*?Last collection<\/dt>\s*<dd[^>]*>\s*Wednesday, 27th May\s*<\/dd>/s);
+        $mech->follow_link_ok({ text => 'Report a problem with a paper & cardboard collection' });
+        $mech->content_contains('Waste spillage');
     };
 
     subtest 'test template creation' => sub {
diff --git a/templates/web/base/waste/bin_days.html b/templates/web/base/waste/bin_days.html
index 12f965e5f..da55c57fb 100644
--- a/templates/web/base/waste/bin_days.html
+++ b/templates/web/base/waste/bin_days.html
@@ -41,6 +41,7 @@
           [% IF unit.next %]
             [% date.format(unit.next.date) | replace('~~~', unit.next.ordinal) %]
             [% IF unit.next.changed %](this collection has been adjusted from its usual time)[% END %]
+            [% IF unit.next.state == 'In progress' %](in progress)[% END %]
           [% ELSE %]
             <i>None</i>
           [% END %]
@@ -51,6 +52,7 @@
         <dd class="govuk-summary-list__value">
           [% IF unit.last %]
             [% date.format(unit.last.date) | replace('~~~', unit.last.ordinal) %]
+            [% IF unit.last.state == 'In progress' %](in progress)[% END %]
             [% IF unit.last.completed %](completed at [% date.format(unit.last.completed, '%l:%M%p') | lower ~%])[% END ~%]
             [% IF unit.last.resolution %][% unit.last.resolution | staff_html_markup({ is_body_user => 1 }) %][% END ~%]
           [% ELSE %]
-- 
cgit v1.2.3


From 5e2f1b3509391f891955db8b8fe05dbf40b7a041 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Wed, 4 Nov 2020 13:45:20 +0000
Subject: [Bromley] Adapt if last instance is in future.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 13 ++++++++++++-
 perllib/Integrations/Echo.pm           | 29 ++++++++++++++++++++---------
 t/cobrand/bromley.t                    |  2 ++
 templates/web/base/waste/bin_days.html |  7 +++----
 4 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index f80bdaa12..fc41eae28 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -695,10 +695,21 @@ sub _parse_schedules {
 
         my $last = $schedule->{LastInstance};
         $d = construct_bin_date($last->{CurrentScheduledDate});
-        if ($d && (!$max_last || $d > $max_last->{date})) {
+        # It is possible the last instance for this schedule has been rescheduled to
+        # be in the future. If so, we should treat it like it is a next instance.
+        if ($d && $d->strftime("%F") gt $today && (!$min_next || $d < $min_next->{date})) {
+            my $last_changed = $last->{CurrentScheduledDate}{DateTime} ne $last->{OriginalScheduledDate}{DateTime};
+            $min_next = {
+                date => $d,
+                ordinal => ordinal($d->day),
+                changed => $last_changed,
+            };
+        } elsif ($d && (!$max_last || $d > $max_last->{date})) {
+            my $last_changed = $last->{CurrentScheduledDate}{DateTime} ne $last->{OriginalScheduledDate}{DateTime};
             $max_last = {
                 date => $d,
                 ordinal => ordinal($d->day),
+                changed => $last_changed,
                 ref => $last->{Ref}{Value}{anyType},
             };
         }
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index 28dd1e9bc..bf4b453e6 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -89,25 +89,31 @@ sub GetTasks {
         push @refs, \%a;
     }
 
-    return [
-        {
+    if ($self->sample_data) {
+        my %lookup = map { $_->[0] . ',' . $_->[1] => 1 } @_;
+        my $data = [];
+        push @$data, {
             Ref => { Value => { anyType => [ 123, 456 ] } },
             State => { Name => 'Completed' },
             Resolution => { Ref => { Value => { anyType => 187 } }, Name => 'Wrong Bin Out' },
             TaskTypeId => 3216,
             CompletedDate => { DateTime => '2020-05-27T10:00:00Z' }
-        },
-        {
+        } if $lookup{"123,456"};
+        push @$data, {
             Ref => { Value => { anyType => [ 234, 567 ] } },
             State => { Name => 'Outstanding' },
             CompletedDate => undef
-        },
-        {
+        } if $lookup{"234,567"};
+        push @$data, {
             Ref => { Value => { anyType => [ 345, 678 ] } },
             State => { Name => 'Not Completed' }
-        },
-        { Ref => { Value => { anyType => [ 456, 789 ] } }, CompletedDate => undef },
-    ] if $self->sample_data;
+        } if $lookup{"345,678"};
+        push @$data, {
+            Ref => { Value => { anyType => [ 456, 789 ] } },
+            CompletedDate => undef
+        } if $lookup{"456,789"};
+        return $data;
+    }
 
     # This creates XML of the form <taskRefs><ObjectRef>...</ObjectRef><ObjectRef>...</ObjectRef>...</taskRefs>
     # uncoverable statement
@@ -188,6 +194,7 @@ sub GetServiceUnitsForObject {
                     OriginalScheduledDate => { DateTime => '2020-06-03T00:00:00Z' },
                 },
                 LastInstance => {
+                    OriginalScheduledDate => { DateTime => '2020-05-27T00:00:00Z' },
                     CurrentScheduledDate => { DateTime => '2020-05-27T00:00:00Z' },
                     Ref => { Value => { anyType => [ 123, 456 ] } },
                 },
@@ -207,6 +214,7 @@ sub GetServiceUnitsForObject {
                     OriginalScheduledDate => { DateTime => '2020-06-10T00:00:00Z' },
                 },
                 LastInstance => {
+                    OriginalScheduledDate => { DateTime => '2020-05-27T00:00:00Z' },
                     CurrentScheduledDate => { DateTime => '2020-05-27T00:00:00Z' },
                     Ref => { Value => { anyType => [ 234, 567 ] } },
                 },
@@ -226,6 +234,7 @@ sub GetServiceUnitsForObject {
                     OriginalScheduledDate => { DateTime => '2020-06-03T00:00:00Z' },
                 },
                 LastInstance => {
+                    OriginalScheduledDate => { DateTime => '2020-05-18T00:00:00Z' },
                     CurrentScheduledDate => { DateTime => '2020-05-20T00:00:00Z' },
                     Ref => { Value => { anyType => [ 345, 678 ] } },
                 },
@@ -241,6 +250,7 @@ sub GetServiceUnitsForObject {
             ServiceTaskSchedules => { ServiceTaskSchedule => [ {
                 EndDate => { DateTime => '2020-01-01T00:00:00Z' },
                 LastInstance => {
+                    OriginalScheduledDate => { DateTime => '2019-12-31T00:00:00Z' },
                     CurrentScheduledDate => { DateTime => '2019-12-31T00:00:00Z' },
                 },
             }, {
@@ -250,6 +260,7 @@ sub GetServiceUnitsForObject {
                     OriginalScheduledDate => { DateTime => '2020-06-01T00:00:00Z' },
                 },
                 LastInstance => {
+                    OriginalScheduledDate => { DateTime => '2020-05-18T00:00:00Z' },
                     CurrentScheduledDate => { DateTime => '2020-05-18T00:00:00Z' },
                     Ref => { Value => { anyType => [ 456, 789 ] } },
                 },
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index fb34f1b6d..13f4f2308 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -271,6 +271,7 @@ FixMyStreet::override_config {
     subtest 'test open enquiries' => sub {
         set_fixed_time('2020-05-19T12:00:00Z'); # After sample food waste collection
         $mech->get_ok('/waste/uprn/12345');
+        $mech->content_like(qr/Mixed Recycling.*?Next collection<\/dt>\s*<dd[^>]*>\s*Wednesday, 20th May\s+\(this collection has been adjusted/s);
         $mech->follow_link_ok({ text => 'Report a problem with a food waste collection' });
         $mech->content_contains('Waste spillage');
         $mech->content_lacks('Gate not closed');
@@ -280,6 +281,7 @@ FixMyStreet::override_config {
     subtest 'test crew reported issue' => sub {
         set_fixed_time('2020-05-21T12:00:00Z'); # After sample container mix
         $mech->get_ok('/waste/uprn/12345');
+        $mech->content_like(qr/Mixed Recycling.*?Last collection<\/dt>\s*<dd[^>]*>\s*Wednesday, 20th May\s+\(this collection has been adjusted/s);
         $mech->content_contains('A missed collection cannot be reported, please see the last collection status above.');
         $mech->content_lacks('Report a mixed recycling ');
         restore_time();
diff --git a/templates/web/base/waste/bin_days.html b/templates/web/base/waste/bin_days.html
index da55c57fb..9ca8c0a7f 100644
--- a/templates/web/base/waste/bin_days.html
+++ b/templates/web/base/waste/bin_days.html
@@ -47,19 +47,18 @@
           [% END %]
         </dd>
       </div>
+     [% IF unit.last %]
       <div class="govuk-summary-list__row">
         <dt class="govuk-summary-list__key">Last collection</dt>
         <dd class="govuk-summary-list__value">
-          [% IF unit.last %]
             [% date.format(unit.last.date) | replace('~~~', unit.last.ordinal) %]
+            [% IF unit.last.changed %](this collection has been adjusted from its usual time)[% END %]
             [% IF unit.last.state == 'In progress' %](in progress)[% END %]
             [% IF unit.last.completed %](completed at [% date.format(unit.last.completed, '%l:%M%p') | lower ~%])[% END ~%]
             [% IF unit.last.resolution %][% unit.last.resolution | staff_html_markup({ is_body_user => 1 }) %][% END ~%]
-          [% ELSE %]
-            <i>None</i>
-          [% END %]
         </dd>
       </div>
+     [% END %]
     </dl>
 
     <p class="waste-panel-toggle hidden-nojs"><a data-toggle-visibility="#panel-[% unit.service_id %]" class="waste-service-name-link govuk-button govuk-button--secondary">[% unit.service_name %] services</a></p>
-- 
cgit v1.2.3


From 6160718a99b16657228393535b32b4610ab70cd6 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Wed, 11 Nov 2020 10:17:06 +0000
Subject: [Bromley] Remove service buttons, change logos.

---
 templates/web/base/waste/bin_days.html                  |   4 +---
 templates/web/bromley/footer.html                       |   1 -
 templates/web/bromley/header_logo.html                  |   6 ++++++
 .../web/bromley/report/_updates_disallowed_message.html |   1 -
 web/cobrands/bromley/base.scss                          |   5 +++++
 web/cobrands/bromley/images/waste.png                   | Bin 0 -> 42227 bytes
 web/cobrands/bromley/layout.scss                        |   5 +++++
 7 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 web/cobrands/bromley/images/waste.png

diff --git a/templates/web/base/waste/bin_days.html b/templates/web/base/waste/bin_days.html
index 9ca8c0a7f..bba894ae1 100644
--- a/templates/web/base/waste/bin_days.html
+++ b/templates/web/base/waste/bin_days.html
@@ -61,9 +61,7 @@
      [% END %]
     </dl>
 
-    <p class="waste-panel-toggle hidden-nojs"><a data-toggle-visibility="#panel-[% unit.service_id %]" class="waste-service-name-link govuk-button govuk-button--secondary">[% unit.service_name %] services</a></p>
-
-    <div class="waste-services-launch-panel hidden-js" id="panel-[% unit.service_id %]">
+    <div class="waste-services-launch-panel" id="panel-[% unit.service_id %]">
         [% PROCESS waste/services.html %]
     </div>
   </div>
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html
index 47ffc4161..5aac635b3 100644
--- a/templates/web/bromley/footer.html
+++ b/templates/web/bromley/footer.html
@@ -6,7 +6,6 @@
                     <div class="bromley-waste-credits">
                         <p>Powered by</p>
                         <p>
-                            <a href="https://www.veolia.co.uk">Veolia</a>
                             <a href="https://www.societyworks.org/services/waste/">SocietyWorks</a>
                         </p>
                     </div>
diff --git a/templates/web/bromley/header_logo.html b/templates/web/bromley/header_logo.html
index b86960af3..2159dc5d3 100644
--- a/templates/web/bromley/header_logo.html
+++ b/templates/web/bromley/header_logo.html
@@ -1,5 +1,11 @@
     <div class="bromley-header clearfix">
+[% IF bodyclass == 'waste' %]
+        <a href="https://www.bromley.gov.uk/" id="site-logo">
+            <img src="/cobrands/bromley/images/waste.png" alt="Bromley Council">
+        </a>
+[% ELSE %]
         <a href="https://www.bromley.gov.uk/" id="site-logo">[% site_name %]</a>
+[% END %]
 
         <ul class="linear-links subtext float-right top-links">
             <li class="first-child"><i class="fa fa-home"></i><a href="https://www.bromley.gov.uk">Home</a></li>
diff --git a/templates/web/bromley/report/_updates_disallowed_message.html b/templates/web/bromley/report/_updates_disallowed_message.html
index 904846004..059b92494 100644
--- a/templates/web/bromley/report/_updates_disallowed_message.html
+++ b/templates/web/bromley/report/_updates_disallowed_message.html
@@ -8,7 +8,6 @@
 <div class="bromley-waste-credits">
     <p>Powered by</p>
     <p>
-        <a href="https://www.veolia.co.uk">Veolia</a>
         <a href="https://www.societyworks.org/services/waste/">SocietyWorks</a>
     </p>
 </div>
diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss
index e37b2e0fe..abb93d30b 100644
--- a/web/cobrands/bromley/base.scss
+++ b/web/cobrands/bromley/base.scss
@@ -14,6 +14,11 @@
   text-indent: -999999px;
   z-index:2;
 }
+body.waste #site-logo {
+  width: 129px;
+  background: none;
+  text-indent: 0;
+}
 
 #nav-link {
   top: 7px;
diff --git a/web/cobrands/bromley/images/waste.png b/web/cobrands/bromley/images/waste.png
new file mode 100644
index 000000000..3ffef5ccb
Binary files /dev/null and b/web/cobrands/bromley/images/waste.png differ
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index c802a2dd9..dc4c361ab 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -11,6 +11,11 @@ body.fullwidthpage, body.twothirdswidthpage, body.authpage {
     float: left;
   }
 }
+body.waste #site-logo {
+    width: 334px;
+    height: 114px;
+    float: left;
+}
 
 body.mappage {
   .bromley-header {
-- 
cgit v1.2.3


From f5dc489e9ad85a7cf3e7c937a926228cd8178432 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Wed, 11 Nov 2020 14:29:48 +0000
Subject: [Bromley] Remove uneeded paragraph, button is gone

---
 templates/web/base/waste/bin_days.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/web/base/waste/bin_days.html b/templates/web/base/waste/bin_days.html
index bba894ae1..e852507fb 100644
--- a/templates/web/base/waste/bin_days.html
+++ b/templates/web/base/waste/bin_days.html
@@ -11,7 +11,6 @@
 </dl>
 <div class="waste__collections">
   <h2 class="govuk-heading-l govuk-!-margin-bottom-2">Your collections</h2>
-  <p>Please click the service button under each collection schedule for further options associated with that collection.</p>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
 
-- 
cgit v1.2.3


From 0b97468330ab7146f16dfe4060a63d28ce445fa6 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 12 Nov 2020 11:48:24 +0000
Subject: [Bromley] Use property ID, rather than UPRN.

---
 perllib/FixMyStreet/App/Controller/Waste.pm        | 42 +++++++++++-----------
 perllib/FixMyStreet/Cobrand/Bromley.pm             | 15 ++++----
 perllib/Integrations/Echo.pm                       | 27 +++++++-------
 t/app/controller/waste.t                           | 27 +++++++-------
 t/cobrand/bromley.t                                | 20 +++++------
 templates/web/base/waste/bin_days.html             |  6 ++--
 templates/web/base/waste/enquiry.html              |  2 +-
 .../report/_updates_disallowed_message.html        |  4 +--
 templates/web/bromley/waste/services.html          |  8 ++---
 9 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Waste.pm b/perllib/FixMyStreet/App/Controller/Waste.pm
index 152c7c28e..fe177e9fe 100644
--- a/perllib/FixMyStreet/App/Controller/Waste.pm
+++ b/perllib/FixMyStreet/App/Controller/Waste.pm
@@ -23,8 +23,8 @@ sub auto : Private {
 sub index : Path : Args(0) {
     my ( $self, $c ) = @_;
 
-    if (my $uprn = $c->get_param('address')) {
-        $c->detach('redirect_to_uprn', [ $uprn ]);
+    if (my $id = $c->get_param('address')) {
+        $c->detach('redirect_to_id', [ $id ]);
     }
 
     $c->stash->{title} = 'What is your address?';
@@ -58,9 +58,9 @@ sub address_list_form {
     );
 }
 
-sub redirect_to_uprn : Private {
-    my ($self, $c, $uprn) = @_;
-    my $uri = '/waste/uprn/' . $uprn;
+sub redirect_to_id : Private {
+    my ($self, $c, $id) = @_;
+    my $uri = '/waste/' . $id;
     my $type = $c->get_param('type') || '';
     $uri .= '/request' if $type eq 'request';
     $uri .= '/report' if $type eq 'report';
@@ -68,20 +68,19 @@ sub redirect_to_uprn : Private {
     $c->detach;
 }
 
-sub uprn : Chained('/') : PathPart('waste/uprn') : CaptureArgs(1) {
-    my ($self, $c, $uprn) = @_;
+sub property : Chained('/') : PathPart('waste') : CaptureArgs(1) {
+    my ($self, $c, $id) = @_;
 
-    if ($uprn eq 'missing') {
+    if ($id eq 'missing') {
         $c->stash->{template} = 'waste/missing.html';
         $c->detach;
     }
 
     $c->forward('/auth/get_csrf_token');
 
-    my $property = $c->stash->{property} = $c->cobrand->call_hook(look_up_property => $uprn);
+    my $property = $c->stash->{property} = $c->cobrand->call_hook(look_up_property => $id);
     $c->detach( '/page_error_404_not_found', [] ) unless $property;
 
-    $c->stash->{uprn} = $uprn;
     $c->stash->{latitude} = $property->{latitude};
     $c->stash->{longitude} = $property->{longitude};
 
@@ -89,11 +88,11 @@ sub uprn : Chained('/') : PathPart('waste/uprn') : CaptureArgs(1) {
     $c->stash->{services} = { map { $_->{service_id} => $_ } @{$c->stash->{service_data}} };
 }
 
-sub bin_days : Chained('uprn') : PathPart('') : Args(0) {
+sub bin_days : Chained('property') : PathPart('') : Args(0) {
     my ($self, $c) = @_;
 }
 
-sub calendar : Chained('uprn') : PathPart('calendar.ics') : Args(0) {
+sub calendar : Chained('property') : PathPart('calendar.ics') : Args(0) {
     my ($self, $c) = @_;
     $c->res->header(Content_Type => 'text/calendar');
     require Data::ICal::RFC7986;
@@ -110,8 +109,8 @@ sub calendar : Chained('uprn') : PathPart('calendar.ics') : Args(0) {
         'x-published-ttl' => 'P1D',
         calscale => 'GREGORIAN',
         'x-wr-timezone' => 'Europe/London',
-        source => [ $c->uri_for_action($c->action, [ $c->stash->{uprn} ]), { value => 'URI' } ],
-        url => $c->uri_for_action('waste/bin_days', [ $c->stash->{uprn} ]),
+        source => [ $c->uri_for_action($c->action, [ $c->stash->{property}{id} ]), { value => 'URI' } ],
+        url => $c->uri_for_action('waste/bin_days', [ $c->stash->{property}{id} ]),
     );
 
     my $events = $c->cobrand->bin_future_collections;
@@ -175,7 +174,7 @@ sub construct_bin_request_form {
     return $field_list;
 }
 
-sub request : Chained('uprn') : Args(0) {
+sub request : Chained('property') : Args(0) {
     my ($self, $c) = @_;
 
     my $field_list = construct_bin_request_form($c);
@@ -231,7 +230,7 @@ sub construct_bin_report_form {
     return $field_list;
 }
 
-sub report : Chained('uprn') : Args(0) {
+sub report : Chained('property') : Args(0) {
     my ($self, $c) = @_;
 
     my $field_list = construct_bin_report_form($c);
@@ -266,7 +265,7 @@ sub process_report_data : Private {
     return 1;
 }
 
-sub enquiry : Chained('uprn') : Args(0) {
+sub enquiry : Chained('property') : Args(0) {
     my ($self, $c) = @_;
 
     if (my $template = $c->get_param('template')) {
@@ -279,18 +278,18 @@ sub enquiry : Chained('uprn') : Args(0) {
     my $category = $c->get_param('category');
     my $service = $c->get_param('service_id');
     if (!$category || !$service || !$c->stash->{services}{$service}) {
-        $c->res->redirect('/waste/uprn/' . $c->stash->{uprn});
+        $c->res->redirect('/waste/' . $c->stash->{property}{id});
         $c->detach;
     }
     my ($contact) = grep { $_->category eq $category } @{$c->stash->{contacts}};
     if (!$contact) {
-        $c->res->redirect('/waste/uprn/' . $c->stash->{uprn});
+        $c->res->redirect('/waste/' . $c->stash->{property}{id});
         $c->detach;
     }
 
     my $field_list = [];
     foreach (@{$contact->get_metadata_for_input}) {
-        next if $_->{code} eq 'service_id' || $_->{code} eq 'uprn';
+        next if $_->{code} eq 'service_id' || $_->{code} eq 'uprn' || $_->{code} eq 'property_id';
         my $type = 'Text';
         $type = 'TextArea' if 'text' eq ($_->{datatype} || '');
         my $required = $_->{required} eq 'true' ? 1 : 0;
@@ -421,7 +420,8 @@ sub add_report : Private {
     $c->set_param('category', $data->{category});
     $c->set_param('title', $data->{title});
     $c->set_param('detail', $data->{detail});
-    $c->set_param('uprn', $c->stash->{uprn});
+    $c->set_param('uprn', $c->stash->{property}{uprn});
+    $c->set_param('property_id', $c->stash->{property}{id});
 
     $c->forward('setup_categories_and_bodies') unless $c->stash->{contacts};
     $c->forward('/report/new/non_map_creation', [['/waste/remove_name_errors']]) or return;
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index fc41eae28..0885f5b6b 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -426,7 +426,7 @@ sub bin_addresses_for_postcode {
     $echo = Integrations::Echo->new(%$echo);
     my $points = $echo->FindPoints($pc);
     my $data = [ map { {
-        value => $_->{SharedRef}{Value}{anyType},
+        value => $_->{Id},
         label => FixMyStreet::Template::title($_->{Description}),
     } } @$points ];
     natkeysort_inplace { $_->{label} } @$data;
@@ -435,7 +435,7 @@ sub bin_addresses_for_postcode {
 
 sub look_up_property {
     my $self = shift;
-    my $uprn = shift;
+    my $id = shift;
 
     my $cfg = $self->feature('echo');
     my $echo = Integrations::Echo->new(%$cfg);
@@ -448,10 +448,10 @@ sub look_up_property {
         $self->{c}->detach('/page_error_403_access_denied', []) if $count > $cfg->{max_per_day};
     }
 
-    my $result = $echo->GetPointAddress($uprn);
+    my $result = $echo->GetPointAddress($id);
     return {
         id => $result->{Id},
-        uprn => $uprn,
+        uprn => $result->{SharedRef}{Value}{anyType},
         address => FixMyStreet::Template::title($result->{Description}),
         latitude => $result->{Coordinates}{GeoPoint}{Latitude},
         longitude => $result->{Coordinates}{GeoPoint}{Longitude},
@@ -538,7 +538,7 @@ sub bin_services_for_address {
 
     my $echo = $self->feature('echo');
     $echo = Integrations::Echo->new(%$echo);
-    my $result = $echo->GetServiceUnitsForObject($property->{uprn});
+    my $result = $echo->GetServiceUnitsForObject($property->{id});
     return [] unless @$result;
 
     my $events = $echo->GetEventsForObject('PointAddress', $property->{id});
@@ -591,7 +591,8 @@ sub bin_services_for_address {
             my $state = $_->{State}{Name} || '';
             my $task_type_id = $_->{TaskTypeId} || '';
 
-            my $resolution = $_->{Resolution}{Name} || '';
+            my $orig_resolution = $_->{Resolution}{Name} || '';
+            my $resolution = $orig_resolution;
             my $resolution_id = $_->{Resolution}{Ref}{Value}{anyType};
             if ($resolution_id) {
                 my $template = FixMyStreet::DB->resultset('ResponseTemplate')->search({
@@ -627,7 +628,7 @@ sub bin_services_for_address {
             }
 
             # If the task is ended and could not be done, do not allow reporting
-            if ($state eq 'Not Completed' || ($state eq 'Completed' && $_->{Resolution}{Name} eq 'Excess Waste')) {
+            if ($state eq 'Not Completed' || ($state eq 'Completed' && $orig_resolution eq 'Excess Waste')) {
                 $row->{report_allowed} = 0;
                 $row->{report_locked_out} = 1;
             }
diff --git a/perllib/Integrations/Echo.pm b/perllib/Integrations/Echo.pm
index bf4b453e6..d6783677c 100644
--- a/perllib/Integrations/Echo.pm
+++ b/perllib/Integrations/Echo.pm
@@ -129,14 +129,14 @@ sub GetTasks {
     return force_arrayref($res, 'Task');
 }
 
-sub _uprn_ref {
+sub _id_ref {
     require SOAP::Lite;
-    my $uprn = shift;
+    my $id = shift;
     tie(my %obj, 'Tie::IxHash',
-        Key => 'Uprn',
+        Key => 'Id',
         Type => 'PointAddress',
         Value => [
-            { 'msArray:anyType' => SOAP::Data->value($uprn)->type('string') },
+            { 'msArray:anyType' => SOAP::Data->value($id) },
         ],
     );
     return \%obj;
@@ -144,10 +144,11 @@ sub _uprn_ref {
 
 sub GetPointAddress {
     my $self = shift;
-    my $uprn = shift;
-    my $obj = _uprn_ref($uprn);
+    my $id = shift;
+    my $obj = _id_ref($id);
     return {
         Id => '12345',
+        SharedRef => { Value => { anyType => '1000000002' } },
         PointType => 'PointAddress',
         PointAddressType => { Name => 'House' },
         Coordinates => { GeoPoint => { Latitude => 51.401546, Longitude => 0.015415 } },
@@ -165,11 +166,11 @@ sub FindPoints {
         Postcode => $pc,
     );
     return [
-        { Description => '1 Example Street, Bromley, BR1 1AA', SharedRef => { Value => { anyType => 1000000001 } } },
-        { Description => '2 Example Street, Bromley, BR1 1AA', SharedRef => { Value => { anyType => 1000000002 } } },
-        { Description => '3 Example Street, Bromley, BR1 1AA', SharedRef => { Value => { anyType => 1000000003 } } },
-        { Description => '4 Example Street, Bromley, BR1 1AA', SharedRef => { Value => { anyType => 1000000004 } } },
-        { Description => '5 Example Street, Bromley, BR1 1AA', SharedRef => { Value => { anyType => 1000000005 } } },
+        { Description => '1 Example Street, Bromley, BR1 1AA', Id => '11345', SharedRef => { Value => { anyType => 1000000001 } } },
+        { Description => '2 Example Street, Bromley, BR1 1AA', Id => '12345', SharedRef => { Value => { anyType => 1000000002 } } },
+        { Description => '3 Example Street, Bromley, BR1 1AA', Id => '13345', SharedRef => { Value => { anyType => 1000000003 } } },
+        { Description => '4 Example Street, Bromley, BR1 1AA', Id => '14345', SharedRef => { Value => { anyType => 1000000004 } } },
+        { Description => '5 Example Street, Bromley, BR1 1AA', Id => '15345', SharedRef => { Value => { anyType => 1000000005 } } },
     ] if $self->sample_data;
     my $res = $self->call('FindPoints', query => \%obj);
     return force_arrayref($res, 'PointInfo');
@@ -177,8 +178,8 @@ sub FindPoints {
 
 sub GetServiceUnitsForObject {
     my $self = shift;
-    my $uprn = shift;
-    my $obj = _uprn_ref($uprn);
+    my $id = shift;
+    my $obj = _id_ref($id);
     my $from = DateTime->now->set_time_zone(FixMyStreet->local_time_zone);
     return [ {
         Id => 1001,
diff --git a/t/app/controller/waste.t b/t/app/controller/waste.t
index c86802631..748904995 100644
--- a/t/app/controller/waste.t
+++ b/t/app/controller/waste.t
@@ -25,6 +25,7 @@ sub create_contact {
     $contact->set_extra_metadata(group => ['Waste']);
     $contact->set_extra_fields(
         { code => 'uprn', required => 1, automated => 'hidden_field' },
+        { code => 'property_id', required => 1, automated => 'hidden_field' },
         { code => 'service_id', required => 0, automated => 'hidden_field' },
         @extra,
     );
@@ -55,7 +56,7 @@ FixMyStreet::override_config {
         set_fixed_time('2020-05-28T17:00:00Z'); # After sample data collection
         $mech->get_ok('/waste');
         $mech->submit_form_ok({ with_fields => { postcode => 'BR1 1AA' } });
-        $mech->submit_form_ok({ with_fields => { address => '1000000002' } });
+        $mech->submit_form_ok({ with_fields => { address => '12345' } });
         $mech->content_contains('2 Example Street');
         $mech->content_contains('Food Waste');
     };
@@ -108,7 +109,7 @@ FixMyStreet::override_config {
         $mech->log_in_ok($staff_user->email);
         $mech->get_ok('/report/' . $report->id);
         $mech->content_lacks('Provide an update');
-        $mech->content_contains( '<a href="/waste/uprn/1000000002">See your bin collections</a>' );
+        $mech->content_contains( '<a href="/waste/12345">See your bin collections</a>' );
 
         $mech->host('www.fixmystreet.com');
         $res = $mech->get('/report/' . $report->id);
@@ -122,7 +123,7 @@ FixMyStreet::override_config {
         $mech->host('bromley.fixmystreet.com');
     };
     subtest 'Request a new container' => sub {
-        $mech->get_ok('/waste/uprn/1000000002/request');
+        $mech->get_ok('/waste/12345/request');
         $mech->submit_form_ok({ form_number => 2 });
         $mech->content_contains('Please specify what you need');
         $mech->submit_form_ok({ with_fields => { 'container-1' => 1 } });
@@ -140,16 +141,16 @@ FixMyStreet::override_config {
         is $report->get_extra_field_value('Container_Type'), 1;
     };
     subtest 'Thing already requested' => sub {
-        $mech->get_ok('/waste/uprn/1000000002');
+        $mech->get_ok('/waste/12345');
         $mech->content_contains('A new paper &amp; cardboard container request has been made');
     };
     subtest 'General enquiry, bad data' => sub {
-        $mech->get_ok('/waste/uprn/1000000002/enquiry');
-        is $mech->uri->path, '/waste/uprn/1000000002';
-        $mech->get_ok('/waste/uprn/1000000002/enquiry?category=Bad');
-        is $mech->uri->path, '/waste/uprn/1000000002';
-        $mech->get_ok('/waste/uprn/1000000002/enquiry?service=1');
-        is $mech->uri->path, '/waste/uprn/1000000002';
+        $mech->get_ok('/waste/12345/enquiry');
+        is $mech->uri->path, '/waste/12345';
+        $mech->get_ok('/waste/12345/enquiry?category=Bad');
+        is $mech->uri->path, '/waste/12345';
+        $mech->get_ok('/waste/12345/enquiry?service=1');
+        is $mech->uri->path, '/waste/12345';
     };
     subtest 'Checking calendar' => sub {
         $mech->follow_link_ok({ text => 'Add to your calendar (.ics file)' });
@@ -165,7 +166,7 @@ FixMyStreet::override_config {
     };
     subtest 'General enquiry, on behalf of someone else' => sub {
         $mech->log_in_ok($staff_user->email);
-        $mech->get_ok('/waste/uprn/1000000002/enquiry?category=General+enquiry&service_id=537');
+        $mech->get_ok('/waste/12345/enquiry?category=General+enquiry&service_id=537');
         $mech->submit_form_ok({ with_fields => { extra_Notes => 'Some notes' } });
         $mech->submit_form_ok({ with_fields => { name => "Test McTest", email => $user->email } });
         $mech->content_contains('Some notes');
@@ -195,8 +196,8 @@ FixMyStreet::override_config {
         $integ->mock(call => sub {
             return SOAP::Result->new(result => {
                 PointInfo => [
-                    { Description => '1 Example Street', SharedRef => { Value => { anyType => 1000000001 } } },
-                    { Description => '2 Example Street', SharedRef => { Value => { anyType => 1000000002 } } },
+                    { Description => '1 Example Street', Id => '11345', SharedRef => { Value => { anyType => 1000000001 } } },
+                    { Description => '2 Example Street', Id => '12345', SharedRef => { Value => { anyType => 1000000002 } } },
                 ],
             });
         });
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index 13f4f2308..561b5b283 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -270,7 +270,7 @@ FixMyStreet::override_config {
 }, sub {
     subtest 'test open enquiries' => sub {
         set_fixed_time('2020-05-19T12:00:00Z'); # After sample food waste collection
-        $mech->get_ok('/waste/uprn/12345');
+        $mech->get_ok('/waste/12345');
         $mech->content_like(qr/Mixed Recycling.*?Next collection<\/dt>\s*<dd[^>]*>\s*Wednesday, 20th May\s+\(this collection has been adjusted/s);
         $mech->follow_link_ok({ text => 'Report a problem with a food waste collection' });
         $mech->content_contains('Waste spillage');
@@ -280,7 +280,7 @@ FixMyStreet::override_config {
 
     subtest 'test crew reported issue' => sub {
         set_fixed_time('2020-05-21T12:00:00Z'); # After sample container mix
-        $mech->get_ok('/waste/uprn/12345');
+        $mech->get_ok('/waste/12345');
         $mech->content_like(qr/Mixed Recycling.*?Last collection<\/dt>\s*<dd[^>]*>\s*Wednesday, 20th May\s+\(this collection has been adjusted/s);
         $mech->content_contains('A missed collection cannot be reported, please see the last collection status above.');
         $mech->content_lacks('Report a mixed recycling ');
@@ -289,14 +289,14 @@ FixMyStreet::override_config {
 
     subtest 'test reporting before/after completion' => sub {
         set_fixed_time('2020-05-27T11:00:00Z');
-        $mech->get_ok('/waste/uprn/12345');
+        $mech->get_ok('/waste/12345');
         $mech->content_like(qr/Refuse collection.*?Last collection<\/dt>\s*<dd[^>]*>\s*Wednesday, 27th May\s+\(completed at 10:00am\)\s*<p>\s*Wrong Bin Out/s);
         $mech->content_like(qr/Paper &amp; Cardboard.*?Next collection<\/dt>\s*<dd[^>]*>\s*Wednesday, 27th May\s+\(in progress\)/s);
         $mech->follow_link_ok({ text => 'Report a problem with a paper & cardboard collection' });
         $mech->content_lacks('Waste spillage');
 
         set_fixed_time('2020-05-27T19:00:00Z');
-        $mech->get_ok('/waste/uprn/12345');
+        $mech->get_ok('/waste/12345');
         $mech->content_like(qr/Refuse collection.*?Last collection<\/dt>\s*<dd[^>]*>\s*Wednesday, 27th May\s+\(completed at 10:00am\)\s*<p>\s*Wrong Bin Out/s);
         $mech->content_like(qr/Paper &amp; Cardboard.*?Last collection<\/dt>\s*<dd[^>]*>\s*Wednesday, 27th May\s*<\/dd>/s);
         $mech->follow_link_ok({ text => 'Report a problem with a paper & cardboard collection' });
@@ -317,19 +317,19 @@ FixMyStreet::override_config {
     };
 
     subtest 'test reporting before/after completion' => sub {
-        $mech->get_ok('/waste/uprn/12345');
+        $mech->get_ok('/waste/12345');
         $mech->content_contains('(completed at 10:00am)');
         $mech->content_contains('We could not collect your waste as it was not correctly presented.');
         $mech->content_lacks('Report a paper &amp; cardboard collection');
         $mech->content_contains('Report a refuse collection');
         set_fixed_time('2020-05-28T12:00:00Z');
-        $mech->get_ok('/waste/uprn/12345');
+        $mech->get_ok('/waste/12345');
         $mech->content_contains('Report a refuse collection');
         set_fixed_time('2020-05-29T12:00:00Z');
-        $mech->get_ok('/waste/uprn/12345');
+        $mech->get_ok('/waste/12345');
         $mech->content_contains('Report a refuse collection');
         set_fixed_time('2020-05-30T12:00:00Z');
-        $mech->get_ok('/waste/uprn/12345');
+        $mech->get_ok('/waste/12345');
         $mech->content_lacks('Report a refuse collection');
         restore_time();
     };
@@ -346,8 +346,8 @@ subtest 'test waste max-per-day' => sub {
         SKIP: {
             skip( "No memcached", 2 ) unless Memcached::increment('bromley-test');
             Memcached::delete("bromley-test");
-            $mech->get_ok('/waste/uprn/12345');
-            $mech->get('/waste/uprn/12345');
+            $mech->get_ok('/waste/12345');
+            $mech->get('/waste/12345');
             is $mech->res->code, 403, 'Now forbidden';
         }
     };
diff --git a/templates/web/base/waste/bin_days.html b/templates/web/base/waste/bin_days.html
index e852507fb..54c21ae0c 100644
--- a/templates/web/base/waste/bin_days.html
+++ b/templates/web/base/waste/bin_days.html
@@ -80,7 +80,7 @@
         <div class="aside-download">
           <h3>Download your collection schedule</h3>
           <ul>
-            <li><a href="[% c.uri_for_action('waste/calendar', [ uprn ]) %]">Add to your calendar (.ics file)</a></li>
+            <li><a href="[% c.uri_for_action('waste/calendar', [ property.id ]) %]">Add to your calendar (.ics file)</a></li>
           </ul>
         </div>
        [% IF any_report_allowed OR any_request_allowed %]
@@ -88,10 +88,10 @@
           <h3>More services</h3>
           <ul>
             [% IF any_report_allowed %]
-              <li><a href="[% c.uri_for_action('waste/report', [ uprn ]) %]">Report a missed collection</a></li>
+              <li><a href="[% c.uri_for_action('waste/report', [ property.id ]) %]">Report a missed collection</a></li>
             [% END %]
             [% IF any_request_allowed %]
-              <li><a href="[% c.uri_for_action('waste/request', [ uprn ]) %]">Request a new container</a></li>
+              <li><a href="[% c.uri_for_action('waste/request', [ property.id ]) %]">Request a new container</a></li>
             [% END %]
           </ul>
         </div>
diff --git a/templates/web/base/waste/enquiry.html b/templates/web/base/waste/enquiry.html
index 8993b0fd8..06c8f7f76 100644
--- a/templates/web/base/waste/enquiry.html
+++ b/templates/web/base/waste/enquiry.html
@@ -15,7 +15,7 @@
     <dd class="waste__address__property">[% services.$service_id.service_name %]</dd>
 </dl>
 
-<form method="get" action="[% c.uri_for_action('waste/enquiry', [ uprn ]) %]">
+<form method="get" action="[% c.uri_for_action('waste/enquiry', [ property.id ]) %]">
     <div class="govuk-form-group">
     [% PROCESS radio field = {
       id = 'category',
diff --git a/templates/web/bromley/report/_updates_disallowed_message.html b/templates/web/bromley/report/_updates_disallowed_message.html
index 059b92494..25e3a57c4 100644
--- a/templates/web/bromley/report/_updates_disallowed_message.html
+++ b/templates/web/bromley/report/_updates_disallowed_message.html
@@ -1,8 +1,8 @@
 [% IF c.cobrand.updates_disallowed(problem) == 'waste';
-    SET uprn = problem.get_extra_field_value('uprn');
+    SET property_id = problem.get_extra_field_value('property_id');
 %]
 <p>
-   <a href="/waste[% IF uprn %]/uprn/[% uprn %][% END %]">See your bin collections</a>.
+   <a href="/waste[% IF property_id %]/[% property_id %][% END %]">See your bin collections</a>.
 </p>
 
 <div class="bromley-waste-credits">
diff --git a/templates/web/bromley/waste/services.html b/templates/web/bromley/waste/services.html
index 121c6a2a3..6fc654f07 100644
--- a/templates/web/bromley/waste/services.html
+++ b/templates/web/bromley/waste/services.html
@@ -8,7 +8,7 @@
   </span>
 [% ELSIF unit.report_allowed %]
   [% any_report_allowed = 1 %]
-  <form method="post" action="[% c.uri_for_action('waste/report', [ uprn ]) %]">
+  <form method="post" action="[% c.uri_for_action('waste/report', [ property.id ]) %]">
     <input type="hidden" name="token" value="[% csrf_token %]">
     <input type="hidden" name="service-[% unit.service_id %]" value="1">
     <input type="submit" value="Report a [% unit.service_name FILTER lower %] collection as missed" class="waste-service-descriptor waste-service-link">
@@ -18,7 +18,7 @@
 [% ELSE %]
   <span class="waste-service-descriptor">Please note that missed collections can only be reported within 2 working days of your scheduled collection day.</span>
 [% END %]
-  <a href="[% c.uri_for_action('waste/enquiry', [ uprn ]) %]?template=problem&amp;service_id=[% unit.service_id %]" class="waste-service-link waste-service-descriptor">Report a problem with a [% unit.service_name FILTER lower %] collection</a>
+  <a href="[% c.uri_for_action('waste/enquiry', [ property.id ]) %]?template=problem&amp;service_id=[% unit.service_id %]" class="waste-service-link waste-service-descriptor">Report a problem with a [% unit.service_name FILTER lower %] collection</a>
 [% IF unit.request_open %]
   <span class="waste-service-descriptor">
     A new [% unit.service_name FILTER lower %] container request has been made
@@ -26,13 +26,13 @@
   </span>
 [% ELSIF unit.request_allowed %]
   [% any_request_allowed = 1 %]
-  <form method="post" action="[% c.uri_for_action('waste/request', [ uprn ]) %]">
+  <form method="post" action="[% c.uri_for_action('waste/request', [ property.id ]) %]">
     <input type="hidden" name="token" value="[% csrf_token %]">
     <input type="hidden" name="container-[% unit.request_containers.0 %]" value="1">
     <input type="submit" value="Request a new [% unit.service_name FILTER lower %] container" class="waste-service-descriptor waste-service-link">
   </form>
 [% END %]
-  <form method="get" action="[% c.uri_for_action('waste/enquiry', [ uprn ]) %]">
+  <form method="get" action="[% c.uri_for_action('waste/enquiry', [ property.id ]) %]">
     <input type="hidden" name="service_id" value="[% unit.service_id %]">
     <input type="hidden" name="category" id="category" value="General Enquiry">
     <input type="submit" value="Contact us about a [% unit.service_name FILTER lower %] collection" class="waste-service-descriptor waste-service-link">
-- 
cgit v1.2.3


From edb761e9ab4299910c020eb48f839bf753da1d7b Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 12 Nov 2020 12:28:10 +0000
Subject: [Bromley] Parallel initial API calls.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 45 ++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 0885f5b6b..933d671be 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -7,6 +7,7 @@ use utf8;
 use DateTime::Format::W3CDTF;
 use DateTime::Format::Flexible;
 use Integrations::Echo;
+use Parallel::ForkManager;
 use Sort::Key::Natural qw(natkeysort_inplace);
 use Try::Tiny;
 use FixMyStreet::DateRange;
@@ -438,8 +439,6 @@ sub look_up_property {
     my $id = shift;
 
     my $cfg = $self->feature('echo');
-    my $echo = Integrations::Echo->new(%$cfg);
-
     if ($cfg->{max_per_day}) {
         my $today = DateTime->today->set_time_zone(FixMyStreet->local_time_zone)->ymd;
         my $ip = $self->{c}->req->address;
@@ -448,7 +447,15 @@ sub look_up_property {
         $self->{c}->detach('/page_error_403_access_denied', []) if $count > $cfg->{max_per_day};
     }
 
-    my $result = $echo->GetPointAddress($id);
+    my $calls = $self->_parallel_api_calls(
+        GetPointAddress => [ $id ],
+        GetServiceUnitsForObject => [ $id ],
+        GetEventsForObject => [ 'PointAddress', $id ],
+    );
+
+    $self->{api_serviceunits} = $calls->{"GetServiceUnitsForObject $id"};
+    $self->{api_events} = $calls->{"GetEventsForObject PointAddress $id"};
+    my $result = $calls->{"GetPointAddress $id"};
     return {
         id => $result->{Id},
         uprn => $result->{SharedRef}{Value}{anyType},
@@ -536,12 +543,10 @@ sub bin_services_for_address {
         544 => 4,
     );
 
-    my $echo = $self->feature('echo');
-    $echo = Integrations::Echo->new(%$echo);
-    my $result = $echo->GetServiceUnitsForObject($property->{id});
+    my $result = $self->{api_serviceunits};
     return [] unless @$result;
 
-    my $events = $echo->GetEventsForObject('PointAddress', $property->{id});
+    my $events = $self->{api_events};
     my $open = $self->_parse_open_events($events);
 
     my @out;
@@ -926,4 +931,30 @@ sub admin_templates_external_status_code_hook {
     return "$res_code,$task_type,$task_state";
 }
 
+sub _parallel_api_calls {
+    my $self = shift;
+    my $echo = $self->feature('echo');
+    $echo = Integrations::Echo->new(%$echo);
+
+    my %calls;
+    my $pm = Parallel::ForkManager->new(FixMyStreet->test_mode ? 0 : 10);
+    $pm->run_on_finish(sub {
+        my ($pid, $exit_code, $ident, $exit_signal, $core_dump, $data) = @_;
+        %calls = ( %calls, %$data );
+    });
+
+    while (@_) {
+        my $call = shift;
+        my $args = shift;
+        $pm->start and next;
+        my $result = $echo->$call(@$args);
+        my $key = "$call @$args";
+        $key = $call if $call eq 'GetTasks';
+        $pm->finish(0, { $key => $result });
+    }
+    $pm->wait_all_children;
+
+    return \%calls;
+}
+
 1;
-- 
cgit v1.2.3


From 4a10007c445be830d2cfc9d06652d379d72f82db Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 12 Nov 2020 12:30:04 +0000
Subject: [Bromley] Parallel service unit API calls.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 933d671be..80a9e0be1 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -549,8 +549,9 @@ sub bin_services_for_address {
     my $events = $self->{api_events};
     my $open = $self->_parse_open_events($events);
 
-    my @out;
-    my %task_ref_to_row;
+    my @to_fetch;
+    my %schedules;
+    my @task_refs;
     foreach (@$result) {
         next unless $_->{ServiceTasks};
 
@@ -558,8 +559,22 @@ sub bin_services_for_address {
         my $schedules = _parse_schedules($servicetask);
 
         next unless $schedules->{next} or $schedules->{last};
+        $schedules{$_->{Id}} = $schedules;
+        push @to_fetch, GetEventsForObject => [ ServiceUnit => $_->{Id} ];
+        push @task_refs, $schedules->{last}{ref} if $schedules->{last};
+    }
+    push @to_fetch, GetTasks => \@task_refs if @task_refs;
+
+    my $calls = $self->_parallel_api_calls(@to_fetch);
+
+    my @out;
+    my %task_ref_to_row;
+    foreach (@$result) {
+        next unless $schedules{$_->{Id}};
+        my $schedules = $schedules{$_->{Id}};
+        my $servicetask = $_->{ServiceTasks}{ServiceTask};
 
-        my $events = $echo->GetEventsForObject('ServiceUnit', $_->{Id});
+        my $events = $calls->{"GetEventsForObject ServiceUnit $_->{Id}"};
         my $open_unit = $self->_parse_open_events($events);
 
         my $containers = $service_to_containers{$_->{ServiceId}};
@@ -588,7 +603,7 @@ sub bin_services_for_address {
         push @out, $row;
     }
     if (%task_ref_to_row) {
-        my $tasks = $echo->GetTasks(map { $_->{last}{ref} } values %task_ref_to_row);
+        my $tasks = $calls->{GetTasks};
         my $now = DateTime->now->set_time_zone(FixMyStreet->local_time_zone);
         foreach (@$tasks) {
             my $ref = join(',', @{$_->{Ref}{Value}{anyType}});
-- 
cgit v1.2.3


From 92386ae67d6d5f7af92234136a7cde5d02650ae4 Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 12 Nov 2020 17:04:22 +0000
Subject: [Bromley] Factor parallel calling to external script.

---
 bin/fixmystreet.com/bromley-echo       | 33 +++++++++++++++++++++++++++++++++
 perllib/FixMyStreet/Cobrand/Bromley.pm | 29 +++++++++++++++++++++++++++--
 2 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100755 bin/fixmystreet.com/bromley-echo

diff --git a/bin/fixmystreet.com/bromley-echo b/bin/fixmystreet.com/bromley-echo
new file mode 100755
index 000000000..01fdec110
--- /dev/null
+++ b/bin/fixmystreet.com/bromley-echo
@@ -0,0 +1,33 @@
+#!/usr/bin/env perl
+
+# bromley-echo
+# Call the Echo API in parallel
+
+use v5.14;
+use warnings;
+
+BEGIN {
+    use File::Basename qw(dirname);
+    use File::Spec;
+    my $d = dirname(File::Spec->rel2abs($0));
+    require "$d/../../setenv.pl";
+}
+
+use Getopt::Long::Descriptive;
+use JSON::MaybeXS;
+use Storable;
+use FixMyStreet::Cobrand::Bromley;
+
+my ($opts, $usage) = describe_options(
+    '%c %o',
+    ['out=s', 'where to output CSV data'],
+    ['calls=s', 'JSON of what API calls to make'],
+    ['help|h', "print usage message and exit" ],
+);
+$usage->die if $opts->help;
+
+my $cobrand = FixMyStreet::Cobrand::Bromley->new;
+
+my $calls = decode_json($opts->calls);
+$calls = $cobrand->_parallel_api_calls(@$calls);
+Storable::store($calls, $opts->out);
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 80a9e0be1..18a730d3e 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -6,9 +6,12 @@ use warnings;
 use utf8;
 use DateTime::Format::W3CDTF;
 use DateTime::Format::Flexible;
+use File::Temp;
 use Integrations::Echo;
+use JSON::MaybeXS;
 use Parallel::ForkManager;
 use Sort::Key::Natural qw(natkeysort_inplace);
+use Storable;
 use Try::Tiny;
 use FixMyStreet::DateRange;
 use FixMyStreet::WorkingDays;
@@ -447,7 +450,7 @@ sub look_up_property {
         $self->{c}->detach('/page_error_403_access_denied', []) if $count > $cfg->{max_per_day};
     }
 
-    my $calls = $self->_parallel_api_calls(
+    my $calls = $self->call_api(
         GetPointAddress => [ $id ],
         GetServiceUnitsForObject => [ $id ],
         GetEventsForObject => [ 'PointAddress', $id ],
@@ -565,7 +568,7 @@ sub bin_services_for_address {
     }
     push @to_fetch, GetTasks => \@task_refs if @task_refs;
 
-    my $calls = $self->_parallel_api_calls(@to_fetch);
+    my $calls = $self->call_api(@to_fetch);
 
     my @out;
     my %task_ref_to_row;
@@ -946,6 +949,28 @@ sub admin_templates_external_status_code_hook {
     return "$res_code,$task_type,$task_state";
 }
 
+sub call_api {
+    my $self = shift;
+
+    my $tmp = File::Temp->new;
+    my @cmd = (
+        FixMyStreet->path_to('bin/fixmystreet.com/bromley-echo'),
+        '--out', $tmp,
+        '--calls', encode_json(\@_),
+    );
+
+    # We cannot fork directly under mod_fcgid, so
+    # call an external script that calls back in.
+    my $data;
+    if (FixMyStreet->test_mode) {
+        $data = $self->_parallel_api_calls(@_);
+    } else {
+        system(@cmd);
+        $data = Storable::fd_retrieve($tmp);
+    }
+    return $data;
+}
+
 sub _parallel_api_calls {
     my $self = shift;
     my $echo = $self->feature('echo');
-- 
cgit v1.2.3


From 831332e4916aab75027bf794f5a1abb8d6f0b0dd Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Thu, 12 Nov 2020 18:12:05 +0000
Subject: [Bromley] Fix issue when empty schedules.

---
 perllib/FixMyStreet/Cobrand/Bromley.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 18a730d3e..cd923c19d 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -697,6 +697,7 @@ sub _parse_open_events {
 
 sub _parse_schedules {
     my $servicetask = shift;
+    return unless $servicetask->{ServiceTaskSchedules};
     my $schedules = $servicetask->{ServiceTaskSchedules}{ServiceTaskSchedule};
     $schedules = [ $schedules ] unless ref $schedules eq 'ARRAY';
 
-- 
cgit v1.2.3


From 628de40b877974eb553e0910753f2d4cd983d9de Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Fri, 13 Nov 2020 14:24:54 +0000
Subject: Add GitHub Actions.

We now have Image::Magick, so make sure that is handled better.
---
 .github/workflows/coverage.yml                     | 62 +++++++++++++++++++
 .github/workflows/cypress.yml                      | 46 +++++++++++++++
 .github/workflows/default.yml                      | 49 +++++++++++++++
 .travis.yml                                        | 69 ----------------------
 .travis/after_script                               | 33 -----------
 .travis/install                                    | 29 ---------
 .travis/utils.py                                   | 22 -------
 .../Devel/Cover/Report/Codecov/Service/GitHub.pm   | 33 +++++++++++
 .../FixMyStreet/App/Controller/Admin/Reports.pm    |  1 +
 perllib/FixMyStreet/App/Model/PhotoSet.pm          | 31 ++++++----
 perllib/FixMyStreet/ImageMagick.pm                 |  6 +-
 11 files changed, 212 insertions(+), 169 deletions(-)
 create mode 100644 .github/workflows/coverage.yml
 create mode 100644 .github/workflows/cypress.yml
 create mode 100644 .github/workflows/default.yml
 delete mode 100644 .travis.yml
 delete mode 100755 .travis/after_script
 delete mode 100755 .travis/install
 delete mode 100755 .travis/utils.py
 create mode 100644 perllib/Devel/Cover/Report/Codecov/Service/GitHub.pm

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
new file mode 100644
index 000000000..163f777c4
--- /dev/null
+++ b/.github/workflows/coverage.yml
@@ -0,0 +1,62 @@
+name: Coverage
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: Run coverage tests
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        part: [ 1, 2, 3 ]
+
+    env:
+      PERL5LIB: local-coverage/lib/perl5
+      HARNESS_PERL_SWITCHES: "-MDevel::Cover=+ignore,local/lib/perl5,commonlib,perllib/Catalyst/[^A],perllib/Email,Test.pm,^t"
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - uses: niden/actions-memcached@v7
+
+    - name: Setup cache (carton)
+      uses: actions/cache@v2
+      with:
+        path: local
+        key: ${{ runner.os }}-carton-${{ hashFiles('cpanfile.snapshot') }}
+
+    - name: Setup cache (coverage)
+      uses: actions/cache@v2
+      with:
+        path: local-coverage
+        key: ${{ runner.os }}-coverage
+
+    - name: Install packages
+      run: |
+        sudo apt install -y gettext language-pack-en language-pack-de language-pack-sv libimage-magick-perl
+        vendor/bin/carton install --deployment
+        commonlib/bin/gettext-makemo FixMyStreet
+        bin/cpanm --quiet --notest -l local-coverage Devel::Cover::Report::Codecov JSON::MaybeXS
+
+    - name: Run tests (with coverage, part 1)
+      if: matrix.part == 1
+      run: script/test --jobs 3 $(find t/app/controller -name "[a-q]*.t")
+
+    - name: Run tests (with coverage, part 2)
+      if: matrix.part == 2
+      run: script/test --jobs 3 $(find t/app/controller -name "[r-z]*.t")
+
+    - name: Run tests (with coverage, part 3)
+      if: matrix.part == 3
+      run: script/test --jobs 3 $(find t -name "*.t" ! -path "t/app/controller*")
+
+    - name: Generate coverage report
+      if: success()
+      run: local-coverage/bin/cover --report codecov
+      env:
+        PERL5LIB: 'local-coverage/lib/perl5:perllib'
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
new file mode 100644
index 000000000..557ebd529
--- /dev/null
+++ b/.github/workflows/cypress.yml
@@ -0,0 +1,46 @@
+name: Cypress
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: Run Cypress tests
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Setup node
+      uses: actions/setup-node@v1
+      with:
+        node-version: 8.x
+
+    - name: Setup cache (carton)
+      uses: actions/cache@v2
+      with:
+        path: local
+        key: ${{ runner.os }}-carton-${{ hashFiles('cpanfile.snapshot') }}
+
+    - name: Setup cache (cypress)
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.npm
+          node_modules
+        key: ${{ runner.os }}-node-8-cypress-3.8.3
+
+    - name: Install packages
+      run: |
+        sudo apt install -y gettext
+        npm install cypress@3.8.3
+        vendor/bin/carton install --deployment
+        commonlib/bin/gettext-makemo FixMyStreet
+        echo "$(npm bin)" >> $GITHUB_PATH
+
+    - name: Run Cypress tests
+      run: |
+        bin/browser-tests run ${CYPRESS_RECORD_KEY:+--record}
+      env:
+        CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
new file mode 100644
index 000000000..c3becce85
--- /dev/null
+++ b/.github/workflows/default.yml
@@ -0,0 +1,49 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: Test on perl ${{ matrix.perl_version }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # stretch, buster, focal/bullseye, xenial, trusty
+        # bionic 5.26 is ubuntu-latest, in coverage run
+        perl_version: [ 5.24.4, 5.28.3, 5.30.3, 5.22.4, 5.18.4 ]
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Setup cache (carton)
+      uses: actions/cache@v2
+      with:
+        path: local
+        key: ${{ runner.os }}-perl-${{ matrix.perl_version }}-carton-${{ hashFiles('cpanfile.snapshot') }}
+
+    - name: Setup cache (perl)
+      id: cache-perl
+      uses: actions/cache@v2
+      with:
+        path: ~/perl5
+        key: ${{ runner.os }}-perl-${{ matrix.perl_version }}
+
+    - name: Install correct perl
+      if: steps.cache-perl.outputs.cache-hit != 'true'
+      run: |
+          wget -qO - https://install.perlbrew.pl | bash
+          ~/perl5/perlbrew/bin/perlbrew install --notest ${{ matrix.perl_version }}
+          ~/perl5/perlbrew/bin/perlbrew clean
+
+    - name: Add packages
+      run: |
+        sudo apt install -y gettext language-pack-en language-pack-de language-pack-sv libimage-magick-perl
+        ~/perl5/perlbrew/bin/perlbrew exec vendor/bin/carton install --deployment
+        commonlib/bin/gettext-makemo FixMyStreet
+
+    - name: Run tests
+      run: ~/perl5/perlbrew/bin/perlbrew exec script/test --jobs 3 t
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ca5eaee6c..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-dist: trusty
-
-notifications:
-  email: false
-  irc:
-    channels:
-      - "irc.freenode.net#fixmystreet"
-    use_notice: true
-    skip_join: true
-  slack:
-    secure: "yY05S8ecxMv5GwexGQV/9sqUwxn1j0LF8KyG0VnoMPqJXOaGmkAe60I695CC7/P0AaNC2oWfqMZcEcdXZNa8l7kWluxyRktt6cP+VDPmIKJqcsasoDPDTLlZQTNy8i+EwxzRWDUUMFjLet6lqZYEbBPeCSufmQyyjknhGiSPGsQ="
-  webhooks:
-    urls:
-      secure: "x6M1u9SFv2oQpo28wDSpURV0Rnk+jTA5VCXIjlo0ccbEV1IOp36KSJT3A2lSbf2BDlwGlKcbgtMP9dk83So2dhvPow7ogemouW+Rx1olYJgzoTR3v5cZt9pn7g6y0O1M+AkDIzabzT90oRD4//YVY5OS16ZjePcBWwp9yHEEQ7I="
-
-# Put the versions in the matrix below so that we're ordered better
-language: perl
-
-cache:
-  directories:
-    - ~/.npm
-    - node_modules
-
-matrix:
-  include:
-  - perl: "5.24" # stretch
-  - perl: "5.26" # bionic
-    env: "COVERAGE_PART=1" # Running the tests with coverage is much slower, so split the test run in two
-  - perl: "5.26"
-    env: "COVERAGE_PART=2"
-  - perl: "5.22"
-    env: "CYPRESS=1" # Run headless browser tests
-  - perl: "5.22" # xenial
-  - perl: "5.18" # trusty
-  - perl: "5.20" # jessie
-  - perl: "5.28" # buster
-
-env:
-  global:
-    - "S3_BUCKET=fixmystreet-bundle-cache"
-    - "CYPRESS=0"
-    - "COVERAGE_PART=0"
-    - secure: "llgWNfR/8pH0HjYpg+xhVxuqTaLC0GGUugfuINiUap7JxzjCZ2rlryxCXA4BCM8GUHa9wlYKhrKCSx+DM3EHRE0cLei7LNxAK1JSXLj3NihFQhqnq64tjDwGCSA4l7mlqErA7DK4Dpmh+hBp5f680akITAInM92CbwQZxLDYaCU="
-    - secure: "qW+WCgAF68itADxcbcq+nCnKx3vf3GX73HMfjfbkFFUsYmIR+ZaJ9yQMnGJwxIpCHTWLAeqyx4KO8N8T3GmNdKYzIMZemOzp4ED29YC31QOQeq1CwNp2hD5sq/o47d2BzXWwMYNvNXfxz1K6r2c6EMPUtu8X3B8ExZq1RzSFdXs="
-
-sudo: false
-
-addons:
-    apt:
-        packages:
-            - gettext
-            - language-pack-de
-            - language-pack-sv
-
-install:
-  - .travis/install
-  - 'if [ "$COVERAGE_PART" != "0" ]; then cpanm --quiet --notest Devel::Cover::Report::Codecov; fi'
-  - 'if [ "$CYPRESS" = "1" ]; then npm install cypress@3.8.3; fi'
-before_script:
-  - commonlib/bin/gettext-makemo FixMyStreet
-  - 'if [ "$COVERAGE_PART" != "0" ]; then export HARNESS_PERL_SWITCHES="-MDevel::Cover=+ignore,local/lib/perl5,commonlib,perllib/Catalyst/[^A],perllib/Email,Test.pm,^t"; fi'
-script:
-  - 'if [ "$CYPRESS" = "0" ] && [ "$COVERAGE_PART" = "0" ]; then script/test --jobs 3 t; fi'
-  - 'if [ "$COVERAGE_PART" = "1" ]; then script/test --jobs 3 `find t/app/controller -name "*.t"`; fi'
-  - 'if [ "$COVERAGE_PART" = "2" ]; then script/test --jobs 3 `find t -name "*.t" ! -path "t/app/controller*"`; fi'
-  - 'if [ "$CYPRESS" = "1" ]; then PATH=$(npm bin):$PATH bin/browser-tests run ${CYPRESS_RECORD_KEY:+--record}; fi'
-after_success:
-  - .travis/after_script
-  - 'if [ "$COVERAGE_PART" != "0" ]; then cover --report codecov; fi'
diff --git a/.travis/after_script b/.travis/after_script
deleted file mode 100755
index 2a8b2268d..000000000
--- a/.travis/after_script
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import site
-import sys
-import tarfile
-from utils import get_bundle_filename
-
-wanted_filename = get_bundle_filename()
-
-if os.path.exists(wanted_filename) and os.path.getsize(wanted_filename):
-    print "File was downloaded, no need to upload"
-    sys.exit()
-
-site.addsitedir(site.getusersitepackages())
-os.system('pip install --user boto')
-
-import boto
-from boto.s3.key import Key
-
-print "Creating archive..."
-tfile = tarfile.open(wanted_filename, 'w:gz')
-tfile.add('local')
-tfile.close()
-
-print "Uploading archive to S3..."
-conn = boto.connect_s3()
-bucket = conn.get_bucket('fixmystreet-bundle-cache')
-key = Key(bucket)
-key.key = wanted_filename
-key.set_contents_from_filename(wanted_filename)
-
-print "Completed"
diff --git a/.travis/install b/.travis/install
deleted file mode 100755
index c9d0aef78..000000000
--- a/.travis/install
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-import tarfile
-import urllib
-from utils import get_bundle_filename
-
-wanted_filename = get_bundle_filename()
-
-url = 'https://fixmystreet-bundle-cache.s3.amazonaws.com/%s' % wanted_filename
-try:
-    urllib.urlretrieve(url, wanted_filename)
-    if tarfile.is_tarfile(wanted_filename):
-        tfile = tarfile.open(wanted_filename)
-        tfile.extractall()
-        print "Cached copy found and extracted"
-        sys.exit(0)
-    else:
-        os.remove(wanted_filename)
-except IOError:
-    os.remove(wanted_filename)
-
-print "No cached copy found, running carton install..."
-ret = os.system('vendor/bin/carton install --deployment')
-if ret:
-    os.system('cat ~/.cpanm/build.log')
-
-sys.exit(ret)
diff --git a/.travis/utils.py b/.travis/utils.py
deleted file mode 100755
index f56b7d9d4..000000000
--- a/.travis/utils.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import hashlib
-import os
-
-
-def get_bundle_filename():
-    root = os.path.join(os.path.dirname(__file__), '..')
-    with open(os.path.join(root, 'cpanfile.snapshot')) as cpanfile:
-        hash = hashlib.md5(cpanfile.read()).hexdigest()
-
-    try:
-        version = os.environ['TRAVIS_PERL_VERSION']
-    except KeyError:
-        # Not running on Travis, assume default Travis version
-        version = '5.14'
-
-    if version == '5.14':
-        version = ''
-    else:
-        version = '-%s' % version
-
-    filename = 'fixmystreet-local-%s%s.tgz' % (hash, version)
-    return filename
diff --git a/perllib/Devel/Cover/Report/Codecov/Service/GitHub.pm b/perllib/Devel/Cover/Report/Codecov/Service/GitHub.pm
new file mode 100644
index 000000000..a5d5e7fb7
--- /dev/null
+++ b/perllib/Devel/Cover/Report/Codecov/Service/GitHub.pm
@@ -0,0 +1,33 @@
+package Devel::Cover::Report::Codecov::Service::GitHub;
+use strict;
+use warnings;
+use utf8;
+
+sub detect {
+    return $ENV{GITHUB_ACTIONS};
+}
+
+sub configuration {
+    (my $branch = $ENV{GITHUB_REF}) =~ s{^refs/heads/}{};
+
+    my $conf = {
+        service      => 'github-actions',
+        commit       => $ENV{GITHUB_SHA},
+        slug         => $ENV{GITHUB_REPOSITORY},
+        build        => $ENV{GITHUB_RUN_ID},
+        build_url    => "https://github.com/$ENV{GITHUB_REPOSITORY}/actions/runs/$ENV{GITHUB_RUN_ID}",
+        branch       => $branch,
+    };
+
+    if ($ENV{GITHUB_HEAD_REF}) {
+        (my $pr = $ENV{GITHUB_REF}) =~ s{^refs/pull/}{};
+        $pr =~ s{/merge$}{};
+        $conf->{pr} = $pr;
+        $conf->{branch} = $ENV{GITHUB_HEAD_REF};
+    }
+
+    return $conf;
+}
+
+1;
+__END__
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
index e3a425632..20801e0cf 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Reports.pm
@@ -4,6 +4,7 @@ use namespace::autoclean;
 
 BEGIN { extends 'Catalyst::Controller'; }
 
+use utf8;
 use List::MoreUtils 'uniq';
 use FixMyStreet::SMS;
 use Utils;
diff --git a/perllib/FixMyStreet/App/Model/PhotoSet.pm b/perllib/FixMyStreet/App/Model/PhotoSet.pm
index 76a287e71..85e457856 100644
--- a/perllib/FixMyStreet/App/Model/PhotoSet.pm
+++ b/perllib/FixMyStreet/App/Model/PhotoSet.pm
@@ -8,6 +8,7 @@ use Scalar::Util 'openhandle', 'blessed';
 use Image::Size;
 use IPC::Cmd qw(can_run);
 use IPC::Open3;
+use Try::Tiny;
 
 use FixMyStreet;
 use FixMyStreet::ImageMagick;
@@ -149,7 +150,9 @@ has ids => ( #  Arrayref of $fileid tuples (always, so post upload/raw data proc
                 }
 
                 # we have an image we can use - save it to storage
-                $photo_blob = FixMyStreet::ImageMagick->new(blob => $photo_blob)->shrink('2048x2048')->as_blob;
+                $photo_blob = try {
+                    FixMyStreet::ImageMagick->new(blob => $photo_blob)->shrink('2048x2048')->as_blob;
+                } catch { $photo_blob };
                 return $self->storage->store_photo($photo_blob);
             }
 
@@ -201,18 +204,20 @@ sub get_image_data {
     }
 
     my $im = FixMyStreet::ImageMagick->new(blob => $image->{data});
-    my $photo;
-    if ( $size eq 'tn' ) {
-        $photo = $im->shrink('x100');
-    } elsif ( $size eq 'fp' ) {
-        $photo = $im->crop;
-    } elsif ( $size eq 'og' ) {
-        $photo = $im->crop('1200x630');
-    } elsif ( $size eq 'full' ) {
-        $photo = $im
-    } else {
-        $photo = $im->shrink($args{default} || '250x250');
-    }
+    my $photo = try {
+        if ( $size eq 'tn' ) {
+            $im->shrink('x100');
+        } elsif ( $size eq 'fp' ) {
+            $im->crop;
+        } elsif ( $size eq 'og' ) {
+            $im->crop('1200x630');
+        } elsif ( $size eq 'full' ) {
+            $im
+        } else {
+            $im->shrink($args{default} || '250x250');
+        }
+    };
+    return unless $photo;
 
     return {
         data => $photo->as_blob,
diff --git a/perllib/FixMyStreet/ImageMagick.pm b/perllib/FixMyStreet/ImageMagick.pm
index d9f643801..ec99fd877 100644
--- a/perllib/FixMyStreet/ImageMagick.pm
+++ b/perllib/FixMyStreet/ImageMagick.pm
@@ -64,7 +64,7 @@ sub shrink {
     my ($self, $size) = @_;
     return $self unless $self->image;
     my $err = $self->image->Scale(geometry => "$size>");
-    throw Error::Simple("resize failed: $err") if "$err";
+    die "resize failed: $err" if "$err";
     $self->_set_width_and_height();
     return $self->strip;
 }
@@ -76,9 +76,9 @@ sub crop {
     $size //= '90x60';
     return $self unless $self->image;
     my $err = $self->image->Resize( geometry => "$size^" );
-    throw Error::Simple("resize failed: $err") if "$err";
+    die "resize failed: $err" if "$err";
     $err = $self->image->Extent( geometry => $size, gravity => 'Center' );
-    throw Error::Simple("resize failed: $err") if "$err";
+    die "resize failed: $err" if "$err";
     $self->_set_width_and_height();
     return $self->strip;
 }
-- 
cgit v1.2.3


From cea89fb87a96943708a1db0f646492fbfaaf000f Mon Sep 17 00:00:00 2001
From: M Somerville <matthew-github@dracos.co.uk>
Date: Wed, 11 Nov 2020 16:45:00 +0000
Subject: Version 3.1.

---
 CHANGELOG.md                                      |   82 +-
 README.md                                         |    2 +-
 bin/gettext-nget-patch                            |    3 +-
 bin/site-specific-install.sh                      |    2 +-
 docs/_posts/2020-11-16-v3.1.md                    |   42 +
 locale/FixMyStreet.po                             |  915 +--
 locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po        | 1275 +++--
 locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1260 +++--
 locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1252 +++--
 locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1263 +++--
 locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po        | 1253 +++--
 locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1263 +++--
 locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1253 +++--
 locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1817 +++---
 locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1263 +++--
 locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po        | 1616 +++---
 locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1272 +++--
 locale/fa_IR.UTF-8/LC_MESSAGES/FixMyStreet.po     | 6116 +++++++++++++++++++++
 locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1275 +++--
 locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1250 +++--
 locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po        | 1271 +++--
 locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1241 +++--
 locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1272 +++--
 locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po        | 1494 ++---
 locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1259 +++--
 locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po        | 1261 +++--
 locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1257 +++--
 locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1275 +++--
 locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1259 +++--
 locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1258 +++--
 locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1516 ++---
 locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po        | 1275 +++--
 locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po     | 2858 ++++++----
 locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1239 +++--
 locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po        | 1263 +++--
 locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1256 +++--
 locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po        | 1272 +++--
 locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po        | 1271 +++--
 locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1300 +++--
 locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1263 +++--
 locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po     | 1265 +++--
 locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po        | 1263 +++--
 templates/web/base/admin/users/_form_details.html |    2 +-
 43 files changed, 32197 insertions(+), 22167 deletions(-)
 create mode 100644 docs/_posts/2020-11-16-v3.1.md
 create mode 100644 locale/fa_IR.UTF-8/LC_MESSAGES/FixMyStreet.po

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 852d5bb17..458cb2e15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,66 +1,76 @@
 ## Releases
 
 * Unreleased
+
+* v3.1 (16th November 2020)
     - Security:
-        - Store personal access tokens hashed, and only show once, upon generation.
+        - Store personal access tokens hashed, and only show once, upon generation. #3063
     - New features:
         - Add Open Location Codes support to search box. #3047
     - Front end improvements:
-        - Add lazy image loading on list items.
-        - Improve Bing geocoder results.
-        - Add option of checking passwords against Have I Been Pwned.
-        - Add aerial maps option to Bing and OSM maps.
+        - Add lazy image loading on list items. #3062
+        - Improve Bing geocoder results. #2300 #3086
+        - Add option of checking passwords against Have I Been Pwned. #3095
+        - Add aerial maps option to Bing and OSM maps. #3041 #3114
         - Select matches for both filter category and group. #3110
         - Add an extra zoom level to most map types. #3130
-        - Improve new report form when using phone verification.
+        - Improve new report form when using phone verification. #3191
     - Changes:
-        - Mark user as active when sent an email alert.
+        - Mark user as active when sent an email alert. #3045
     - Bugfixes:
         - Fix issue with dashboard report CSV export. #3026
         - bin/update-schema PostgreSQL 12 compatibility. #3043
-        - Make sure category shown in all its groups when reporting.
-        - Do not remove any devolved contacts.
-        - Fix double encoding of per-category templates.
+        - Make sure category shown in all its groups when reporting. #3029
+        - Do not remove any devolved contacts. #3053
+        - Fix double encoding of per-category templates. #3058
         - Return reports in all closed states through Open311.
-        - Skip accounts without email when sending inactive emails.
-        - Include file extensions in Dropzone accepted photo config.
-        - Fix photo orientation in modern browsers.
+        - Skip accounts without email when sending inactive emails. #3066
+        - Include file extensions in Dropzone accepted photo config. #3098
+        - Fix photo orientation in modern browsers. #3098
         - Improve compatibility with G Suite OpenID Connect authentication. #3032
-        - Fix duplicate asset message after dismissing duplicate suggestions.
+        - Fix duplicate asset message after dismissing duplicate suggestions. #3101
         - Improve moderation diff display in a few small ways. #3105
         - Do not have bootstrap run sudo commands. #2930
-        - Fix lookups in templates of categories with &s.
-        - Fix a few obscure asset layer changing issues.
-        - Fix multiple disable messages for dropdown answers
-        - Do not trigger duplicate check when checking stoppers
+        - Fix lookups in templates of categories with &s. #3120
+        - Fix a few obscure asset layer changing issues. #3157
+        - Fix multiple disable messages for dropdown answers. #3186
+        - Do not trigger duplicate check when checking stoppers #3194
         - Do not strip spaces from middle of Open311 category codes. #3167
-        - Show all category history even if category renamed.
-        - Fix email alert on initial update template.
-        - Do not cache the service worker
+        - Show all category history even if category renamed. #3181
+        - Fix email alert on initial update template. #3209
+        - Do not cache the service worker. #3201
     - Admin improvements:
+        - Interface for disabling updates/reopening for certain categories. #2991 #2992
+        - Include group in CSV export if enabled. #2994
+        - Disable category rename on Open311 categories when unprotected. #2957
+        - In category admin, group is already shown elsewhere.
+        - Add assigned_(users|categories)_only functionality.
+        - Inspectors can now include a photo with public updates. #2902
         - Display user name/email for contributed as reports. #2990
         - Interface for enabling anonymous reports for certain categories. #2989
-        - Better sort admin user table.
-        - Centralise update creation to include fields.
-        - Add full text index to speed up admin search.
-        - Offline process for CSV generation.
-        - Allow inspectors to change report asset.
+        - Better sort admin user table. #3107
+        - Centralise update creation to include fields. #3111 #3123
+        - Add full text index to speed up admin search. #3129 #3133
+        - Offline process for CSV generation. #3146
+        - Allow inspectors to change report asset. #3134 #3150
         - Staff users can use HTML tags in updates. #3143
         - Response templates can include HTML tags. #3143
-        - Record whether report made on desktop or mobile.
+        - Record whether report made on desktop or mobile. #3199
         - Do not display deleted priorities in inspect form. #3195
-        - Include extra fields in submit emails.
-        - can remove staff status from users in bulk
-        - super users can mark category names as hard coded
+        - Include extra fields in submit emails. #3215
+        - can remove staff status from users in bulk. #3221
+        - super users can mark category names as hard coded. #3227
     - Development improvements:
         - `#geolocate_link` is now easier to re-style. #3006
         - Links inside `#front-main` can be customised using `$primary_link_*` Sass variables. #3007
         - Add option to show front end testing code coverage. #3036
         - Add function to fetch user's country from Gaze.
-        - Add cobrand hook to specify custom domain for VERP emails.
+        - Add cobrand hook to specify custom domain for VERP emails. #3100
     - Open311 improvements:
-        - Use devolved data on update sending.
-        - Rewrite open311-update-reports to share code and improve functionality.
+        - Use devolved data on update sending. #3087
+        - Rewrite open311-update-reports to share code and improve functionality. #3092
+    - Internal things:
+        - Move from Travis to GitHub Actions. #3244
     - UK:
         - Add option for recaptcha. #3050
         - Display search tips when location search returns no results. #3180
@@ -75,12 +85,6 @@
         - Move stats from main admin index to stats index. #2982
         - Speed up dashboard export and report search. #2988
         - Allow a template to be an initial update on reports. #2973
-        - Interface for disabling updates/reopening for certain categories. #2991 #2992
-        - Include group in CSV export if enabled. #2994
-        - Disable category rename on Open311 categories when unprotected. #2957
-        - In category admin, group is already shown elsewhere.
-        - Add assigned_(users|categories)_only functionality.
-        - Inspectors can now include a photo with public updates. #2902
     - Bugfixes:
         - Application user in Docker container can't install packages. #2914
         - Look at all categories when sending reports.
diff --git a/README.md b/README.md
index 48ce92860..604725656 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ RSS alerts of problems in their area.
 
 It was created in 2007 by [mySociety](https://www.mysociety.org/) for reporting
 problems to UK councils and has been copied around the world. The FixMyStreet
-Platform is now at version 3.0.1; see CHANGELOG.md for a version history.
+Platform is now at version 3.1; see CHANGELOG.md for a version history.
 
 ## Installation
 
diff --git a/bin/gettext-nget-patch b/bin/gettext-nget-patch
index 5d30cc922..decd18755 100755
--- a/bin/gettext-nget-patch
+++ b/bin/gettext-nget-patch
@@ -28,7 +28,7 @@ find( sub {
         }
     }
     close FP;
-}, 'templates', 'perllib');
+}, 'templates/email', 'templates/web/base', 'templates/web/zurich', 'perllib');
 
 foreach (sort { $a->{s} cmp $b->{s} } values %out) {
     print <<EOF;
@@ -41,4 +41,3 @@ msgstr[0] ""
 msgstr[1] ""
 EOF
 }
-
diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh
index 2b773fecb..ae9497aef 100644
--- a/bin/site-specific-install.sh
+++ b/bin/site-specific-install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Set this to the version we want to check out
-VERSION=${VERSION_OVERRIDE:-v3.0.1}
+VERSION=${VERSION_OVERRIDE:-v3.1}
 
 PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh
 
diff --git a/docs/_posts/2020-11-16-v3.1.md b/docs/_posts/2020-11-16-v3.1.md
new file mode 100644
index 000000000..9b5ba4b24
--- /dev/null
+++ b/docs/_posts/2020-11-16-v3.1.md
@@ -0,0 +1,42 @@
+---
+layout: post
+title: Version 3.1
+author: matthew
+---
+
+<div class="r" align="right">
+<a data-flickr-embed="true" href="https://www.flickr.com/photos/theknowlesgallery/8015992277/" title="Palouse Wheat ready for harvest"><img src="https://live.staticflickr.com/8300/8015992277_ce32585019.jpg" width="500" height="335" alt="Palouse Wheat ready for harvest"></a><script async src="//embedr.flickr.com/assets/client-code.js" charset="utf-8"></script>
+</div>
+
+I hope you are all okay with the ongoing situations around the world. We are
+happy to release **version 3.1**, with some new features and bugfixes.
+
+### Front end improvements
+
+A random assortment of improvements to the front end, including aerial maps for
+Bing and OSM maps, lazy image loading on list items, the ability to check
+passwords against Have I Been Pwned, and Open Location Codes support in the
+search box.
+
+### Admin improvements
+
+We've added a full text index so searching reports in the admin should be much
+quicker. You can disable updates or reopening on a per-category basis, as well
+as enable anonymous reporting. CSV generation is now done asynchronously, with
+progress shown, in case it takes a long time. Staff users can use HTML in
+updates, and response templates can also include HTML. The site now records
+whether a report was made on desktop or mobile, and includes any extra fields
+in email submissions to bodies. Staff status can be removed from users in bulk,
+and inspectors can update the asset on a report via the inspector form.
+
+### Bugfixes
+
+As always, a wide variety of issues covered here. We added PostgreSQL 12
+compatibility to the schema update script, fixed an issue where the CSV export
+returned multiple entries per row, added a fix for photo orientation in modern
+browsers, and improved the moderation diff display.
+
+### Upgrading
+
+A full list of changes can be seen in the
+[changelog](https://github.com/mysociety/fixmystreet/releases/tag/v3.1) as usual.
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index 2f9446010..cbfb0c582 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-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\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/Queue/Item/Report.pm:194
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717 perllib/FixMyStreet/DB/Result/Problem.pm:719 perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr ""
 
@@ -42,7 +42,7 @@ msgstr ""
 msgid "%d users already existed"
 msgstr ""
 
-#: templates/web/base/dashboard/heatmap.html:0 templates/web/base/dashboard/heatmap.html:9 templates/web/base/reports/body.html:0 templates/web/base/reports/body.html:31
+#: templates/web/base/dashboard/heatmap.html:0 templates/web/base/dashboard/heatmap.html:9 templates/web/base/reports/body.html:0 templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr ""
 
@@ -95,7 +95,7 @@ msgstr ""
 msgid "%s ref:&nbsp;%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -139,7 +139,7 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr ""
 
-#: templates/web/base/report/new/form_user_loggedin.html:39 templates/web/zurich/report/new/fill_in_details_form.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:50 templates/web/base/report/form/user_loggedout_by_email.html:56 templates/web/base/report/new/form_user_loggedin.html:39 templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr ""
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 perllib/FixMyStreet/App/Controller/Report/New.pm:769 templates/web/zurich/admin/bodies/form.html:27
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606 perllib/FixMyStreet/App/Controller/Report/New.pm:778 templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr ""
 
@@ -179,17 +179,17 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/index.html:18 templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23 templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24 templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -218,7 +218,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -234,7 +234,7 @@ msgstr ""
 msgid "Access denied"
 msgstr ""
 
-#: templates/web/base/auth/2fa/intro.html:20 templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/2fa/intro.html:20 templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -253,7 +253,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 msgid "Add another parent category"
 msgstr ""
 
@@ -281,7 +281,7 @@ msgstr ""
 msgid "Add new category"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -289,23 +289,23 @@ 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:149 templates/web/base/report/_main.html:25 templates/web/base/report/_main.html:36
+#: templates/web/base/report/_item.html:21 templates/web/base/report/_item.html:27 templates/web/base/report/_main.html:149 templates/web/base/report/_main.html:25 templates/web/base/report/_main.html:36
 msgid "Add to shortlist"
 msgstr ""
 
-#: templates/web/base/admin/users/edit.html:4 templates/web/base/admin/users/index.html:95 templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/edit.html:4 templates/web/base/admin/users/index.html:101 templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777 perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -321,6 +321,11 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67 templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr ""
@@ -333,7 +338,7 @@ msgstr ""
 msgid "Alert %d disabled (created %s)"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46 templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69 templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr ""
 
@@ -341,11 +346,11 @@ msgstr ""
 msgid "Alerts:"
 msgstr ""
 
-#: templates/web/base/dashboard/index.html:40 templates/web/base/dashboard/index.html:52 templates/web/base/dashboard/index.html:65 templates/web/base/reports/_list-filter-status.html:4 templates/web/zurich/reports/_list-filter-status.html:2
+#: templates/web/base/dashboard/index.html:40 templates/web/base/dashboard/index.html:52 templates/web/base/dashboard/index.html:65 templates/web/base/reports/_list-filter-status.html:4 templates/web/zurich/header.html:57 templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
-#: templates/web/zurich/reports/index.html:14
+#: templates/web/zurich/admin/reports/index.html:1 templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr ""
 
@@ -377,6 +382,10 @@ msgstr ""
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+msgid "Allow anonymous reports on this category"
+msgstr ""
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -409,7 +418,7 @@ msgstr ""
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135 templates/web/base/admin/update_edit.html:23 templates/web/base/admin/update_edit.html:96 templates/web/base/report/update/moderation_diff.html:5
+#: templates/web/base/admin/reports/edit.html:148 templates/web/base/admin/update_edit.html:23 templates/web/base/admin/update_edit.html:96 templates/web/base/report/update/moderation_diff.html:5
 msgid "Anonymous:"
 msgstr ""
 
@@ -418,12 +427,12 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/admin/manifesttheme/form.html:62 templates/web/base/admin/reports/edit.html:85 templates/web/base/admin/roles/form.html:25 templates/web/base/admin/states/index.html:48 templates/web/base/admin/templates/edit.html:88 templates/web/base/js/translation_strings.html:99 templates/web/base/report/display_tools.html:7
+#: templates/web/base/admin/manifesttheme/form.html:62 templates/web/base/admin/reports/edit.html:85 templates/web/base/admin/roles/form.html:25 templates/web/base/admin/states/index.html:48 templates/web/base/admin/templates/edit.html:77 templates/web/base/js/translation_strings.html:101 templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
 
@@ -431,7 +440,7 @@ msgstr ""
 msgid "Area covered"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -443,26 +452,30 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158 templates/web/zurich/admin/stats/index.html:57
+#: templates/web/zurich/admin/reports/edit.html:162 templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+msgid "Assigned categories only"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr ""
@@ -475,7 +488,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -483,11 +496,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -499,12 +512,12 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342 templates/web/zurich/report/_item.html:11
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363 templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:45
+#: templates/web/base/dashboard/status.html:17 templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr ""
 
@@ -524,7 +537,7 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693 perllib/FixMyStreet/Cobrand/Default.pm:776 perllib/FixMyStreet/Cobrand/KiitC.pm:208 perllib/FixMyStreet/Cobrand/KiitC.pm:325 perllib/FixMyStreet/Cobrand/Zurich.pm:418 templates/web/base/admin/bodies/index.html:1 templates/web/base/admin/reports/edit.html:56 templates/web/zurich/header.html:52
+#: perllib/FixMyStreet/Cobrand/Default.pm:709 perllib/FixMyStreet/Cobrand/Default.pm:792 perllib/FixMyStreet/Cobrand/Zurich.pm:388 templates/web/base/admin/bodies/index.html:1 templates/web/base/admin/reports/edit.html:56 templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr ""
 
@@ -532,11 +545,11 @@ msgstr ""
 msgid "Body"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24 templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr ""
 
-#: templates/web/base/admin/users/import.html:12
+#: templates/web/base/admin/users/import.html:12 templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -548,7 +561,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693 perllib/FixMyStreet/Cobrand/KiitC.pm:325 templates/web/base/admin/responsepriorities/index.html:8 templates/web/base/admin/templates/view.html:7
+#: perllib/FixMyStreet/Cobrand/Default.pm:709 templates/web/base/admin/responsepriorities/index.html:8 templates/web/base/admin/templates/view.html:7
 msgid "Categories"
 msgstr ""
 
@@ -556,7 +569,7 @@ msgstr ""
 msgid "Categories:"
 msgstr ""
 
-#: templates/web/base/admin/bodies/_category_field.html:12 templates/web/base/admin/bodies/body.html:73 templates/web/base/admin/stats/fix_rate.html:4 templates/web/base/dashboard/index.html:101 templates/web/base/report/_inspect.html:16 templates/web/base/report/_item.html:74 templates/web/base/report/new/category.html:23 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/bodies/body.html:14 templates/web/zurich/admin/bodies/form.html:25 templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports/index.html:13 templates/web/zurich/admin/stats/index.html:26 templates/web/zurich/admin/stats/index.html:71
+#: templates/web/base/admin/bodies/_category_field.html:12 templates/web/base/admin/bodies/body.html:73 templates/web/base/admin/stats/fix_rate.html:4 templates/web/base/dashboard/index.html:101 templates/web/base/report/_inspect.html:15 templates/web/base/report/_item.html:87 templates/web/base/report/new/category.html:23 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/_index_table.html:5 templates/web/zurich/admin/bodies/body.html:14 templates/web/zurich/admin/bodies/form.html:25 templates/web/zurich/admin/stats/index.html:26 templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
 msgstr ""
 
@@ -564,7 +577,7 @@ msgstr ""
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -580,6 +593,10 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+msgid "Change asset"
+msgstr ""
+
 #: templates/web/base/auth/change_email.html:2 templates/web/base/auth/change_email.html:3
 msgid "Change email address"
 msgstr ""
@@ -592,7 +609,7 @@ msgstr ""
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -602,12 +619,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -643,15 +660,11 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 perllib/FixMyStreet/Cobrand/Zurich.pm:158 perllib/FixMyStreet/Cobrand/Zurich.pm:161 perllib/FixMyStreet/DB/ResultSet/State.pm:72 templates/web/base/admin/states/index.html:103 templates/web/base/admin/states/index.html:27 templates/web/base/admin/states/index.html:33 templates/web/base/dashboard/index.html:118 templates/web/zurich/admin/stats/index.html:52
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 perllib/FixMyStreet/Cobrand/Zurich.pm:159 perllib/FixMyStreet/Cobrand/Zurich.pm:162 perllib/FixMyStreet/DB/ResultSet/State.pm:72 templates/web/base/admin/states/index.html:103 templates/web/base/admin/states/index.html:27 templates/web/base/admin/states/index.html:33 templates/web/base/dashboard/index.html:118 templates/web/zurich/admin/stats/index.html:52
 msgid "Closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr ""
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -676,11 +689,11 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687 perllib/FixMyStreet/Cobrand/KiitC.pm:321 perllib/FixMyStreet/Cobrand/Zurich.pm:432 templates/web/base/admin/config_page.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:703 perllib/FixMyStreet/Cobrand/Zurich.pm:402 templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr ""
 
@@ -775,7 +788,7 @@ msgstr ""
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131 templates/web/zurich/admin/bodies/contact-form.html:51
+#: templates/web/base/admin/bodies/contact-form.html:164 templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr ""
 
@@ -783,23 +796,23 @@ msgstr ""
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765 perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766 perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764 perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84 templates/web/zurich/admin/templates/edit.html:32
+#: templates/web/base/admin/templates/edit.html:73 templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr ""
 
-#: templates/web/base/admin/problem_row.html:34 templates/web/zurich/admin/templates/view.html:10
+#: templates/web/base/admin/problem_row.html:34 templates/web/base/dashboard/status.html:23 templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr ""
 
@@ -807,6 +820,14 @@ msgstr ""
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236 perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Created Body"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+msgid "Created By"
+msgstr ""
+
 #: templates/web/base/admin/list_updates.html:39 templates/web/base/admin/reports/edit.html:78 templates/web/base/admin/update_edit.html:55 templates/web/zurich/admin/update_edit.html:29
 msgid "Created:"
 msgstr ""
@@ -815,10 +836,6 @@ msgstr ""
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -827,15 +844,15 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891 templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
-#: templates/web/base/dashboard/index.html:8 templates/web/base/dashboard/index.html:9 templates/web/base/reports/index.html:15 templates/web/base/reports/index.html:18
+#: templates/web/base/dashboard/index.html:8 templates/web/base/dashboard/index.html:9 templates/web/base/dashboard/status.html:3 templates/web/base/dashboard/status.html:4 templates/web/base/reports/index.html:15 templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -847,7 +864,7 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -855,7 +872,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79 templates/web/base/admin/templates/edit.html:88 templates/web/zurich/admin/templates/edit.html:36
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79 templates/web/base/admin/templates/edit.html:77 templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr ""
 
@@ -871,7 +888,7 @@ msgstr ""
 msgid "Describe why you are moderating this"
 msgstr ""
 
-#: templates/web/base/admin/responsepriorities/index.html:7 templates/web/zurich/admin/index-dm.html:24 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports/index.html:12
+#: templates/web/base/admin/responsepriorities/index.html:7 templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr ""
 
@@ -879,7 +896,7 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -908,7 +925,7 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:58 templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/bodies/contact-form.html:58 templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -916,6 +933,14 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+msgid "Disable reopening of reports in this category"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+msgid "Disable updates on reports in this category"
+msgstr ""
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -949,24 +974,24 @@ msgstr ""
 msgid "Don't like forms?"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -978,11 +1003,11 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65 templates/web/base/report/inspect/information.html:22
+#: templates/web/base/report/_item.html:78 templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
 
-#: templates/web/base/admin/list_updates.html:44 templates/web/base/admin/manifesttheme/index.html:22 templates/web/base/admin/problem_row.html:43 templates/web/base/admin/responsepriorities/index.html:34 templates/web/base/admin/roles/index.html:24 templates/web/base/admin/templates/view.html:31 templates/web/base/admin/users/index.html:67 templates/web/zurich/admin/problem_row.html:49 templates/web/zurich/admin/templates/view.html:20
+#: templates/web/base/admin/list_updates.html:44 templates/web/base/admin/manifesttheme/index.html:22 templates/web/base/admin/problem_row.html:43 templates/web/base/admin/responsepriorities/index.html:34 templates/web/base/admin/roles/index.html:24 templates/web/base/admin/templates/view.html:31 templates/web/base/admin/users/index.html:67 templates/web/zurich/admin/problem_row.html:52 templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr ""
 
@@ -990,11 +1015,11 @@ msgstr ""
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772 perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1002,15 +1027,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756 perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771 perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1034,15 +1059,15 @@ msgstr ""
 msgid "Editor"
 msgstr ""
 
-#: templates/web/base/admin/bodies/category.html:29 templates/web/base/admin/bodies/index.html:27 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users/import.html:24 templates/web/base/admin/users/import.html:47 templates/web/base/admin/users/index.html:44 templates/web/base/alert/updates.html:21 templates/web/base/report/display_tools.html:50 templates/web/base/report/new/duplicate_suggestions.html:33 templates/web/zurich/admin/bodies/body.html:15 templates/web/zurich/admin/bodies/form.html:9 templates/web/zurich/auth/general.html:14 templates/web/zurich/auth/general.html:37
+#: templates/web/base/admin/bodies/category.html:29 templates/web/base/admin/bodies/index.html:27 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users/import.html:24 templates/web/base/admin/users/import.html:47 templates/web/base/admin/users/index.html:44 templates/web/base/alert/updates.html:23 templates/web/base/report/display_tools.html:51 templates/web/base/report/form/user_loggedout_by_email.html:38 templates/web/base/report/new/duplicate_suggestions.html:33 templates/web/zurich/admin/bodies/body.html:15 templates/web/zurich/admin/bodies/form.html:9 templates/web/zurich/auth/general.html:14 templates/web/zurich/auth/general.html:37
 msgid "Email"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:69 templates/web/base/auth/change_email.html:37 templates/web/base/report/new/form_user_loggedin.html:39 templates/web/base/report/update/form_user_loggedin.html:25
+#: templates/web/base/alert/_list.html:70 templates/web/base/auth/change_email.html:37 templates/web/base/report/new/form_user_loggedin.html:39 templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38 templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1062,11 +1087,11 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151 templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36 templates/web/zurich/admin/bodies/contact-form.html:23
+#: templates/web/base/admin/reports/edit.html:164 templates/web/base/admin/users/_form_details.html:14 templates/web/base/my/my.html:36 templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr ""
 
@@ -1122,11 +1147,11 @@ msgstr ""
 msgid "Endpoint"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1147,7 +1172,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:12 templates/web/base/admin/triage/_list-filters.html:3 templates/web/base/reports/_list-filters.html:16 templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:13 templates/web/base/admin/triage/_list-filters.html:3 templates/web/base/reports/_list-filters.html:18 templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1159,7 +1184,7 @@ msgstr ""
 msgid "Examples:"
 msgstr ""
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1168,7 +1193,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1192,7 +1217,7 @@ msgstr ""
 msgid "External body"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:112 templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/reports/edit.html:112 templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1204,15 +1229,15 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718 templates/web/base/admin/reportextrafields/edit.html:1 templates/web/base/admin/reportextrafields/index.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:734 templates/web/base/admin/reportextrafields/edit.html:1 templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114 templates/web/base/admin/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:146 templates/web/base/admin/reports/edit.html:134 templates/web/base/admin/update_edit.html:97 templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:90 templates/web/base/report/inspect/_extra_details_field.html:2 templates/web/base/report/new/category_extras.html:15
+#: templates/web/base/report/_item.html:99 templates/web/base/report/inspect/_extra_details_field.html:2 templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
 msgstr ""
 
@@ -1241,18 +1266,22 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35 templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr ""
-
 #: templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+msgid "Five most recent commented reports"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+msgid "Five newest reports"
+msgstr ""
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1277,7 +1306,7 @@ msgstr ""
 msgid "Flag user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685 templates/web/base/admin/users/index.html:47
+#: perllib/FixMyStreet/Cobrand/Default.pm:701 templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr ""
 
@@ -1285,7 +1314,7 @@ msgstr ""
 msgid "Flagged reports and users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1293,7 +1322,7 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155 templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168 templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr ""
 
@@ -1317,11 +1346,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1329,11 +1358,19 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1 templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1349,7 +1386,7 @@ msgstr ""
 msgid "Get updates of problems in this %s"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr ""
 
@@ -1361,7 +1398,7 @@ msgstr ""
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/index.html:37 templates/web/base/admin/index.html:54 templates/web/base/admin/responsepriorities/index.html:48 templates/web/base/admin/triage/_list-filters.html:24 templates/web/base/admin/triage/_list-filters.html:39 templates/web/base/admin/triage/_list-filters.html:45 templates/web/base/admin/users/index.html:32 templates/web/base/around/_postcode_submit_button.html:2 templates/web/base/around/_postcode_submit_button.html:5 templates/web/base/reports/_list-filters-sort.html:13 templates/web/base/reports/_list-filters.html:40 templates/web/base/reports/_list-filters.html:49 templates/web/base/reports/index.html:89 templates/web/zurich/admin/stats/index.html:37
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/index.html:37 templates/web/base/admin/index.html:54 templates/web/base/admin/responsepriorities/index.html:48 templates/web/base/admin/triage/_list-filters.html:25 templates/web/base/admin/triage/_list-filters.html:40 templates/web/base/admin/triage/_list-filters.html:46 templates/web/base/admin/users/index.html:32 templates/web/base/around/_postcode_submit_button.html:2 templates/web/base/around/_postcode_submit_button.html:5 templates/web/base/reports/_list-filters-sort.html:13 templates/web/base/reports/_list-filters.html:42 templates/web/base/reports/_list-filters.html:51 templates/web/base/reports/index.html:89 templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
 msgstr ""
 
@@ -1369,7 +1406,7 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1393,7 +1430,7 @@ 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:17 templates/web/base/admin/stats/index.html:23
+#: templates/web/base/admin/stats/index.html:17 templates/web/base/admin/stats/index.html:23 templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1421,7 +1458,7 @@ msgstr ""
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181 templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1446,7 +1483,7 @@ msgid "Hide my name on this report"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/around/display_location.html:65 templates/web/base/around/display_location.html:73 templates/web/base/js/translation_strings.html:74
+#: templates/web/base/around/display_location.html:65 templates/web/base/around/display_location.html:73 templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr ""
 
@@ -1491,7 +1528,7 @@ msgstr ""
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr ""
 
-#: templates/web/base/admin/flagged.html:14 templates/web/base/admin/index.html:66 templates/web/base/admin/list_updates.html:6 templates/web/base/admin/reports/index.html:12 templates/web/base/admin/users/alerts.html:8 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:19 templates/web/zurich/admin/list_updates.html:24 templates/web/zurich/admin/list_updates.html:38 templates/web/zurich/admin/reports/index.html:11
+#: templates/web/base/admin/flagged.html:14 templates/web/base/admin/index.html:66 templates/web/base/admin/list_updates.html:6 templates/web/base/admin/reports/index.html:12 templates/web/base/admin/users/alerts.html:8 templates/web/zurich/admin/_index_table.html:3 templates/web/zurich/admin/list_updates.html:24 templates/web/zurich/admin/list_updates.html:38
 msgid "ID"
 msgstr ""
 
@@ -1509,15 +1546,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1531,7 +1568,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1555,7 +1592,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1589,7 +1626,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1613,6 +1650,15 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37 templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+msgid "In wards"
+msgstr ""
+
 #: templates/web/base/admin/bodies/contact-form.html:35 templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
 msgstr ""
@@ -1621,19 +1667,19 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:31 templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30 templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1649,15 +1695,11 @@ msgstr ""
 msgid "Internal notes"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -1705,11 +1747,11 @@ msgstr ""
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:70 templates/web/base/report/inspect/information.html:26 templates/web/base/report/update/moderation_diff.html:6
+#: templates/web/base/report/_item.html:83 templates/web/base/report/inspect/information.html:26 templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36 templates/web/base/reports/_list-filters-sort.html:10
+#: templates/web/base/admin/triage/_list-filters.html:37 templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
 
@@ -1725,7 +1767,7 @@ msgstr ""
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 templates/web/base/report/new/category_wrapper.html:9
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606 templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr ""
 
@@ -1754,16 +1796,16 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85 templates/web/base/report/form/user.html:27
+#: templates/web/base/js/translation_strings.html:87 templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179 templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -1780,19 +1822,19 @@ msgstr ""
 msgid "MAP"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180 templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31 templates/web/base/reports/_list-filters-sort.html:5
+#: templates/web/base/admin/triage/_list-filters.html:32 templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
 
@@ -1805,23 +1847,23 @@ msgstr ""
 msgid "Mark as sent"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41 templates/web/base/contact/index.html:109
+#: templates/web/base/contact/enquiry/index.html:42 templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -1833,7 +1875,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -1841,7 +1883,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755 perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -1861,7 +1903,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193 templates/web/base/admin/update_edit.html:86
+#: templates/web/base/admin/reports/edit.html:206 templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
 
@@ -1869,11 +1911,11 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:37 templates/web/base/reports/_list-filters-sort.html:11
+#: templates/web/base/admin/triage/_list-filters.html:38 templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696 perllib/FixMyStreet/App/Controller/Report.pm:703 perllib/FixMyStreet/App/Controller/Report.pm:707 templates/web/base/admin/category-checkboxes.html:32
+#: perllib/FixMyStreet/App/Controller/Report.pm:724 perllib/FixMyStreet/App/Controller/Report.pm:731 perllib/FixMyStreet/App/Controller/Report.pm:735 templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
 
@@ -1881,7 +1923,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:140 templates/web/base/admin/update_edit.html:34 templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35 templates/web/zurich/admin/stats/index.html:62
+#: templates/web/base/admin/reports/edit.html:153 templates/web/base/admin/update_edit.html:34 templates/web/base/admin/users/_form_details.html:10 templates/web/base/my/my.html:35 templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr ""
 
@@ -1897,7 +1939,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -1905,11 +1947,11 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607 perllib/FixMyStreet/Geocode/Address.pm:17
+#: perllib/FixMyStreet/Cobrand/Default.pm:623 perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1931,7 +1973,7 @@ msgstr ""
 msgid "New body added"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr ""
 
@@ -1943,7 +1985,7 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96 templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102 templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr ""
 
@@ -1951,11 +1993,11 @@ msgstr ""
 msgid "New local problems on FixMyStreet"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
-#: templates/web/base/auth/change_password.html:47 templates/web/base/auth/create.html:64 templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/auth/change_password.html:47 templates/web/base/auth/create.html:64 templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2027,7 +2069,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33 templates/web/base/reports/_list-filters-sort.html:7
+#: templates/web/base/admin/triage/_list-filters.html:34 templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
 
@@ -2039,7 +2081,7 @@ msgstr ""
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122 templates/web/base/admin/bodies/category.html:5 templates/web/base/admin/list_updates.html:33 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/list_updates.html:36 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/reports/edit.html:101 templates/web/base/admin/reports/edit.html:138 templates/web/base/admin/update_edit.html:26 templates/web/base/admin/users/alerts.html:21 templates/web/base/questionnaire/index.html:108 templates/web/base/questionnaire/index.html:41
+#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122 templates/web/base/admin/bodies/category.html:5 templates/web/base/admin/list_updates.html:33 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/list_updates.html:36 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/reports/edit.html:101 templates/web/base/admin/reports/edit.html:151 templates/web/base/admin/update_edit.html:26 templates/web/base/admin/users/alerts.html:21 templates/web/base/questionnaire/index.html:41 templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr ""
 
@@ -2051,11 +2093,11 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26 templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr ""
 
@@ -2071,7 +2113,7 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112 templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118 templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr ""
 
@@ -2102,13 +2144,13 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:79 templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50 templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45 templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16 templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2116,10 +2158,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr ""
@@ -2165,12 +2211,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2178,11 +2224,11 @@ msgstr ""
 msgid "Old state"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:34 templates/web/base/reports/_list-filters-sort.html:8
+#: templates/web/base/admin/triage/_list-filters.html:35 templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2190,7 +2236,7 @@ msgstr ""
 msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 perllib/FixMyStreet/Cobrand/Zurich.pm:156 perllib/FixMyStreet/DB/ResultSet/State.pm:71 templates/web/base/admin/states/index.html:102 templates/web/base/admin/states/index.html:25 templates/web/base/admin/states/index.html:32 templates/web/base/admin/update_edit.html:30 templates/web/base/dashboard/index.html:117 templates/web/zurich/admin/update_edit.html:18
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 perllib/FixMyStreet/Cobrand/Zurich.pm:157 perllib/FixMyStreet/DB/ResultSet/State.pm:71 templates/web/base/admin/states/index.html:102 templates/web/base/admin/states/index.html:25 templates/web/base/admin/states/index.html:32 templates/web/base/admin/update_edit.html:30 templates/web/base/dashboard/index.html:117 templates/web/zurich/admin/update_edit.html:18
 msgid "Open"
 msgstr ""
 
@@ -2214,7 +2260,7 @@ msgstr ""
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2226,7 +2272,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2234,7 +2280,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: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
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97 perllib/FixMyStreet/App/Controller/Report.pm:731 perllib/FixMyStreet/App/Controller/Report.pm:734 perllib/FixMyStreet/App/Controller/Report/New.pm:1477 perllib/FixMyStreet/App/Controller/Report/New.pm:779 perllib/FixMyStreet/App/Controller/Report/New.pm:780 perllib/FixMyStreet/DB/Result/Problem.pm:644 perllib/FixMyStreet/DB/Result/Problem.pm:651 perllib/FixMyStreet/DB/Result/Problem.pm:666 perllib/FixMyStreet/DB/Result/Problem.pm:675 perllib/FixMyStreet/Queue/Item/Report.pm:132 perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
 msgstr ""
 
@@ -2262,7 +2308,7 @@ msgstr ""
 msgid "Parent"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 msgid "Parent categories"
 msgstr ""
 
@@ -2270,11 +2316,11 @@ msgstr ""
 msgid "Partial"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51 templates/web/zurich/auth/general.html:20 templates/web/zurich/auth/general.html:46
+#: templates/web/base/report/form/user_loggedout_by_email.html:74 templates/web/zurich/auth/general.html:20 templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
 msgstr ""
 
@@ -2286,7 +2332,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2294,15 +2340,19 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+msgid "Phone"
+msgstr ""
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
-#: templates/web/base/auth/change_phone.html:36 templates/web/base/report/new/form_user_loggedin.html:34 templates/web/zurich/report/new/fill_in_details_form.html:65
+#: templates/web/base/auth/change_phone.html:36 templates/web/base/report/form/user_loggedout_by_email.html:56 templates/web/base/report/new/form_user_loggedin.html:34 templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13 templates/web/base/report/form/user_loggedout_by_email.html:33 templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12 templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr ""
 
@@ -2310,15 +2360,15 @@ msgstr ""
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148 templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47 templates/web/zurich/admin/stats/index.html:60
+#: templates/web/base/admin/reports/edit.html:161 templates/web/base/admin/users/_form_details.html:24 templates/web/base/my/my.html:47 templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr ""
 
-#: templates/web/base/admin/update_edit.html:95 templates/web/base/questionnaire/index.html:80 templates/web/base/questionnaire/index.html:95 templates/web/base/questionnaire/index.html:97 templates/web/base/report/new/form_report.html:41 templates/web/base/report/new/form_report.html:56 templates/web/base/report/new/form_report.html:58 templates/web/base/report/update/form_update.html:22 templates/web/base/report/update/form_update.html:24 templates/web/base/report/update/form_update.html:7 templates/web/base/report/update/moderation_diff.html:4 templates/web/zurich/admin/index-dm.html:31 templates/web/zurich/admin/index-sdm.html:24 templates/web/zurich/admin/reports/index.html:16 templates/web/zurich/admin/stats/index.html:58 templates/web/zurich/report/new/fill_in_details_form.html:20 templates/web/zurich/report/new/fill_in_details_form.html:36 templates/web/zurich/report/new/fill_in_details_form.html:38
+#: templates/web/base/admin/update_edit.html:95 templates/web/base/report/form/photo_upload.html:19 templates/web/base/report/form/photo_upload.html:21 templates/web/base/report/form/photo_upload.html:4 templates/web/base/report/new/form_report.html:41 templates/web/base/report/new/form_report.html:56 templates/web/base/report/new/form_report.html:58 templates/web/base/report/update/moderation_diff.html:4 templates/web/zurich/admin/_index_table.html:11 templates/web/zurich/admin/stats/index.html:58 templates/web/zurich/report/new/fill_in_details_form.html:20 templates/web/zurich/report/new/fill_in_details_form.html:36 templates/web/zurich/report/new/fill_in_details_form.html:38
 msgid "Photo"
 msgstr ""
 
@@ -2334,7 +2384,7 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80 templates/web/base/report/new/form_report.html:41 templates/web/base/report/update/form_update.html:7 templates/web/zurich/report/new/fill_in_details_form.html:20
+#: templates/web/base/report/form/photo_upload.html:4 templates/web/base/report/new/form_report.html:41 templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
 
@@ -2342,7 +2392,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2354,6 +2404,10 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+msgid "Pin map"
+msgstr ""
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79 templates/web/base/js/translation_strings.html:44
 msgid "Place pin on map"
@@ -2375,20 +2429,20 @@ msgstr ""
 msgid "Please check your email address is correct"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521 perllib/FixMyStreet/DB/Result/User.pm:263 perllib/FixMyStreet/DB/Result/User.pm:264 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:7
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521 perllib/FixMyStreet/DB/Result/User.pm:268 perllib/FixMyStreet/DB/Result/User.pm:269 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 perllib/FixMyStreet/App/Controller/Report/New.pm:1034 perllib/FixMyStreet/App/Controller/Report/New.pm:1077 templates/web/base/js/translation_strings.html:21
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231 perllib/FixMyStreet/App/Controller/Report/New.pm:1068 perllib/FixMyStreet/App/Controller/Report/New.pm:1111 templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471 perllib/FixMyStreet/App/Controller/Auth.pm:497
+#: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: 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
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325 templates/web/base/admin/bodies/body.html:12 templates/web/base/admin/bodies/index.html:4 templates/web/base/admin/templates/edit.html:13
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2404,19 +2458,19 @@ 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:298 perllib/FixMyStreet/DB/Result/Comment.pm:143 templates/web/base/js/translation_strings.html:6
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311 perllib/FixMyStreet/DB/Result/Comment.pm:198 templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519 perllib/FixMyStreet/DB/Result/User.pm:266 perllib/FixMyStreet/DB/Result/User.pm:267 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:4
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519 perllib/FixMyStreet/DB/Result/User.pm:271 perllib/FixMyStreet/DB/Result/User.pm:272 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130 perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2426,12 +2480,12 @@ msgid "Please enter a password"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Contact.pm:147 perllib/FixMyStreet/DB/Result/Problem.pm:365 templates/web/base/js/translation_strings.html:9
+#: perllib/FixMyStreet/App/Controller/Contact.pm:147 perllib/FixMyStreet/DB/Result/Problem.pm:386 templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255 perllib/FixMyStreet/App/Controller/Admin/Users.pm:132 perllib/FixMyStreet/App/Controller/Admin/Users.pm:261 perllib/FixMyStreet/DB/Result/User.pm:256 templates/web/base/js/translation_strings.html:24 templates/web/base/js/translation_strings.html:28
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264 perllib/FixMyStreet/App/Controller/Admin/Users.pm:127 perllib/FixMyStreet/App/Controller/Admin/Users.pm:256 perllib/FixMyStreet/DB/Result/User.pm:261 templates/web/base/js/translation_strings.html:24 templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
 msgstr ""
 
@@ -2439,17 +2493,17 @@ msgstr ""
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139 perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134 perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371 templates/web/base/js/translation_strings.html:14
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392 templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Contact.pm:146 perllib/FixMyStreet/DB/Result/User.pm:254 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:8 templates/web/base/auth/change_email.html:24 templates/web/base/auth/change_email.html:26 templates/web/base/js/translation_strings.html:23 templates/web/base/js/translation_strings.html:27
+#: perllib/FixMyStreet/App/Controller/Contact.pm:146 perllib/FixMyStreet/DB/Result/User.pm:259 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:8 templates/web/base/auth/change_email.html:24 templates/web/base/auth/change_email.html:26 templates/web/base/js/translation_strings.html:23 templates/web/base/js/translation_strings.html:27
 msgid "Please enter your email"
 msgstr ""
 
@@ -2459,7 +2513,7 @@ msgid "Please enter your first name"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337 templates/web/base/js/translation_strings.html:19
+#: perllib/FixMyStreet/Cobrand/UK.pm:341 templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr ""
 
@@ -2468,7 +2522,7 @@ msgid "Please enter your full name."
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Contact.pm:145 perllib/FixMyStreet/DB/Result/Comment.pm:140 perllib/FixMyStreet/DB/Result/Problem.pm:379 perllib/FixMyStreet/DB/Result/User.pm:249 templates/web/base/js/translation_strings.html:18
+#: perllib/FixMyStreet/App/Controller/Contact.pm:145 perllib/FixMyStreet/DB/Result/Comment.pm:195 perllib/FixMyStreet/DB/Result/Problem.pm:400 perllib/FixMyStreet/DB/Result/User.pm:254 templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr ""
 
@@ -2503,17 +2557,17 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368 templates/web/base/js/translation_strings.html:11
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389 templates/web/base/js/translation_strings.html:11
 msgid "Please make sure you are not including an email address"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494 templates/web/base/js/translation_strings.html:34
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495 templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
 
@@ -2537,23 +2591,27 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114 perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114 perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -2561,7 +2619,7 @@ msgstr ""
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -2573,16 +2631,16 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:119 perllib/FixMyStreet/App/Model/PhotoSet.pm:138 perllib/FixMyStreet/App/Model/PhotoSet.pm:140 templates/web/base/js/translation_strings.html:80
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:119 perllib/FixMyStreet/App/Model/PhotoSet.pm:138 perllib/FixMyStreet/App/Model/PhotoSet.pm:140 templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142 perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137 perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -2590,27 +2648,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr ""
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr ""
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -2626,7 +2680,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -2634,11 +2688,11 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82 templates/web/base/report/inspect/extra_details.html:2
+#: templates/web/base/report/_item.html:95 templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
 
@@ -2650,7 +2704,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:69
+#: templates/web/base/admin/bodies/body.html:90 templates/web/base/admin/reports/edit.html:170 templates/web/base/report/inspect/information.html:3 templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr ""
 
@@ -2694,7 +2748,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr ""
 
@@ -2702,7 +2756,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754 perllib/FixMyStreet/Cobrand/KiitC.pm:196 templates/web/base/admin/flagged.html:10
+#: perllib/FixMyStreet/Cobrand/Default.pm:770 templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr ""
 
@@ -2726,20 +2780,20 @@ 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:220 perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/Default.pm:921 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269 perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
 #. ("First %s is the body name, second %s the site name")
-#: templates/web/base/admin/triage/index.html:0 templates/web/base/admin/triage/index.html:14 templates/web/base/reports/body.html:0 templates/web/base/reports/body.html:32
+#: templates/web/base/admin/triage/index.html:0 templates/web/base/admin/triage/index.html:14 templates/web/base/reports/body.html:0 templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -2747,11 +2801,15 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -2763,11 +2821,11 @@ msgstr ""
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr ""
 
@@ -2775,11 +2833,11 @@ msgstr ""
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230 templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234 templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -2811,19 +2869,19 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
-#: 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
+#: 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:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -2831,11 +2889,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:227
+#: perllib/FixMyStreet/Cobrand/Default.pm:922 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -2847,11 +2905,11 @@ msgstr ""
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -2863,7 +2921,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2876,7 +2934,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:35 templates/web/base/reports/_list-filters-sort.html:9
+#: templates/web/base/admin/triage/_list-filters.html:36 templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
 
@@ -2888,7 +2946,7 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182 templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -2900,7 +2958,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:147 templates/web/base/report/_main.html:24 templates/web/base/report/_main.html:32
+#: templates/web/base/report/_item.html:20 templates/web/base/report/_item.html:23 templates/web/base/report/_main.html:147 templates/web/base/report/_main.html:24 templates/web/base/report/_main.html:32
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2912,15 +2970,19 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174 templates/web/base/admin/update_edit.html:74 templates/web/zurich/admin/update_edit.html:35
+#: templates/web/base/admin/reports/edit.html:187 templates/web/base/admin/update_edit.html:74 templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -2928,17 +2990,17 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60 templates/web/base/report/inspect/information.html:7
+#: templates/web/base/report/_item.html:73 templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/header_logo.html:2 templates/web/base/js/translation_strings.html:89 templates/web/base/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
+#: templates/web/base/header_logo.html:2 templates/web/base/js/translation_strings.html:91 templates/web/base/navigation/_report.html:6 templates/web/base/navigation/_report.html:8 templates/web/zurich/footer.html:18 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/navigation/_report.html:4
+#: templates/web/base/js/translation_strings.html:92 templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
 
@@ -2951,7 +3013,7 @@ msgid "Report anonymously"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91 templates/web/base/navigation/_report.html:2 templates/web/base/tokens/confirm_problem.html:40
+#: templates/web/base/js/translation_strings.html:93 templates/web/base/navigation/_report.html:2 templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
 msgstr ""
 
@@ -2983,7 +3045,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652 templates/web/base/contact/index.html:64
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655 templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr ""
 
@@ -2991,7 +3053,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676 templates/web/base/contact/index.html:66
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679 templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr ""
 
@@ -3003,27 +3065,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -3036,11 +3098,11 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698 perllib/FixMyStreet/Cobrand/Default.pm:712 perllib/FixMyStreet/Cobrand/KiitC.pm:330 perllib/FixMyStreet/Cobrand/Zurich.pm:410 templates/web/base/around/tabbed_lists.html:3 templates/web/base/dashboard/index.html:108 templates/web/zurich/header.html:48
+#: perllib/FixMyStreet/Cobrand/Default.pm:714 perllib/FixMyStreet/Cobrand/Default.pm:728 perllib/FixMyStreet/Cobrand/Zurich.pm:380 templates/web/base/around/tabbed_lists.html:3 templates/web/base/dashboard/index.html:108
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26 perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -3066,15 +3128,15 @@ msgid "Reports published"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3087,7 +3149,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3136,31 +3198,36 @@ msgstr ""
 msgid "Right place?"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68 templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143 templates/web/base/admin/users/index.html:29
+#: templates/web/base/admin/users/form.html:128 templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714 templates/web/base/admin/roles/form.html:1 templates/web/base/admin/roles/index.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:730 templates/web/base/admin/roles/form.html:1 templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412 perllib/FixMyStreet/App/Controller/Admin.pm:416 templates/web/base/admin/reports/edit.html:171 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/reports/edit.html:106
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422 perllib/FixMyStreet/App/Controller/Admin.pm:426 templates/web/base/admin/reports/edit.html:184 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412 templates/web/base/admin/reports/edit.html:172 templates/web/base/admin/update_edit.html:72 templates/web/zurich/admin/reports/edit.html:107
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422 templates/web/base/admin/reports/edit.html:185 templates/web/base/admin/update_edit.html:72 templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
 msgstr ""
 
@@ -3173,11 +3240,11 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69 templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68 templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131 templates/web/base/admin/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:164 templates/web/base/admin/manifesttheme/form.html:58 templates/web/base/admin/reportextrafields/edit.html:64 templates/web/base/admin/responsepriorities/edit.html:41 templates/web/base/admin/roles/form.html:21 templates/web/base/admin/templates/edit.html:73 templates/web/base/admin/triage/_inspect.html:68 templates/web/base/admin/users/index.html:89 templates/web/base/report/_inspect.html:79 templates/web/base/report/_main.html:129 templates/web/base/report/update.html:58 templates/web/zurich/admin/bodies/contact-form.html:51 templates/web/zurich/admin/templates/edit.html:32
 msgid "Save changes"
 msgstr ""
 
@@ -3190,11 +3257,11 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
-#: templates/web/base/admin/index.html:26 templates/web/base/admin/reports/index.html:1 templates/web/zurich/admin/reports/index.html:1
+#: templates/web/base/admin/index.html:26 templates/web/base/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr ""
 
@@ -3206,7 +3273,7 @@ msgstr ""
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr ""
 
@@ -3218,11 +3285,11 @@ msgstr ""
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:2 templates/web/base/auth/generate_token.html:45 templates/web/base/my/my.html:75
+#: templates/web/base/auth/generate_token.html:2 templates/web/base/auth/generate_token.html:49 templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
 
@@ -3230,7 +3297,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768 perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3238,7 +3305,7 @@ msgstr ""
 msgid "Select a body"
 msgstr ""
 
-#: templates/web/base/admin/bodies/form.html:78 templates/web/base/admin/users/form.html:87 templates/web/zurich/admin/bodies/form.html:37
+#: templates/web/base/admin/bodies/form.html:78 templates/web/base/admin/users/form.html:58 templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr ""
 
@@ -3258,7 +3325,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75 templates/web/base/contact/index.html:120
+#: templates/web/base/contact/enquiry/index.html:76 templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
 
@@ -3270,7 +3337,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3278,11 +3345,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3314,7 +3381,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3322,7 +3389,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15 templates/web/base/report/_main.html:157
+#: templates/web/base/report/_item.html:26 templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3346,7 +3413,7 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43 templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44 templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -3355,7 +3422,7 @@ msgid "Show photo"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/around/display_location.html:63 templates/web/base/around/display_location.html:71 templates/web/base/js/translation_strings.html:73
+#: templates/web/base/around/display_location.html:63 templates/web/base/around/display_location.html:71 templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr ""
 
@@ -3406,7 +3473,7 @@ msgid "Some photos of recent reports"
 msgstr ""
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -3415,11 +3482,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100 perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3435,7 +3502,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/App/Controller/Report/New.pm:250 perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50 perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -3443,11 +3510,11 @@ msgstr ""
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44 perllib/FixMyStreet/Geocode/Google.pm:56 perllib/FixMyStreet/Geocode/Zurich.pm:119
+#: perllib/FixMyStreet/Geocode/Bing.pm:47 perllib/FixMyStreet/Geocode/Google.pm:56 perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108 perllib/FixMyStreet/App/Form/ManifestTheme.pm:54 perllib/FixMyStreet/PhotoStorage.pm:63
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102 perllib/FixMyStreet/App/Form/ManifestTheme.pm:54 perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
 msgstr ""
 
@@ -3459,11 +3526,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28 templates/web/base/reports/_list-filters-sort.html:2
+#: templates/web/base/admin/triage/_list-filters.html:29 templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
 
@@ -3471,11 +3538,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -3487,31 +3554,31 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: templates/web/base/admin/bodies/body.html:74 templates/web/base/admin/bodies/category.html:30 templates/web/base/admin/bodies/contact-form.html:22 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:70 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports/index.html:16 templates/web/base/admin/templates/edit.html:50 templates/web/base/admin/templates/view.html:8 templates/web/base/admin/users/alerts.html:11 templates/web/base/dashboard/index.html:102 templates/web/base/report/_inspect.html:34 templates/web/base/report/_item.html:78 templates/web/base/report/update/form_update.html:41 templates/web/zurich/admin/bodies/contact-form.html:37
+#: templates/web/base/admin/bodies/body.html:74 templates/web/base/admin/bodies/category.html:30 templates/web/base/admin/bodies/contact-form.html:22 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:70 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports/index.html:16 templates/web/base/admin/templates/edit.html:50 templates/web/base/admin/templates/view.html:8 templates/web/base/admin/users/alerts.html:11 templates/web/base/dashboard/index.html:102 templates/web/base/report/_inspect.html:34 templates/web/base/report/_item.html:91 templates/web/base/report/update/form_update.html:18 templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107 perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110 perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106 templates/web/base/report/_update_state.html:7 templates/web/base/report/updates.html:21
+#: perllib/FixMyStreet/Script/Alerts.pm:107 templates/web/base/report/_update_state.html:7 templates/web/base/report/updates.html:21
 msgid "State changed to:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:128 templates/web/base/admin/update_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:63 templates/web/zurich/admin/reports/edit.html:139 templates/web/zurich/admin/reports/edit.html:91 templates/web/zurich/admin/update_edit.html:17
+#: templates/web/base/admin/reports/edit.html:128 templates/web/base/admin/update_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:63 templates/web/zurich/admin/reports/edit.html:143 templates/web/zurich/admin/reports/edit.html:91 templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686 perllib/FixMyStreet/Cobrand/KiitC.pm:320 perllib/FixMyStreet/Cobrand/Zurich.pm:431 templates/web/base/admin/states/index.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:702 perllib/FixMyStreet/Cobrand/Zurich.pm:401 templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680 perllib/FixMyStreet/Cobrand/Zurich.pm:413 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:696 perllib/FixMyStreet/Cobrand/Zurich.pm:383 templates/web/base/admin/stats/index.html:1 templates/web/base/admin/stats/state.html:1 templates/web/zurich/admin/stats/index.html:1 templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr ""
 
@@ -3527,7 +3594,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -3539,27 +3606,27 @@ 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:73 templates/web/base/report/new/login_success_form.html:17 templates/web/base/report/new/oauth_email_form.html:20 templates/web/base/report/new/report_import.html:103 templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/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/submit.html:1 templates/web/base/report/form/submit.html:2 templates/web/base/report/form/user_loggedout_password.html:29 templates/web/base/report/new/form_report.html:21 templates/web/base/report/new/report_import.html:103 templates/web/zurich/report/new/fill_in_details_form.html:74 templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:185 templates/web/base/admin/reports/edit.html:25 templates/web/base/admin/update_edit.html:82 templates/web/base/admin/users/form.html:189 templates/web/zurich/admin/report_edit-sdm.html:111 templates/web/zurich/admin/reports/edit.html:253 templates/web/zurich/admin/update_edit.html:38
+#: templates/web/base/admin/reports/edit.html:198 templates/web/base/admin/reports/edit.html:25 templates/web/base/admin/update_edit.html:82 templates/web/base/admin/users/form.html:174 templates/web/zurich/admin/report_edit-sdm.html:117 templates/web/zurich/admin/reports/edit.html:257 templates/web/zurich/admin/update_edit.html:38 templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-dm.html:8 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5 templates/web/zurich/admin/index-dm.html:8
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:72 templates/web/base/alert/_list.html:75 templates/web/base/alert/updates.html:24 templates/web/base/alert/updates.html:27 templates/web/base/alert/updates.html:34 templates/web/base/report/display_tools.html:53 templates/web/base/report/display_tools.html:56 templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73 templates/web/base/alert/_list.html:76 templates/web/base/alert/updates.html:26 templates/web/base/alert/updates.html:29 templates/web/base/alert/updates.html:36 templates/web/base/report/display_tools.html:54 templates/web/base/report/display_tools.html:57 templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -3571,7 +3638,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138 perllib/FixMyStreet/Cobrand/Rutland.pm:16
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137 perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
 
@@ -3584,11 +3651,11 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678 perllib/FixMyStreet/Cobrand/KiitC.pm:314 perllib/FixMyStreet/Cobrand/Zurich.pm:409 templates/web/base/admin/bodies/index.html:29 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 templates/web/base/status/index.html:3 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:45
+#: perllib/FixMyStreet/Cobrand/Default.pm:694 perllib/FixMyStreet/Cobrand/Zurich.pm:379 templates/web/base/admin/bodies/index.html:29 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 templates/web/base/status/index.html:3 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr ""
 
@@ -3596,15 +3663,19 @@ msgstr ""
 msgid "Summary reports"
 msgstr ""
 
-#: templates/web/base/admin/stats/index.html:15 templates/web/base/dashboard/index.html:21
+#: templates/web/base/admin/stats/index.html:15 templates/web/base/dashboard/index.html:21 templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3620,10 +3691,14 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704 perllib/FixMyStreet/Cobrand/Zurich.pm:420 templates/web/base/develop/email_list.html:3 templates/web/zurich/header.html:65
+#: perllib/FixMyStreet/Cobrand/Default.pm:720 perllib/FixMyStreet/Cobrand/Zurich.pm:390 templates/web/base/develop/email_list.html:3 templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr ""
@@ -3640,6 +3715,10 @@ msgstr ""
 msgid "Text:"
 msgstr ""
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+msgid "Textarea"
+msgstr ""
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -3668,7 +3747,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 ""
 
-#: templates/web/base/auth/2fa/intro.html:11 templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/2fa/intro.html:11 templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -3680,23 +3759,27 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 perllib/FixMyStreet/Cobrand/KiitC.pm:157 perllib/FixMyStreet/Cobrand/TransportFocus.pm:93 perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
@@ -3740,7 +3823,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: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
+#: templates/web/base/admin/bodies/contact-form.html:108 templates/web/base/admin/bodies/contact-form.html:109 templates/web/base/admin/bodies/form.html:101 templates/web/base/admin/bodies/form.html:102
 msgid ""
 "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>."
@@ -3788,7 +3871,7 @@ msgstr ""
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -3848,7 +3931,7 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13 templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4 templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -3878,7 +3961,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -3894,11 +3977,11 @@ msgstr ""
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916 perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944 perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -3906,7 +3989,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -3976,7 +4059,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:1091 perllib/FixMyStreet/App/Controller/Report/New.pm:1163 perllib/FixMyStreet/App/Controller/Report/New.pm:1210 perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125 perllib/FixMyStreet/App/Controller/Report/New.pm:1197 perllib/FixMyStreet/App/Controller/Report/New.pm:1244 perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr ""
 
@@ -3993,19 +4076,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4018,23 +4105,23 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 perllib/FixMyStreet/Cobrand/Zurich.pm:143 templates/web/zurich/report/_main.html:14
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 perllib/FixMyStreet/Cobrand/Zurich.pm:144 templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr ""
 
-#: templates/web/base/report/_updates_disallowed_message.html:1 templates/web/base/report/display.html:58
+#: templates/web/base/report/_updates_disallowed_message.html:1 templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4042,11 +4129,15 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106 templates/web/zurich/admin/report_edit-sdm.html:66 templates/web/zurich/admin/reports/edit.html:132 templates/web/zurich/admin/reports/edit.html:94
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112 templates/web/zurich/admin/report_edit-sdm.html:66 templates/web/zurich/admin/reports/edit.html:136 templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679 perllib/FixMyStreet/Cobrand/KiitC.pm:315 templates/web/base/admin/timeline.html:1 templates/web/base/admin/users/index.html:68 templates/web/base/admin/users/log.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:695 templates/web/base/admin/timeline.html:1 templates/web/base/admin/users/index.html:68 templates/web/base/admin/users/log.html:1
 msgid "Timeline"
 msgstr ""
 
@@ -4062,6 +4153,10 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4086,7 +4181,7 @@ msgstr ""
 msgid "To view a map of the precise location of this issue"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:11 templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:11 templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4106,10 +4201,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_item.html:86 templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4127,15 +4218,15 @@ msgstr ""
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/auth/2fa/intro.html:2 templates/web/base/auth/2fa/intro.html:6 templates/web/base/auth/generate_token.html:36 templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/2fa/intro.html:2 templates/web/base/auth/2fa/intro.html:6 templates/web/base/auth/generate_token.html:40 templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4143,7 +4234,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -4164,7 +4255,7 @@ msgstr ""
 msgid "Unknown error"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Develop.pm:188 perllib/FixMyStreet/App/Controller/Develop.pm:207 perllib/FixMyStreet/App/Controller/My.pm:229 perllib/FixMyStreet/App/Controller/Report.pm:141 perllib/FixMyStreet/App/Controller/Report.pm:147 perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/Develop.pm:188 perllib/FixMyStreet/App/Controller/Develop.pm:207 perllib/FixMyStreet/App/Controller/My.pm:244 perllib/FixMyStreet/App/Controller/Report.pm:161 perllib/FixMyStreet/App/Controller/Report.pm:167 perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -4176,11 +4267,11 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
-#: templates/web/base/admin/states/index.html:76 templates/web/base/admin/users/alerts.html:58 templates/web/base/report/update/form_update.html:31
+#: templates/web/base/admin/states/index.html:76 templates/web/base/admin/users/alerts.html:58 templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr ""
 
@@ -4228,19 +4319,19 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239 perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366 perllib/FixMyStreet/App/Controller/Admin/Users.pm:176 perllib/FixMyStreet/App/Controller/Admin/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:242 perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368 perllib/FixMyStreet/App/Controller/Admin/Users.pm:171 perllib/FixMyStreet/App/Controller/Admin/Users.pm:382 perllib/FixMyStreet/App/Controller/Admin/Users.pm:57 perllib/FixMyStreet/App/Controller/Admin/Users.pm:572 perllib/FixMyStreet/Cobrand/Zurich.pm:831 perllib/FixMyStreet/Cobrand/Zurich.pm:856 perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr ""
 
@@ -4248,7 +4339,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -4277,6 +4368,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -4289,7 +4388,7 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153 perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148 perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -4305,7 +4404,7 @@ msgstr ""
 msgid "User flagged"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:18 templates/web/base/admin/users/form.html:37 templates/web/base/admin/users/index.html:65
+#: templates/web/base/admin/report_blocks.html:18 templates/web/base/admin/users/_form_details.html:31 templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
 
@@ -4317,19 +4416,19 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142 templates/web/base/admin/update_edit.html:36
+#: templates/web/base/admin/reports/edit.html:155 templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713 perllib/FixMyStreet/Cobrand/Default.pm:770 perllib/FixMyStreet/Cobrand/KiitC.pm:204 perllib/FixMyStreet/Cobrand/KiitC.pm:336 perllib/FixMyStreet/Cobrand/Zurich.pm:425 templates/web/base/admin/flagged.html:29 templates/web/base/admin/roles/index.html:25 templates/web/zurich/header.html:57
+#: perllib/FixMyStreet/Cobrand/Default.pm:729 perllib/FixMyStreet/Cobrand/Default.pm:786 perllib/FixMyStreet/Cobrand/Zurich.pm:395 templates/web/base/admin/flagged.html:29 templates/web/base/admin/roles/index.html:25 templates/web/zurich/header.html:66
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -4337,7 +4436,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:316 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr ""
 
@@ -4357,7 +4456,7 @@ msgstr ""
 msgid "View report on site"
 msgstr ""
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -4365,7 +4464,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -4381,7 +4480,7 @@ msgstr ""
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -4445,7 +4544,7 @@ msgstr ""
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -4465,7 +4564,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr ""
 
@@ -4477,7 +4576,7 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122 templates/web/base/admin/bodies/category.html:6 templates/web/base/admin/bodies/index.html:70 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:33 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/list_updates.html:36 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/reports/edit.html:101 templates/web/base/admin/reports/edit.html:137 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users/alerts.html:21 templates/web/base/admin/users/index.html:65 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:39
+#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122 templates/web/base/admin/bodies/category.html:6 templates/web/base/admin/bodies/index.html:70 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:33 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/list_updates.html:36 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/reports/edit.html:101 templates/web/base/admin/reports/edit.html:150 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users/alerts.html:21 templates/web/base/admin/users/index.html:65 templates/web/base/questionnaire/index.html:39 templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr ""
 
@@ -4490,7 +4589,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -4502,7 +4601,7 @@ msgstr ""
 msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
 msgstr ""
 
-#: templates/web/base/report/_updates_disallowed_message.html:2 templates/web/base/report/display.html:59
+#: templates/web/base/report/_updates_disallowed_message.html:2 templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -4510,7 +4609,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -4537,7 +4636,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -4547,7 +4646,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -4555,7 +4654,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -4563,7 +4662,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89 templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -4622,7 +4721,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:4 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:19 templates/web/base/auth/generate_token.html:27 templates/web/base/auth/generate_token.html:35 templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4630,7 +4729,7 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30 templates/web/base/auth/create.html:50 templates/web/base/auth/general.html:56 templates/web/base/contact/enquiry/index.html:18 templates/web/base/contact/index.html:91 templates/web/base/report/display_tools.html:59 templates/web/base/report/form/user_loggedout_email.html:7 templates/web/base/report/new/duplicate_suggestions.html:42 templates/web/zurich/report/new/fill_in_details_form.html:53
+#: templates/web/base/alert/updates.html:32 templates/web/base/auth/create.html:50 templates/web/base/auth/general.html:56 templates/web/base/contact/enquiry/index.html:18 templates/web/base/contact/index.html:91 templates/web/base/report/display_tools.html:60 templates/web/base/report/form/user_loggedout_by_email.html:50 templates/web/base/report/form/user_loggedout_email.html:6 templates/web/base/report/new/duplicate_suggestions.html:42 templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
 msgstr ""
 
@@ -4654,16 +4753,16 @@ msgstr ""
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -4679,7 +4778,7 @@ msgstr ""
 msgid "Your password has expired, please create a new one below. When you click the link in your email, your password will be updated."
 msgstr ""
 
-#: templates/web/base/auth/create.html:67 templates/web/base/report/form/user_loggedout_by_email.html:57 templates/web/base/report/form/user_loggedout_by_email.html:59 templates/web/zurich/auth/general.html:56
+#: templates/web/base/auth/create.html:67 templates/web/base/report/form/user_loggedout_by_email.html:80 templates/web/base/report/form/user_loggedout_by_email.html:82 templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
 
@@ -4708,7 +4807,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -4736,15 +4835,15 @@ msgstr ""
 msgid "admin"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18 templates/web/base/admin/category-checkboxes.html:5 templates/web/base/admin/users/form.html:167
+#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18 templates/web/base/admin/category-checkboxes.html:5 templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220 perllib/FixMyStreet/DB/Result/User.pm:344 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161 templates/web/base/admin/update_edit.html:92 templates/web/base/report/update/moderation_meta.html:2
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127 perllib/FixMyStreet/DB/Result/Comment.pm:281 perllib/FixMyStreet/DB/Result/User.pm:349 templates/web/base/admin/update_edit.html:92 templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -4752,7 +4851,7 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: templates/web/base/reports/body.html:13 templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8 templates/web/base/reports/body.html:9
 msgid "council"
 msgstr ""
 
@@ -4780,6 +4879,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22 templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
 msgstr ""
@@ -4792,7 +4895,7 @@ msgstr ""
 msgid "n/a"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19 templates/web/base/admin/category-checkboxes.html:6 templates/web/base/admin/users/form.html:168
+#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19 templates/web/base/admin/category-checkboxes.html:6 templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -4861,12 +4964,12 @@ msgid "today"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -4890,7 +4993,7 @@ msgstr ""
 msgid "user removed from abuse list"
 msgstr ""
 
-#: templates/web/base/reports/body.html:0 templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:0 templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr ""
 
@@ -4950,7 +5053,7 @@ msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -4971,7 +5074,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -4992,21 +5095,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -5041,14 +5144,14 @@ msgid_plural "last updated %d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po
index c3619f74a..1078bc309 100644
--- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: ButterflyOfFire, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/mysociety/teams/12067/ar/)\n"
@@ -21,8 +21,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "و"
@@ -57,7 +57,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - ملخص التقارير"
 
@@ -118,7 +118,7 @@ msgstr "%s الأسئلة المرسلة &ndash; %s المجابة (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "مرجع:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> المساهمون"
 
@@ -164,6 +164,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(لم ترسل الى الجهة المسئولة)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -182,8 +184,8 @@ msgstr "(أرسل لكليهما)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "--إختر تصنيف--"
@@ -213,17 +215,18 @@ msgstr ""
 "              هل تريد إضافة بعض <code>MAPIT_TYPES</code> إلى ملف التكوين؟"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -253,7 +256,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>نعم</strong> لدي كلمة المرور"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -270,7 +273,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -293,7 +296,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "أضف عنوان اتصال عبر النموذج التالي."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "أضف تصنيفاً"
@@ -326,7 +329,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "أضف تصنيفاً"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "إضافة خيار"
 
@@ -335,8 +338,8 @@ msgstr "إضافة خيار"
 msgid "Add phone number"
 msgstr "إضافة رقم هاتف"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -344,21 +347,20 @@ msgid "Add to shortlist"
 msgstr "اضف للقائمة القصيرة"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "إضافة مستخدم"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "اضف / عدل اصناف المشاكل"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "اضف/عدل أولويات الاستجابة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "اضف/عدل قوالب الاستجابة"
 
@@ -374,6 +376,12 @@ msgstr "اضافة التقرير للقائمة القصيرة خاصتك سي
 msgid "Admin"
 msgstr "المدير"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "مرة اخرى:"
@@ -386,8 +394,8 @@ msgstr "تحذير  %d أنشيء لـ %s، نوع %s، معاملات %s \\ %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "التحذير %d ألغي تفعيله (أنشيء %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "نبهني بأحدث المستجدات"
 
@@ -399,10 +407,12 @@ msgstr "تحذيرات:"
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "كلها"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "كل التقارير"
@@ -442,6 +452,11 @@ msgstr "كل البلاغات بين %s و %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "تم الإبلاغ عنها في الفئة %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -478,7 +493,7 @@ msgstr "مجهول"
 msgid "Anonymous user"
 msgstr "مستخدم مجهول"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -491,7 +506,7 @@ msgid "Another user"
 msgstr "مستخدم اخر"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "هل أنت متأكد أنك تريد إلغاء الرفع؟"
 
@@ -500,8 +515,8 @@ msgstr "هل أنت متأكد أنك تريد إلغاء الرفع؟"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "هل أنت متأكد؟"
@@ -512,7 +527,7 @@ msgstr "هل أنت متأكد؟"
 msgid "Area covered"
 msgstr "المنطقة المغطاة"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "المنطقة:"
 
@@ -526,27 +541,32 @@ msgstr "بما أن هذا الموقع هو موقع مؤقت وقيمة %s ه
 msgid "Assign selected to role:"
 msgstr "تعيين المستخدمين للمناطق"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "تعيين إلى الهيئة المختصة:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "تعيين إلى فئة أخرى:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "تعيين إلى هيئة خارجية:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "تعيين إلى قسم فرعي:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "تعيين المستخدمين للمناطق"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "التصنيفات المتاحة"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "عين إلى %s"
@@ -559,7 +579,7 @@ msgstr "في الغالب، يتم إرجاع %d من الطلبات في كل 
 msgid "At the moment only searching for and looking at reports work."
 msgstr "حاليا مايعمل هو البحث ورؤية البلاغات فقط."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr "مستخدمين "
 
@@ -567,11 +587,11 @@ msgstr "مستخدمين "
 msgid "Auto Response"
 msgstr "إجابة تلقائية"
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "الإستجابة الآلية:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -583,12 +603,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr "تفادى المعلومات الشخصية ولوحات السيارات"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "في إنتظار المشرفين"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "الخلف"
@@ -609,14 +630,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "الهيئات"
 
@@ -629,11 +648,13 @@ msgstr "الهيئات"
 msgid "Body"
 msgstr "الهيئة"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "الهيئة:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr "ملف CSV"
 
@@ -645,8 +666,7 @@ msgstr "لا تستطيع العثور على رسالة البريد الإلك
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "لا يمكنك رؤية الخريطة؟ <em>تجاوز هذه الخطوة</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -662,15 +682,13 @@ msgstr "تصنيفات:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -680,7 +698,7 @@ msgstr "تصنيف"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "تصنيف تغير من ‘%s’ إلى ‘%s’"
 
@@ -703,6 +721,11 @@ msgstr "تصنيف:"
 msgid "Change"
 msgstr "تغيير"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "تغيير كلمة المرور"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -719,7 +742,7 @@ msgstr "تغيير كلمة المرور"
 msgid "Change phone number"
 msgstr "تغيير رقم الهاتف"
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -731,12 +754,12 @@ msgstr ""
 "اختر اسم <strong>تصنيف</strong> يكون منطقيا لعامة الناس (مثل، \"أخدود\"، \"إنارة الطريق\") ومساعد.\n"
 "للجهات المسئولة أيضا. هذه سوف تظهر في القائمة المنسدلة من صفحة إبلاغ-عن-مشكلة."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -773,8 +796,8 @@ msgid "Close"
 msgstr "إعلاق"
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -784,11 +807,7 @@ msgstr "إعلاق"
 msgid "Closed"
 msgstr "مغلق"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "مغلق من الجهة المسئولة"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -821,13 +840,12 @@ msgid "Code"
 msgstr "الرمز"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "إعدادت"
@@ -944,7 +962,7 @@ msgstr "انشئ بلاغ"
 msgid "Create an account"
 msgstr "إنشاء حساب"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "انشء تصنيف"
@@ -954,27 +972,25 @@ msgstr "انشء تصنيف"
 msgid "Create priority"
 msgstr "انشء أولوية"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "انشاء التبليغات/تحديثات كالمجلس"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "انشاء التبليغات/تحديثات بالنيابة عن مستخدم"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "إنشاء قالب"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "تم الإنشاء"
@@ -983,6 +999,17 @@ msgstr "تم الإنشاء"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "تم الإنشاء"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "تم الإنشاء"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -994,10 +1021,6 @@ msgstr "تم الإنشاء:"
 msgid "Current password:"
 msgstr "الكلمة السرية الحالية:"
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr "الرمز الحالي:"
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -1007,19 +1030,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "حاليا لايوجد جهات مسئولة تم إنشائها."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "لا يمكن الاتصال بالعميل"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "صفحة المستخدم"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1031,7 +1056,7 @@ msgstr "تم التعامل بواسطة القسم الفرعي في غضون 5
 msgid "Default"
 msgstr "افتراضي"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1041,7 +1066,7 @@ msgid "Delete"
 msgstr "حذف"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "حذف القالب"
@@ -1063,9 +1088,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "الوصف"
 
@@ -1074,7 +1097,7 @@ msgstr "الوصف"
 msgid "Destination"
 msgstr "الوصف"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1110,7 +1133,7 @@ msgid "Disable"
 msgstr "تعطيل"
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1118,6 +1141,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "تم الإبلاغ عنها في الفئة %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "تم الإبلاغ عنها في الفئة %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1152,25 +1185,25 @@ msgstr "لا أعلم"
 msgid "Don't like forms?"
 msgstr "هل تحب النماذج؟"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "اسحب الصور واسقطها هنا أو <u>انقر للرفع</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr "المكرَّرة"
 
@@ -1185,7 +1218,7 @@ msgstr ""
 "يمكن للتصنيفات المختلفة أن <strong>تمتلك نفس عنوان الاتصال</strong> (عنوان بريد إلكتروني).\n"
 "هذا يعني أنه يمكنك إضافة ما تشاء من التصنيفات حتى ولو كنت تملك عنوان اتصال واحد للجهة المسئولة."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr "باتجاه الشرق /باتجاه الشمال:"
@@ -1197,7 +1230,7 @@ msgstr "باتجاه الشرق /باتجاه الشمال:"
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "تعديل"
@@ -1208,12 +1241,11 @@ msgstr "تعديل"
 msgid "Edit body details"
 msgstr "تعديل تفاصيل الجهة المسئولة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "عدل صلاحيات المستخدمين الآخرين"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "عدل تصنيف التقرير"
 
@@ -1221,17 +1253,15 @@ msgstr "عدل تصنيف التقرير"
 msgid "Edit report details"
 msgstr "تعديل تفاصيل الإبلاغ"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "عدل أولوية التقرير"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "عدل التقارير"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1268,8 +1298,9 @@ msgstr "المحرر"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1278,15 +1309,14 @@ msgstr "المحرر"
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "البريد الإلكتروني"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr "البريد الإلكتروني (اختياري)"
 
@@ -1306,12 +1336,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr "ارسل لي رابطا لكي أتمكن مِن تسجيل الدخول"
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "البريد الإلكتروني المؤكد:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "البريد الإلكتروني:"
@@ -1381,12 +1412,12 @@ msgstr "تاريخ النهاية"
 msgid "Endpoint"
 msgstr "نقطة النهاية"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "أدخل اسم شارع في زيورخ"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "أدخل أقرب صندوق بريد بريطاني، أو اسم الشارع والحي"
 
@@ -1413,10 +1444,10 @@ msgstr "أدخل تفاصيل البلاغ"
 msgid "Error"
 msgstr "خطأ"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "الكل"
 
@@ -1429,7 +1460,7 @@ msgstr "مثال لصندوق البريد %s"
 msgid "Examples:"
 msgstr "أمثلة:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "تصنيف موجود"
 
@@ -1438,7 +1469,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr "توسيع الخريطة"
 
@@ -1463,7 +1494,7 @@ msgid "External body"
 msgstr "هيئة خارجية"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1475,20 +1506,20 @@ msgstr ""
 msgid "External team"
 msgstr "فريق خارجي"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "حقول إضافية"
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "بيانات إضافية:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1521,20 +1552,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "ترشيح قائمة البلاغات"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "أول مرة"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "صور التقارير القريبة الحديثة"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "تقارير جديدة"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "يمكن إصلاح ذلك عن طريق اختيار <strong>منطقة التغطية</strong> في نموذج <em>تحرير تفاصيل الهيئة</em> بالأسفل."
@@ -1564,7 +1600,7 @@ msgstr "مشار كمحذوف"
 msgid "Flag user"
 msgstr "مستخدم مشار إليه"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "مشار إليهم"
@@ -1573,7 +1609,7 @@ msgstr "مشار إليهم"
 msgid "Flagged reports and users"
 msgstr "بلاغات ومستخدمين مشار إليهم"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "المستخدمين المشار إليهم مدرجين بقائمة في صفحة <a href='%s'>المشار إليهم</a>"
 
@@ -1581,8 +1617,8 @@ msgstr "المستخدمين المشار إليهم مدرجين بقائمة 
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "المستخدمين المشار إليهم غير محظورين بأي طريقة، هذه فقط لائحة بالمستخدمين المحددين للإنتباه لهم"
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "مشار إليه:"
 
@@ -1608,11 +1644,11 @@ msgstr "نسيت كلمتك السرية"
 msgid "Forgotten your password?"
 msgstr "هل نسيت كلمة المرور؟"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "تمت إعادة التوجيه إلى هيئة خارجية"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "تمت إعادة توجيه الطلب إلى هيئة خارجية"
 
@@ -1622,12 +1658,20 @@ msgstr "تمت إعادة توجيه الطلب إلى هيئة خارجية"
 msgid "Frequently Asked Questions"
 msgstr "الأسئلة الشائعة"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr "توليد رمز"
 
@@ -1649,7 +1693,7 @@ msgstr "احصل على التحديثات لـ %s من المشاكل"
 msgid "Get updates of problems in this %s"
 msgstr "احصل على التحديثات للمشاكل في هذه %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "أرسل لي موجز RSS"
 
@@ -1665,15 +1709,15 @@ msgstr "سعيد لسماع أنها أصلحت!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1683,7 +1727,7 @@ msgstr "اذهب"
 msgid "Going to send questionnaire?"
 msgstr "هل تريد أن ترسل سؤال؟"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr "إعطاء تصريح للأدمن"
 
@@ -1709,6 +1753,7 @@ msgstr "هل أبلغت عن مشكلة لأحد المجالس من قبل، أ
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1743,7 +1788,8 @@ msgstr "مخفي"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1771,7 +1817,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "أخفي المثبتة"
 
@@ -1825,11 +1871,9 @@ msgstr "نعتذر لك لم نستطع تحديد مشكلتك في قاعدة
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "المعرف"
 
@@ -1850,15 +1894,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1874,7 +1918,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1898,7 +1942,7 @@ msgstr "اذا كنت تريد ان تكون هذا النموذج خيارا ل
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "في حالة تقديم مشكلة هنا، <strong>لن</strong> يتم الإبلاغ عن المشكلة للمجلس."
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1937,7 +1981,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1961,6 +2005,17 @@ msgstr "في جدول المسيئين؟"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "إضافة إلى ذلك، يتم إرجاع السمات التالية التي ليست جزءًا من مواصفة Open311 v2: agency_sent_datetime وtitle (يرجع أيضًا كجزء من الوصف) وinterface_used وcomment_count وrequestor_name (يوجد إذا كان مقدم الطلب سمح بعرض الاسم على هذا الموقع)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "الإدارة"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1970,20 +2025,20 @@ msgstr "غير نشط"
 msgid "Inbox zero, here we come!"
 msgstr "علبة الواردة فارغة، ها قد وصلنا!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "تضمين البيانات الشخصية للمبلّغ"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "قيمة has_photo غير صحيحة \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "وجه المقاولون لإصلاح المشاكل"
 
@@ -2000,16 +2055,12 @@ msgstr "ملاحظات داخلية"
 msgid "Internal notes"
 msgstr "ملاحظات داخلية"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "قيمة agency_responsible غير صالحة %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "التنسيق المحدد %s غير صالح."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "موقع غير صحيح. على الموقع الجديد ان يكون تحت نفس المجلس."
 
@@ -2061,13 +2112,13 @@ msgstr "آخر تحديث"
 msgid "Last&nbsp;update:"
 msgstr "آخر تحديث:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "الطول/العرض:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "الاقل تحديثا مؤخرا"
@@ -2084,7 +2135,7 @@ msgstr "عرض جميع المشكلات المبلّغ عنها"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "جارٍ التحميل..."
@@ -2122,17 +2173,18 @@ msgid "Log in with Twitter"
 msgstr "تسجيل الدخول عبر تويتر"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "تسجيل الدخول عبر البريد الإلكتروني"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr "الخروج مِن كافة الجلسات"
 
@@ -2151,19 +2203,20 @@ msgstr "البحث"
 msgid "MAP"
 msgstr "الخريطة"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr "ادارة القائمة القصيرة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr "ترتيب يدوي"
@@ -2177,24 +2230,24 @@ msgstr "الخريطة"
 msgid "Mark as sent"
 msgstr "اشر كمرسلة"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "تحديد المستخدمين الذين تريد وضع علامة على سلوكهم بأنه <strong>مشار إليه</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr "حدد تفاصيل المشكلة."
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "الرسالة"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "رسالة إلى الهيئة المختصة:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "رسالة إلى الهيئة الخارجية:"
 
@@ -2207,7 +2260,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr "هيئات مفقودة:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr " jurisdiction_id غير موجود"
 
@@ -2215,8 +2268,7 @@ msgstr " jurisdiction_id غير موجود"
 msgid "Moderate"
 msgstr "إشراف"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "قم بالاشراف على تفاصيل التبليغ"
 
@@ -2239,7 +2291,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "تمت المعالجة بواسطة القسم خلال يوم عمل واحد"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr "سِجلّ الإشراف"
@@ -2249,14 +2301,14 @@ msgstr "سِجلّ الإشراف"
 msgid "Month"
 msgstr "الشهر"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "الأكثر تعليقا"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2284,9 +2336,10 @@ msgstr ""
 msgid "Name"
 msgstr "الاسم"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "الاسم:"
@@ -2304,7 +2357,7 @@ msgstr "انتقل الى هذه المشكلة"
 msgid "Nearest calculated address:"
 msgstr "أقرب عنوان تم التعرف عليه:"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "أقرب طريق مسمى للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا باستخدام OpenStreetMap): %s%s"
 
@@ -2312,12 +2365,12 @@ msgstr "أقرب طريق مسمى للدبوس الموضوع على الخري
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "أقرب رمز بريدي للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا): %s (على بعد %s متر)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "أقرب شارع مسمى للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا باستخدام خرائط Bing): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2340,7 +2393,7 @@ msgstr ""
 msgid "New body added"
 msgstr "تمت إضافة هيئة جديدة"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "تمت إضافة جهة اتصال جديدة للفئة"
 
@@ -2354,8 +2407,8 @@ msgstr "بريد إلكتروني جديد:"
 msgid "New field"
 msgstr "حفظ الحقول الجديدة"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "ملاحظة داخلية جديدة:"
 
@@ -2363,13 +2416,13 @@ msgstr "ملاحظة داخلية جديدة:"
 msgid "New local problems on FixMyStreet"
 msgstr "مشكلات محلية جديدة على FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "ملاحظة جديدة لرئيس المنطقة:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "كلمة مرور جديدة:"
 
@@ -2446,7 +2499,7 @@ msgstr "قالب جديد"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "الأحدث"
@@ -2459,7 +2512,6 @@ msgstr "التالي"
 msgid "Next:"
 msgstr "التالي:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2468,11 +2520,11 @@ msgstr "التالي:"
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "لا"
 
@@ -2484,11 +2536,12 @@ msgstr ""
 msgid "No account?"
 msgstr "ليس عندك حساب بعد؟"
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "لا هيئة"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "لم يتم تحديد مجلس"
 
@@ -2504,8 +2557,8 @@ msgstr "لم يتم العثور على مشكلات مشار إليها."
 msgid "No flagged users found."
 msgstr "لم يتم العثور على مستخدمين مشار إليهم."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "لا توجد تحديثات إضافية"
 
@@ -2543,8 +2596,8 @@ msgstr "لا يوجد داعمون"
 msgid "None"
 msgstr "بلا"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
@@ -2553,8 +2606,8 @@ msgstr ""
 "                يمكن إقران المستخدمين الموظفين المعتمدين بالمنطقةالتي يعملون فيها.<br>\n"
 "  "
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2566,10 +2619,14 @@ msgstr ""
 "                تبعًا للتنفيذ، يمكن أن يكون لدى المستخدمين الموظفين حق الوصول إلى لوحة المعلومات (ملخص\n"
 "                الأنشطة عبر الهيئة التي يمثلونها)، أو القدرة على إخفاء التقارير أو تعيين حالات خاصة للتقارير."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "ليس للقسم الفرعي التابع له"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "لم يقوموا بالإبلاغ من قبل"
@@ -2618,12 +2675,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2631,12 +2688,12 @@ msgstr ""
 msgid "Old state"
 msgstr "حالة قديمة"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "الأقدم"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2645,7 +2702,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2676,7 +2733,7 @@ msgstr "صفحة ويب مبادرة Open311"
 msgid "Open311 specification"
 msgstr "مواصفة Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr "الخيارات"
 
@@ -2688,7 +2745,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2696,16 +2753,16 @@ msgstr ""
 msgid "Order"
 msgstr "الترتيب"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2737,7 +2794,7 @@ msgstr "لم يتم العثور على الصفحة"
 msgid "Parent"
 msgstr "العنصر الرئيسي"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "فئات أخرى"
@@ -2746,13 +2803,13 @@ msgstr "فئات أخرى"
 msgid "Partial"
 msgstr "جزئي"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "كلمة المرور (اختياري)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "تم تغيير كلمة المرور"
@@ -2767,7 +2824,7 @@ msgstr "كلمة المرور (اختياري)"
 msgid "Permissions"
 msgstr "الصلاحيات:"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "الصلاحيات:"
 
@@ -2775,19 +2832,24 @@ msgstr "الصلاحيات:"
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "الهاتف:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "رقم الهاتف"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "رقم الهاتف (اختياري)"
 
@@ -2795,30 +2857,26 @@ msgstr "رقم الهاتف (اختياري)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "الهاتف:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2838,9 +2896,8 @@ msgstr "الصورة مطلوبة"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "الصور"
@@ -2849,7 +2906,7 @@ msgstr "الصور"
 msgid "Photos of recent nearby reports"
 msgstr "صور التقارير القريبة الحديثة"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2863,6 +2920,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "وضع دبوس على الخريطة"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2890,27 +2952,26 @@ msgid "Please check your email address is correct"
 msgstr "الرجاء التحقق من أن عنوان البريد الإلكتروني صحيح"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "الرجاء اختيار فئة"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2932,27 +2993,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "الرجاء إدخال رسالة"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr "يرجى إدخال رقم هاتف خلوي"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "الرجاء إدخال اسمك"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "الرجاء ادخال اسم لهذه الهيئة."
 
@@ -2965,16 +3026,16 @@ msgstr "الرجاء إدخال كلمة مرور"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "الرجاء إدخال موضوع"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2985,20 +3046,20 @@ msgstr "الرجاء إدخال بريد إلكتروني صالح"
 msgid "Please enter a valid email address"
 msgstr "الرجاء إدخال عنوان بريد إلكتروني صالح"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "الرجاء إدخال بعض التفاصيل"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -3014,7 +3075,7 @@ msgid "Please enter your first name"
 msgstr "الرجاء إدخال الاسم الأول"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "الرجاء إدخال الاسم الكامل؛ فالمجالس تحتاج هذه المعلومة - إذا كنت لا ترغب في إظهار اسمك على الموقع، فألغِ تحديد هذا المربع الموجود بالأسفل"
@@ -3026,9 +3087,9 @@ msgstr "الرجاء إدخال اسمك"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "الرجاء إدخال اسمك"
@@ -3069,19 +3130,19 @@ msgstr "الرجاء تعبئة النموذج التالي بتفاصيل ال
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "الرجاء الإشارة إلى ما إذا كنت تريد المشاركة في استبيان آخر أم لا"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "الرجاء إدخال عنوان بريد إلكتروني صالح"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3108,24 +3169,28 @@ msgstr "يرجى ملاحظة أن تحديثك <strong>لم يتم نشره ب
 msgid "Please note:"
 msgstr "الرجاء ملاحظة:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr "الرجاء تقديم تحديث عام لهذا التقرير."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "الرجاء توضيح أسباب تقديم هذا التقرير"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "الرجاء إضافة بعض التوضيحات وصورة"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "الرجاء ذكر ما إذا كنت قد أبلغت عن مشكلة إلى المجلس من قبل أم لا"
 
@@ -3133,7 +3198,7 @@ msgstr "الرجاء ذكر ما إذا كنت قد أبلغت عن مشكلة 
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "الرجاء تحديد هيئة."
 
@@ -3145,7 +3210,7 @@ msgstr "الرجاء تحديد الموجز الذي تريده"
 msgid "Please select the type of alert you want"
 msgstr "الرجاء تحديد نوع التنبيه الذي تريده"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "الرجاء تحديد ما إذا كانت المشكلة قد تم حلها أم لا"
 
@@ -3153,12 +3218,12 @@ msgstr "الرجاء تحديد ما إذا كانت المشكلة قد تم ح
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "الرجاء تحميل صورة فقط"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3166,27 +3231,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "الرجاء كتابة رسالة"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "نشر"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "نشر بدون تحديد الهوية في %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "تم النشر بواسطة %s في %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "تم النشر بواسطة <strong>%s</strong> (%s) في %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "تم النشر بواسطة <strong>%s</strong> في %s"
 
@@ -3202,7 +3263,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3210,11 +3271,11 @@ msgstr ""
 msgid "Previous"
 msgstr "السابق"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "أولويات"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "أولوية"
@@ -3230,9 +3291,9 @@ msgid "Privacy and cookies"
 msgstr "الخصوصية وملفات تعريف الارتباط"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "خاص"
 
@@ -3282,7 +3343,7 @@ msgstr "تم إرسال المشكلة %s إلى المجلس %s"
 msgid "Problem breakdown by state"
 msgstr "تصنيف المشكلة حسب الحالة"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "تم وضع علامة \"مفتوح\" على المشكلة."
 
@@ -3290,8 +3351,7 @@ msgstr "تم وضع علامة \"مفتوح\" على المشكلة."
 msgid "Problem state change based on survey results"
 msgstr "يتم تغيير حالة المشكلة حسب نتائج الاستطلاع"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "المشكلات"
@@ -3316,18 +3376,18 @@ msgstr "المشكلات المبلّغ عنها مؤخرًا على FixMyStreet
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "المشكلات ضمن حدود %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "المشكلات ضمن حدود دائرة %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3335,7 +3395,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "المشكلات ضمن حدود %s، %s"
 
@@ -3343,11 +3403,15 @@ msgstr "المشكلات ضمن حدود %s، %s"
 msgid "Property address:"
 msgstr "عنوان الملكية:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3361,11 +3425,11 @@ msgstr "قدّم تحديثًا"
 msgid "Provide update as"
 msgstr "قدم التحديث كـ"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "تقديم كلمة المرور اختياري، ولكن فعل ذلك يتيح لك الإبلاغ عن المشكلات وإضافة التحديثات وإدارة التقارير بسهولة أكبر."
 
@@ -3373,12 +3437,12 @@ msgstr "تقديم كلمة المرور اختياري، ولكن فعل ذلك
 msgid "Public details"
 msgstr "التفاصيل العمومية:"
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "الاستجابة العامة:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "التحديث العام:"
 
@@ -3421,11 +3485,11 @@ msgstr "تمت تعبئة الاستبيان بواسطة المبلّغ عن ا
 msgid "RSS feed"
 msgstr "موجز RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "موجز RSS لـ %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "موجز RSS لدائرة %s، %s"
 
@@ -3433,11 +3497,11 @@ msgstr "موجز RSS لدائرة %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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "موجز RSS لـ %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "موجز RSS لـ %s، ضمن حدود دائرة %s"
 
@@ -3445,13 +3509,13 @@ msgstr "موجز RSS لـ %s، ضمن حدود دائرة %s"
 msgid "RSS feed of nearby problems"
 msgstr "موجز RSS للمشكلات القريبة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "موجز RSS للمشكلات الموجودة ضمن حدود %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "موجز RSS للمشكلات الموجودة ضمن حدود دائرة %s"
 
@@ -3465,11 +3529,11 @@ msgstr "موجز RSS للمشكلات المحلية الحديثة"
 msgid "RSS feed of updates to this problem"
 msgstr "موجز RSS للتحديثات على هذه المشكلة"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr "اقرأ المزيد"
 
@@ -3482,7 +3546,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "استلام بريد إلكتروني عند ترك تحديثات لهذه المشكلة."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr "استلمت من %s قبل لحظات"
 
@@ -3496,7 +3560,7 @@ msgstr "المشكلات المحلية الحديثة، %s"
 msgid "Recently reported problems"
 msgstr "المشاكل المبلغة حديثا"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "المحدثة مؤخرا"
@@ -3509,7 +3573,8 @@ msgstr "رفض التقرير"
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "تذكر أن FixMyStreet مخصص في الأساس للإبلاغ عن المشكلات الفعلية التي يمكن حلها. إذا كانت مشكلتك غير مناسبة للتقديم عبر هذا الموقع فتذكر أنه يمكنك التواصل مع المجلس مباشرةً باستخدام موقع الويب الخاص به."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr "إزالة تفاصيل الحساب"
 
@@ -3521,8 +3586,8 @@ msgstr "إزالة الحقل"
 msgid "Remove flag"
 msgstr "إزالة الإشارة"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3538,17 +3603,22 @@ msgstr "احذف من الموقع"
 msgid "Remove option"
 msgstr "إزالة الحقل"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "إزالة الصورة (لا يمكن التراجع عن هذا الإجراء!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "عدل صلاحيات المستخدمين الآخرين"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr "تبديل الرمز"
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "رد على المستخدم:"
 
@@ -3556,14 +3626,14 @@ msgstr "رد على المستخدم:"
 msgid "Report"
 msgstr "إبلاغ"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "معرف البلاغ:"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3572,7 +3642,7 @@ msgid "Report a problem"
 msgstr "الإبلاغ عن مشكلة"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3588,7 +3658,7 @@ msgid "Report anonymously"
 msgstr "تم الإبلاغ عنها بدون تحديد الهوية في %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3624,7 +3694,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "الإبلاغ عن المشكلات المحلية أو عرضها أو مناقشتها"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "تم الإبلاغ عنها بدون تحديد الهوية في %s"
@@ -3635,7 +3705,7 @@ msgstr "تم الإبلاغ عنها بدون تحديد الهوية في %s"
 msgid "Reported before"
 msgstr "تم الإبلاغ عنها من قبل"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "تم الإبلاغ عنها بواسطة %s في %s"
@@ -3649,27 +3719,27 @@ msgstr "تم الإبلاغ عنها بواسطة:"
 msgid "Reported in the %s category"
 msgstr "تم الإبلاغ عنها في الفئة %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "تم الإبلاغ عنها في الفئة %s بدون تحديد الهوية في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "تم البلاغ في التصنيف %s بواسطة %s في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "تم الإبلاغ عنها بواسطة %s بدون تحديد الهوية في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "تم الإبلاغ عنها عبر %s بواسطة %s في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "تم الإبلاغ عنها عبر %s في الفئة %s بدون تحديد الهوية في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "تم الإبلاغ عنها عبر %s في الفئة %s بواسطة %s في %s"
 
@@ -3688,17 +3758,15 @@ msgstr "تم الإبلاغ:"
 msgid "Reporting a problem"
 msgstr "الإبلاغ عن مشكلة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "التقارير"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3726,15 +3794,15 @@ msgid "Reports published"
 msgstr "تم نشر التقارير"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3747,7 +3815,7 @@ msgstr "التقارير في انتظار الإرسال"
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr "مطلوب"
 
@@ -3800,39 +3868,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "المكان صحيح؟"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "مشغل الطرق لهذا الطريق المسمى (يتم اشتقاقه من رقم ونوع مرجع الطريق): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "مشغل الطرق لهذا الطريق المسمى (من OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "تدوير لليسار"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3848,20 +3922,20 @@ msgstr "سيؤدي تدوير هذه الصورة إلى تجاهل التغيي
 msgid "Satellite"
 msgstr "القمر الصناعي"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3878,13 +3952,12 @@ msgid "Save with a public update"
 msgstr "احفظ مع التحديث العام"
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "البحث عن تقارير"
 
@@ -3897,7 +3970,7 @@ msgstr "البحث عن مستخدمين"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "البحث عن تقارير"
 
@@ -3912,12 +3985,12 @@ msgstr "بحث:"
 msgid "Searching found no reports."
 msgstr "لم يعثر البحث على أي تقارير."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "لم يعثر البحث عن أي مستخدمين."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr "الأمان"
@@ -3927,8 +4000,7 @@ msgstr "الأمان"
 msgid "See our privacy policy"
 msgstr "انظر سياسة الخصوصية"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3938,7 +4010,7 @@ msgid "Select a body"
 msgstr "تحديد هيئة"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "تحديد منطقة"
@@ -3959,7 +4031,7 @@ msgstr ""
 msgid "Select:"
 msgstr "تحديد:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr "إرسال"
@@ -3972,7 +4044,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr "أرسل حالات Open311  مطولة مع تحديثات طلب الخدمة"
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3981,11 +4053,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "تمت إعادة إرسال التقرير"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "تم الإرسال إلى %s %s لاحقًا"
 
@@ -4023,7 +4095,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr "قائمة قصيرة"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4034,7 +4106,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr "تم الاضافة الى القائمة القصيرة"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr "تم الاضافة الى القائمة القصيرة في %s"
@@ -4059,8 +4131,8 @@ msgstr ""
 msgid "Show older"
 msgstr "عرض الأقدَم"
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr "عرض التقارير القديمة"
 
@@ -4071,7 +4143,7 @@ msgstr "عرض الصورة"
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "إظهار الدبابيس"
 
@@ -4133,7 +4205,7 @@ msgid "Some photos of recent reports"
 msgstr "بعض صور التقارير الحديثة"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "بعض النص لترجمته"
 
@@ -4142,12 +4214,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "عذرًا، يبدو هذا أنه رمز بريدي خاص بإحدى تبعيات التاج البريطاني، ونحن لا نغطي ذلك."
 
@@ -4165,9 +4236,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "عذرًا، حدث خطأ أثناء تأكيد المشكلة."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "عذرًا، لم نستطع العثور على هذا الموقع."
 
@@ -4177,13 +4248,13 @@ msgstr "عذرًا، لم نستطع العثور على هذا الموقع."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr "عذرا، لم نتمكن من تسجيل دخولك. يرجى ملئ النموذج بالأسفل."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "عذرًا، لم نستطع تحليل ذلك الموقع. الرجاء إعادة المحاولة."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4198,11 +4269,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr "للأسف، ليس لديك صلاحية لفعل ذلك."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "رتب بواسطة"
@@ -4212,11 +4283,11 @@ msgstr "رتب بواسطة"
 msgid "Staff only"
 msgstr "الموظف:"
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr "مستخدم الموظف لديه الصلاحية للدخول للأدمن"
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr "الموظف:"
 
@@ -4240,18 +4311,18 @@ msgstr "تاريخ البداية"
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "الحالة"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4260,31 +4331,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "الحالة:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "الإحصائيات"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "الحالة"
 
@@ -4302,7 +4370,7 @@ msgstr "عرض الشارع"
 msgid "Subcategory"
 msgstr "الفئة الفرعية"
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "القسم الفرعي/الهيئة"
 
@@ -4321,50 +4389,48 @@ msgstr "الموضوع:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "تقديم"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "تقديم التغييرات"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "تقديم الاستبيان"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "تم  اضافتها"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "اشتراك"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4377,7 +4443,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "يقتصر طول التحديثات على %s من الأحرف. الرجاء تقصير نص التحديث"
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4391,20 +4457,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr "لخص المشكلة"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "لخص تغييراتك"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "ملخص"
 
@@ -4415,14 +4480,20 @@ msgstr "ملخص التقارير"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr "خلاصة الإحصائيات"
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Superuser"
+msgstr "مستخدم خارق"
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr "مستخدم خارق"
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "المستخدم الخارق له ترخيص لتنفيذ strong>كل اعمال</strong> التي يمكن للأدمن عملها."
 
@@ -4440,13 +4511,18 @@ msgstr "حدثنا عنك"
 msgid "Template &laquo;%s&raquo;"
 msgstr "القالب &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "القوالب"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "الاقل تحديثا مؤخرا"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "النص"
@@ -4468,6 +4544,11 @@ msgstr "إصدار نصي فقط"
 msgid "Text:"
 msgstr "النص:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "النص"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "شكرًا لك للإبلاغ عن هذه المشكلة!"
@@ -4497,7 +4578,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "شكرًا لك، يسعدنا معرفة أن المشكلة قد حُلت! هل يمكنا أن نسألك عما إذا كنت قد أبلغت عن مشكلة للمجلس من قبل؟"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4509,27 +4590,29 @@ msgstr "يبدو أنه لم يتم تحميل هذه الصورة بصورة س
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "لا يبدو أن هذا الموقع ضمن صلاحيات المجلس؛ ربما يكون موقعًا بحريًا أو خارج حدود المحافظة. الرجاء إعادة المحافظة."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "لا يبدو أن هذا الموقع يقع في المملكة المتحدة؛ الرجاء إعادة المحاولة."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "لم يتم التعرف على هذا الرمز البريدي، عذرًا."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "تم وضع علامة على هذه المشكلة بأنها أُرسلت."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "ستتم إعادة إرسال هذه المشكلة الآن."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "تمت إزالة هذا التقرير من FixMyStreet."
 
@@ -4579,8 +4662,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4639,7 +4722,7 @@ msgstr "الخطأ هو: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "يتم إرجاع سمات Open311 v2 التالية لكل طلب: service_request_id وdescription وlat وlong وmedia_url وstatus وrequested_datetime وupdated_datetime وservice_code وservice_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "المعلومات التالية المتعلقة بأقرب طريق قد تكون غير دقيقة أو غير مناسبة، إذا كانت المشكلة قريبة من عدة طرق أو قريبة من طريق ليس له اسم مسجل في OpenStreetMap."
 
@@ -4701,8 +4784,8 @@ msgstr "تعذر على المستخدم تحديد موقع المشكلة عل
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4737,7 +4820,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4755,12 +4838,12 @@ msgstr "حدثت مشكلة أثناء عرض هذه الصفحة. الرجاء
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "حدثت مشكلة مع تحديثك. الرجاء المحاولة مرة آخرى."
 
@@ -4768,7 +4851,7 @@ msgstr "حدثت مشكلة مع تحديثك. الرجاء المحاولة م
 msgid "There were problems with your report. Please see below."
 msgstr "حدثت مشكلات في التقرير. الرجاء الاطلاع على ما يلي."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "حدثت مشكلات في التحديث. الرجاء الاطلاع على ما يلي."
 
@@ -4854,10 +4937,10 @@ msgstr "أُرسلت رسالة البريد الإلكتروني إلى كلا
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr "أُرسلت رسالة البريد الإلكتروني إلى عدة مجالس تغطي موقع المشكلة، وبما أن الفئة المحددة مدخلة لجميع المجالس، فالرجاء تجاهل المشكلة إذا لم تكن المجلس المختص بالتعامل معها."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "هذه المعلومات مطلوبة"
 
@@ -4874,19 +4957,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "تم إصلاح هذه المشكلة"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "لم يتم إصلاح هذه المشكلة"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4899,26 +4986,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "هذا التقرير في انتظار اعتماد الإشراف."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "هذا التقرير عليه علامة \"مغلق\" حاليًا."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "هذا التقرير عليه علامة \"تم الإصلاح\" حاليًا."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "هذا التقرير عليه علامة \"مفتوح\" حاليًا."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4926,15 +5013,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "تحتوي صفحة الويب هذه على صورة للمشكلة، تم تقديمها بواسطة المستخدم."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "الوقت المستغرق (بالدقائق):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4958,6 +5048,10 @@ msgstr "العنوان"
 msgid "Title:"
 msgstr "العنوان:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "لاكتشاف التنبيهات المحلية التي لدينا لك، الرجاء إدخال الرمز البريدي لـ %s أو اسم الشارع أو المنطقة:"
@@ -4984,7 +5078,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "لعرض خريطة موضح عليها الموقع الدقيق لهذه المشكلة"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 #, fuzzy
 msgid "Token"
 msgstr "الرمز:"
@@ -5010,11 +5104,6 @@ msgstr ""
 msgid "Total"
 msgstr "الإجمالي"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr "هل يتطلب إدارة المرور؟"
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr "الترجمة"
@@ -5037,16 +5126,16 @@ msgstr "جرّب إرسال البريد الإلكتروني إلينا مبا
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5056,7 +5145,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5086,10 +5175,10 @@ msgstr "خطأ غير معروف"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "معرف المشكلة غير معروف"
 
@@ -5101,13 +5190,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "تحديث"
 
@@ -5158,29 +5247,27 @@ msgstr "أدى التحديث إلى إعادة فتح المشكلة"
 msgid "Update statuses"
 msgstr "حالات التحديث"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "تم التحديث"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "تم التحديث!"
 
@@ -5191,7 +5278,7 @@ msgstr "تم التحديث!"
 msgid "Updates"
 msgstr "التحديثات"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "يقتصر طول التحديثات على %s من الأحرف. الرجاء تقصير نص التحديث"
 
@@ -5221,6 +5308,14 @@ msgstr "استخدم ملحق Open311 لأرسال الاحداثيات"
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr "التعليق المأخوذ ينتمي الى مستخدم معرف"
@@ -5234,8 +5329,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5253,7 +5348,7 @@ msgid "User flagged"
 msgstr "تم وضع إشارة للمستخدم"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5266,27 +5361,25 @@ msgstr "عثر البحث الذي نفذه المستخدم على مطابقا
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr "المستخدم:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "المستخدمون"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr "يمكن للمستخدمين تنفيذ الاوامر التاليه في مناطقهم او هيئاتهم المعينة."
 
@@ -5295,9 +5388,9 @@ msgstr "يمكن للمستخدمين تنفيذ الاوامر التاليه 
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr "يمكن للمستخدمين تنفيذ الاوامر التاليه في مناطقهم او هيئاتهم المعينة."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "تم تحديث القيم"
 
@@ -5323,7 +5416,7 @@ msgstr "التحقق من رقم الهاتف"
 msgid "View report on site"
 msgstr "عرض التقرير على الموقع"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "عرض التقارير حسب الدائرة"
 
@@ -5331,7 +5424,7 @@ msgstr "عرض التقارير حسب الدائرة"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5349,7 +5442,7 @@ msgstr "عرض مشكلة"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "دوائر هذا المجلس"
 
@@ -5419,7 +5512,7 @@ msgstr "عند الإرسال"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5439,7 +5532,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "هل تريد المساهمة في FixMyStreet؟ التعليمات البرمجية الخاصة بنا مفتوحة المصدر <a href=\"https://fixmystreet.org\">ومتاحة على fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "هل تريد المشاركة في استبيان آخر خلال 4 أسابيع فنذكرك بالتحقق من الحالة؟"
 
@@ -5451,7 +5544,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "كتابة الرسالة بالأحرف الكبيرة يجعل قراءتها صعبة، وكذلك الحال مع عدم الالتزام بقواعد الترقيم."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5462,12 +5554,12 @@ msgstr "كتابة الرسالة بالأحرف الكبيرة يجعل قرا
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "نعم"
 
@@ -5480,7 +5572,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr "إنك غير متصل"
 
@@ -5493,7 +5585,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "أنت تبلغ عن التحديث التالي بأنه يشتمل على إساءة أو يحتوي على معلومات شخصية أو شيء من هذا القبيل:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5502,7 +5594,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "يمكنك <a href=\"%s%s\">عرض المشكلة على هذا الموقع</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "يمكنك إضافة البريد الإلكتروني الخاصة بالمستخدم المسيء إلى قائمة المسيئين، وهي تخفي تلقائيًا (ولا ترسل مطلقًا) التقارير التي يقومون بإنشائها."
 
@@ -5535,7 +5627,7 @@ msgstr "يمكنك مساعدتنا في العثور على عنوان بريد
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "يمكنك وضع علامة الحذف على هيئة إذا كنت لا تريدها نشطة على الموقع."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5545,7 +5637,7 @@ msgid "You declined; please fill in the box above"
 msgstr "لقد رفضت؛ الرجاء تعبئة المربع بالأعلى"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5553,7 +5645,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "لقد أجبت عن هذا الاستبيان بالفعل. إذا كان لديك سؤال، فالرجاء <a href='%s'>التواصل معنا</a>، أو <a href='%s'>عرض المشكلة</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 #, fuzzy
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "لقد أرفقت صورًا بهذا التقرير من قبل. لاحظ أنه يمكنك إرفاق 3 صور كحد أقصى بهذا التقرير (إذا حاولت تحميل المزيد من الصور، فسيتم حذف الصور القديمة)."
@@ -5563,8 +5655,7 @@ msgstr "لقد أرفقت صورًا بهذا التقرير من قبل. لاح
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "لقد أرفقت صورًا بهذا التقرير من قبل. لاحظ أنه يمكنك إرفاق 3 صور كحد أقصى بهذا التقرير (إذا حاولت تحميل المزيد من الصور، فسيتم حذف الصور القديمة)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr "لقد أرفقت صورًا لهذا التحديث من قبل. لاحظ أنه يمكنك إرفاق 3 صور كحد أقصى بهذا التحديث (إذا  حاولت تحميل المزيد من الصور، فسيتم حذف أقدم صورة)."
 
@@ -5631,9 +5722,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "حسابك"
@@ -5642,13 +5733,14 @@ msgstr "حسابك"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5677,16 +5769,16 @@ msgstr "الاسم"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr "تم اخفاء اسمك"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5707,8 +5799,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr "الرجاء الدخولعبر البريد الإلكتروني بدلا عن ذلك، كما يرجى تقديم كلمة مرور جديدة عند هذه النقطة. بعد التأكيد، سيتم تحديث كلمة المرور."
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5741,7 +5833,7 @@ msgid "Your update"
 msgstr "تحديثك"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5772,19 +5864,19 @@ msgstr "مدير"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "الكل"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr "مدير"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5792,8 +5884,8 @@ msgstr ""
 msgid "by %s"
 msgstr "بواسطة %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "المجلس"
 
@@ -5824,6 +5916,10 @@ msgstr "تحرير المستخدم"
 msgid "from %s different users"
 msgstr "من %s من المستخدمين المختلفين"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5841,7 +5937,7 @@ msgstr "غير متاح"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr "بلا"
 
@@ -5924,12 +6020,12 @@ msgid "today"
 msgstr "اليوم"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr "تحديث"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr "تحديثات"
 
@@ -5954,7 +6050,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "الإدارة"
 
@@ -6046,7 +6142,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6079,7 +6175,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6112,7 +6208,7 @@ msgstr[3] "<big>%s</big> من التقارير التي تم حلها في ال
 msgstr[4] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي"
 msgstr[5] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
@@ -6123,7 +6219,7 @@ msgstr[3] "<big>%s</big> من التقارير في الأسبوع الماضي"
 msgstr[4] "<big>%s</big> من التقارير في الأسبوع الماضي"
 msgstr[5] "<big>%s</big> من التقارير في الأسبوع الماضي"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
@@ -6134,7 +6230,7 @@ msgstr[3] "<big>%s</big> من التقارير مؤخرًا"
 msgstr[4] "<big>%s</big> من التقارير مؤخرًا"
 msgstr[5] "<big>%s</big> من التقارير مؤخرًا"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6189,7 +6285,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
@@ -6200,7 +6296,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
@@ -6211,15 +6307,30 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "مغلق من الجهة المسئولة"
+
+#~ msgid "Current token:"
+#~ msgstr "الرمز الحالي:"
+
+#~ msgid "Filter report list"
+#~ msgstr "ترشيح قائمة البلاغات"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "قيمة agency_responsible غير صالحة %s"
+
+#~ msgid "Post"
+#~ msgstr "نشر"
+
+#~ msgid "Traffic management required?"
+#~ msgstr "هل يتطلب إدارة المرور؟"
+
 #~ msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 #~ msgstr "<strong>ملاحظة:</strong>  تم ارسال هذا التقرير للتطبيق. لن يتم ارسال اي تغييرات اخرى عليه."
 
 #~ msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 #~ msgstr "<strong>ملاحظة:</strong> لم  يتم ارسال هذا التقرير للتطبيق بعد. لن يتم ارسال اي تغييرات اخرى عليه."
 
-#~ msgid "Available categories"
-#~ msgstr "التصنيفات المتاحة"
-
 #~ msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent."
 #~ msgstr "تفقد <strong>مطلوب الفحص</strong> اذا كانت التقارير في الفئة <strong>تستوجب الفحص</strong> قبل الارسال"
 
diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po
index 8ade8d99e..21ff25697 100644
--- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/mysociety/teams/12067/bg_BG/)\n"
@@ -20,8 +20,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "и"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Обобщена справка"
 
@@ -111,7 +111,7 @@ msgstr "%s изпратени анкети &ndash; %s отговорени (%s%%
 msgid "%s ref:&nbsp;%s"
 msgstr "%s номер:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -157,6 +157,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(не е изпратен към общината)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(изпратен към двата района)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Изберете категория --"
@@ -202,17 +204,18 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -242,7 +245,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Да</strong> Имам парола"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -259,7 +262,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -282,7 +285,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Добавете контакт като използвате формата по-долу."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Добавяне на нова категория"
@@ -315,7 +318,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Добавяне на нова категория"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -324,8 +327,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -333,21 +336,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Добавете потребител"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -363,6 +365,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Отново:"
@@ -375,8 +383,8 @@ msgstr "Създадено известие %d за %s, тип %s, с парам
 msgid "Alert %d disabled (created %s)"
 msgstr "Известието %d е изключено (създадено на %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Известявай ме за бъдещи актуализиации"
 
@@ -388,10 +396,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Вички сигнали"
@@ -431,6 +441,11 @@ msgstr "Всички сигнали между%s и %s "
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Сигналът е подаден в категория %s "
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -467,7 +482,7 @@ msgstr "Анонимен"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -480,7 +495,7 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -489,8 +504,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -501,7 +516,7 @@ msgstr ""
 msgid "Area covered"
 msgstr "Територията е обхваната"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -515,27 +530,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr "Прехвърлен на %s"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Прехвърляне към друга категория:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Прехвърляне към външна община:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Прехвърляне към подразделение:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Прехвърлен на %s"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Прехвърлен на %s"
@@ -548,7 +568,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr "За момета можете само да търсите и преглеждате сигнали"
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -556,11 +576,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -572,12 +592,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Очакващ преглед"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Назад"
@@ -598,14 +619,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Райони"
 
@@ -618,11 +637,13 @@ msgstr "Райони"
 msgid "Body"
 msgstr "Район"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Район:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -634,8 +655,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Не виждате картата? <em>Пропуснете тази стъпка</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -651,15 +671,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -669,7 +687,7 @@ msgstr "Категория"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -692,6 +710,11 @@ msgstr "Категория:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Промяна на парола"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -708,7 +731,7 @@ msgstr "Промяна на парола"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -718,12 +741,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr "Изберете име на  <strong>категорията</strong>, което е смислено едновременно, както за гражданите, така и за общината. Категориите се появяват като списък за избор при подаване на сигнал. "
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -760,8 +783,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -771,11 +794,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Затворен"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Затворен от общината"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -808,13 +827,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Конфигурация"
@@ -931,7 +949,7 @@ msgstr "Подай сигнал"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Създай категория"
@@ -941,27 +959,25 @@ msgstr "Създай категория"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr ""
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Създаден"
@@ -970,6 +986,17 @@ msgstr "Създаден"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Създаден"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Създаден"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -981,10 +1008,6 @@ msgstr "Създадени:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -994,19 +1017,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "В момента няма създадени Райони."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Табло"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1018,7 +1043,7 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1028,7 +1053,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr ""
@@ -1050,9 +1075,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Описание"
 
@@ -1061,7 +1084,7 @@ msgstr "Описание"
 msgid "Destination"
 msgstr "Описание"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1097,7 +1120,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1105,6 +1128,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Сигналът е подаден в категория %s "
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Сигналът е подаден в категория %s "
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1139,24 +1172,24 @@ msgstr "Не знам"
 msgid "Don't like forms?"
 msgstr "Не обичате форми?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1172,7 +1205,7 @@ msgstr ""
 "(имейл адрес). Това означава, че можете да добавяте различни категории, \n"
 "дори и да имате само един контакт."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1184,7 +1217,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Редактиране"
@@ -1195,12 +1228,11 @@ msgstr "Редактиране"
 msgid "Edit body details"
 msgstr "Редактиране на информацията за района"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1208,17 +1240,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1255,8 +1285,9 @@ msgstr "Редактирано от"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1265,15 +1296,14 @@ msgstr "Редактирано от"
 msgid "Email"
 msgstr "Имейл"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1293,12 +1323,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Имейл:"
@@ -1361,12 +1392,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Въведете име на улица в близост до вас"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1393,10 +1424,10 @@ msgstr "Въведете информация за проблема"
 msgid "Error"
 msgstr "Грешка"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1409,7 +1440,7 @@ msgstr "Примерен пощенски адрес %s"
 msgid "Examples:"
 msgstr "Примери:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1418,7 +1449,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1443,7 +1474,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1455,20 +1486,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Допълнителни данни:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1501,20 +1532,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Филтриране на списъка със сигнали"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "За първи път"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Снимки  на скоро подадени сигнали"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Нови сигнали"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1544,7 +1580,7 @@ msgstr "Означен като \"изтрит\""
 msgid "Flag user"
 msgstr "Означаване на потребител"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Означен"
@@ -1553,7 +1589,7 @@ msgstr "Означен"
 msgid "Flagged reports and users"
 msgstr "Означени сигнали и потребители"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Означените потребители са изброени на страницата с <a href='%s'>означените</a>."
 
@@ -1561,8 +1597,8 @@ msgstr "Означените потребители са изброени на 
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Означените потребители нямат рестрикции. Това е списък с потребители, които са поставени под наблюдение."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Означен:"
 
@@ -1588,11 +1624,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Забравена парола?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1602,12 +1638,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Често задавани въпроси"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1629,7 +1673,7 @@ msgstr "Изтегляне на актуализациите на %s сигна
 msgid "Get updates of problems in this %s"
 msgstr "Изтегляне на актуализациите за сигналите в %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Изтегляне на RSS емисии"
 
@@ -1645,15 +1689,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1663,7 +1707,7 @@ msgstr "Търси"
 msgid "Going to send questionnaire?"
 msgstr "Ще изпратите ли анкетата?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1691,6 +1735,7 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1725,7 +1770,8 @@ msgstr "Скрити"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1753,7 +1799,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Скрий кабърчетата"
 
@@ -1807,11 +1853,9 @@ msgstr "Вашият сигнал не беше намерен.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "№"
 
@@ -1830,15 +1874,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1852,7 +1896,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1876,7 +1920,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1913,7 +1957,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1937,6 +1981,17 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "квартал"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1946,20 +2001,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1976,16 +2031,12 @@ msgstr "Вътрешни бележки"
 msgid "Internal notes"
 msgstr "Вътрешни бележки"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2037,13 +2088,13 @@ msgstr "Последно обновено:"
 msgid "Last&nbsp;update:"
 msgstr "Последно обновено:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2060,7 +2111,7 @@ msgstr "Показване на всички сигнали"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Зареждане..."
@@ -2098,17 +2149,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2126,19 +2178,20 @@ msgstr ""
 msgid "MAP"
 msgstr "Карта"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2152,24 +2205,24 @@ msgstr ""
 msgid "Mark as sent"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Маркирайте потребители, които бихте искали да държите под око."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Съобщение"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2182,7 +2235,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Липсващо jurisdiction_id"
 
@@ -2190,8 +2243,7 @@ msgstr "Липсващо jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2214,7 +2266,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2224,14 +2276,14 @@ msgstr ""
 msgid "Month"
 msgstr "Месец"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2259,9 +2311,10 @@ msgstr ""
 msgid "Name"
 msgstr "Име"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Име:"
@@ -2279,7 +2332,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -2287,12 +2340,12 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2315,7 +2368,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Районът е добавен"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Категорията е добавена"
 
@@ -2328,8 +2381,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr ""
 
@@ -2337,13 +2390,13 @@ msgstr ""
 msgid "New local problems on FixMyStreet"
 msgstr "Нов сигнал в ПоправиСофия"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2420,7 +2473,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2433,7 +2486,6 @@ msgstr "Слеващ"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2442,11 +2494,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Не"
 
@@ -2458,11 +2510,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Несъществуващ район"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Не е избрана община"
 
@@ -2478,8 +2531,8 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Няма повече актуализации"
 
@@ -2515,15 +2568,15 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2531,10 +2584,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Не съм подавал преди"
@@ -2582,12 +2639,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2595,12 +2652,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Стар статус"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2609,7 +2666,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2640,7 +2697,7 @@ msgstr ""
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2652,7 +2709,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2660,16 +2717,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2701,7 +2758,7 @@ msgstr "Страницата не е намерена"
 msgid "Parent"
 msgstr "Община"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Създай категория"
@@ -2710,13 +2767,13 @@ msgstr "Създай категория"
 msgid "Partial"
 msgstr "Частичен"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Парола (незадължително)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Паролата Ви беше променена успешно"
@@ -2731,7 +2788,7 @@ msgstr "Парола (незадължително)"
 msgid "Permissions"
 msgstr "Връзка"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2739,19 +2796,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Телефон:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Телефонен номер"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Телефонен номер (незадължително)"
 
@@ -2759,30 +2821,26 @@ msgstr "Телефонен номер (незадължително)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Телефон:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2802,9 +2860,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2813,7 +2870,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr "Снимки  на скоро подадени сигнали"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2827,6 +2884,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Поставете кабърче върху картата"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2854,27 +2916,26 @@ msgid "Please check your email address is correct"
 msgstr "Моля проверете дали сте въвели коректен имейл адрес"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Моля изберете категория"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2893,27 +2954,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Моля въведете съобщение"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2926,16 +2987,16 @@ msgstr "Моля въведете парола"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Моля въведете тема"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2946,20 +3007,20 @@ msgstr "Моля въведете валиден имейл"
 msgid "Please enter a valid email address"
 msgstr "Моля въведете валиден имейл адрес"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Моля въведете информация"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2975,7 +3036,7 @@ msgid "Please enter your first name"
 msgstr "Моля въведете име"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Моля въведете цялото си име, общината се нуждае от тази информация - ако не желаете името Ви да се появява на сайта, моля махнете отметката по-долу"
@@ -2987,9 +3048,9 @@ msgstr "Моля въведете име"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Моля въведете име"
@@ -3030,19 +3091,19 @@ msgstr "Моля попълнете формата с информация за
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Моля отбележете дали бихте искали да участвате в друга анкета"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Моля въведете валиден имейл адрес"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3069,24 +3130,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Забележка:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Моля въведете информация защо отваряте сигнала отново."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Моля въведете информация и приложете снимка."
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Моля отговорете дали някога сте подавали сигнал към общината преди."
 
@@ -3094,7 +3159,7 @@ msgstr "Моля отговорете дали някога сте подава
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3106,7 +3171,7 @@ msgstr "Моля изберете начин на известяване"
 msgid "Please select the type of alert you want"
 msgstr "Моля изберете тип известия, които бихте искали да получаваме"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Моля посочете дали проблемът е бил разрешен или не"
 
@@ -3114,12 +3179,12 @@ msgstr "Моля посочете дали проблемът е бил разр
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3127,27 +3192,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Моля въведете съобщение"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Публикувай"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Публикувано от анонимен потребител в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Публикувано от %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Публикувано от <strong>%s</strong> (%s) в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Публикувано от <strong>%s</strong> в %s"
 
@@ -3163,7 +3224,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3171,11 +3232,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Предишно"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3191,9 +3252,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Лично"
 
@@ -3242,7 +3303,7 @@ msgstr "Сигналът %s е подаден към общината %s "
 msgid "Problem breakdown by state"
 msgstr "Разделяне на сигналите по статуси"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Сигналът е маркиран като отворен."
 
@@ -3250,8 +3311,7 @@ msgstr "Сигналът е маркиран като отворен."
 msgid "Problem state change based on survey results"
 msgstr "Статусът на сигнала е променен на основата на резултат от анкета"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Сигнали"
@@ -3276,18 +3336,18 @@ msgstr "Проблеми сигнализирани скоро в сайта"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Сигнали в %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Сигнали в квартал %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3295,7 +3355,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3303,11 +3363,15 @@ msgstr ""
 msgid "Property address:"
 msgstr "Адрес на имота:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3321,11 +3385,11 @@ msgstr "Въведете иформация за актуализиране"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Използването на парола е по избор, но това ще ви позволи по-лесно да подавате сигнали и да публикувате и променяте актуализации."
 
@@ -3333,12 +3397,12 @@ msgstr "Използването на парола е по избор, но то
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Публичен отговор:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3381,11 +3445,11 @@ msgstr "Анкетата е попълнена от потребителя, по
 msgid "RSS feed"
 msgstr "RSS абонамент"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS абонамент за %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS абонамент за квартал %s, %s"
 
@@ -3393,11 +3457,11 @@ msgstr "RSS абонамент за квартал %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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS абонамент за %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS абонамент за %s, в квартал %s"
 
@@ -3405,13 +3469,13 @@ msgstr "RSS абонамент за %s, в квартал %s"
 msgid "RSS feed of nearby problems"
 msgstr "RSS абонамент за последни проблеми наоколо"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS абонамент за проблеми в %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS абонамент за проблеми в квартал %s"
 
@@ -3425,11 +3489,11 @@ msgstr "RSS абонамент за последни проблеми наоко
 msgid "RSS feed of updates to this problem"
 msgstr "RSS абонамент за актуализации по този проблем"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3442,7 +3506,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Получаване на имейл при актуализация на проблема."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3456,7 +3520,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Наскоро добавени сигнали"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3469,7 +3533,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Помнете, че \"ПоправиСофия\" служи за подаване на сигнали за физически проблеми, които могат да бъдат поправени. Ако Вашият проблем не спада към никоя от категориите, посочени в сайта, моля обърнете се директно към Общината."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3481,8 +3546,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Премахване на означението"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3497,17 +3562,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Премахване на снимката (необратимо действие)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3515,14 +3584,14 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3531,7 +3600,7 @@ msgid "Report a problem"
 msgstr "Подайте сигнал"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3547,7 +3616,7 @@ msgid "Report anonymously"
 msgstr "Публикувано от анонимен потребител в %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3583,7 +3652,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Сигнализирай, разгледай или коментирай проблеми"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -3594,7 +3663,7 @@ msgstr ""
 msgid "Reported before"
 msgstr "Подавал съм и преди"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr ""
@@ -3608,27 +3677,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Сигналът е подаден в категория %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Сигналът е подаден анонимно в категория %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Сигналът е подаден в категория %s от %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Сигналът е подаден анонимно чрез %s в категория %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Сигналът е подаден чрез %s в категория %s от %s в %s"
 
@@ -3647,17 +3716,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr "Сигнализиране за проблем"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Сигнали"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3685,15 +3752,15 @@ msgid "Reports published"
 msgstr "Публикувани сигнали"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3706,7 +3773,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3759,39 +3826,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "Правилното място ли е това?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Завъртане наляво"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3807,20 +3880,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3837,13 +3910,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Търсене на Сигнали"
 
@@ -3856,7 +3928,7 @@ msgstr "Търсене на Потребители"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Търсене на сигнали"
 
@@ -3871,12 +3943,12 @@ msgstr "Търсене:"
 msgid "Searching found no reports."
 msgstr "Не са намерени сигнали."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Не са намерени потребители."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3886,8 +3958,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3897,7 +3968,7 @@ msgid "Select a body"
 msgstr "Изберете район"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Изберете територия"
@@ -3918,7 +3989,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3931,7 +4002,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3940,11 +4011,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Сигналът е подаден към %s преди %s"
 
@@ -3982,7 +4053,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3993,7 +4064,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4018,8 +4089,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4030,7 +4101,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Покажи кабърчетата"
 
@@ -4090,7 +4161,7 @@ msgid "Some photos of recent reports"
 msgstr "Някои снимки от сигнали подадени наскоро"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4099,12 +4170,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4122,9 +4192,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -4134,13 +4204,13 @@ msgstr ""
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4154,11 +4224,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4167,11 +4237,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4195,18 +4265,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4215,31 +4285,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Статус"
 
@@ -4257,7 +4324,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4276,50 +4343,48 @@ msgstr "Тема:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Изпращане"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Изпращане на промените"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Изпращане на анкетата"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Сигналът е потвърден"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Абониране"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4331,7 +4396,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4345,20 +4410,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Обобщение"
 
@@ -4369,14 +4433,19 @@ msgstr "Обобщена справка"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4394,13 +4463,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Текст"
@@ -4421,6 +4494,11 @@ msgstr "Версия само с текст"
 msgid "Text:"
 msgstr "Текст:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Текст"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4450,7 +4528,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Благодаря! Радваме се, че този проблем е бил разрешен! Бихме искли да Ви питаме подавали ли сте сигнали към общината и преди?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4462,27 +4540,29 @@ msgstr "Прикачването на изображение е неуспешн
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "В момента за това местоположение не може да се подаде сигнал; може би все още нямаме потвърждение от общината. Моля опитайте отново по-късно."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Моля да ни извините, този пощенски код не беше разпознат."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Сигналът ще бъде препратен."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Този сигнал е бил изтрит от ПоправиСофия."
 
@@ -4528,8 +4608,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4583,7 +4663,7 @@ msgstr "Грешката беше: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4645,8 +4725,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4681,7 +4761,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4699,12 +4779,12 @@ msgstr "Възникна проблем при визуализирането н
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Възникна проблем с вашата актуализация. Моля опитайте отново."
 
@@ -4712,7 +4792,7 @@ msgstr "Възникна проблем с вашата актуализация
 msgid "There were problems with your report. Please see below."
 msgstr "Възникна проблем с вашая сигнал. Моля опитайте отново."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Възникнаха проблеми с вашата актуализация. Моля вижте по-долу."
 
@@ -4788,10 +4868,10 @@ msgstr "Този имейл е изпратен към двете общини 
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr "Този имейл е изпратен до няколко общини покриващи адреса на сигнала, тъй като категорията на сигнала съвпада с всички тях. Моля не го взимайте под внимание ако не сте правилната община задължена за този тип проблеми."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Тази информация е необходима"
 
@@ -4808,19 +4888,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Този проблем е решен."
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Този проблем не е решен."
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4833,26 +4917,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Този сигнал е означен със статус затворен."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Този сигнал е означен със статус поправен."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Този сигнал е означен със статус отворен."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4860,15 +4944,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Тази страница съдържа и снимка, изпратена от нашия потребител."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4892,6 +4979,10 @@ msgstr "Заглавие"
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4917,7 +5008,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "За да видите точното местоположение на проблема върху картата"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4942,11 +5033,6 @@ msgstr ""
 msgid "Total"
 msgstr "Общо"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4969,16 +5055,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4988,7 +5074,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5018,10 +5104,10 @@ msgstr "Непозната грешка"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5033,13 +5119,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Актуализация"
 
@@ -5090,29 +5176,27 @@ msgstr "Актуализация на възобновен сигнал"
 msgid "Update statuses"
 msgstr "Актуализация  на статусите"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Актуализирано!"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Актуализирано!"
 
@@ -5123,7 +5207,7 @@ msgstr "Актуализирано!"
 msgid "Updates"
 msgstr "Актуализации"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5153,6 +5237,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5166,8 +5258,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5185,7 +5277,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5198,27 +5290,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Потребители"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5226,9 +5316,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Актуализиране на стойностите"
 
@@ -5254,7 +5344,7 @@ msgstr ""
 msgid "View report on site"
 msgstr ""
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Разглеждане на сигналите по квартали"
 
@@ -5262,7 +5352,7 @@ msgstr "Разглеждане на сигналите по квартали"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5280,7 +5370,7 @@ msgstr "Преглед на сигнал"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -5350,7 +5440,7 @@ msgstr "Изпратен"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5370,7 +5460,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Бихте ли искали да получите още една анкета след 4 седмици, за да ви напомни да проверите статуса?"
 
@@ -5382,7 +5472,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Моля пишете на кирилица! Писането само с главни букви и без препинателни знаци, прави съобщението трудно за разчитане."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5393,12 +5482,12 @@ msgstr "Моля пишете на кирилица! Писането само 
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Да"
 
@@ -5411,7 +5500,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5424,7 +5513,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5433,7 +5522,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Можете да <a href=\"%s%s\">разгледате сигнала на този сайт</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5463,7 +5552,7 @@ msgstr "Можете да ни помогнете да намерим имейл
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Можете да маркирате района или общината за изтриване, ако не желаете да бъде активна за този сайт."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5473,7 +5562,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Вие отказахте; моля попълнете полето по-долу."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5481,7 +5570,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Вече сте попълнили тази анкета. Ако имате въпрос, моля <a href='%s'>свържете се с нас</a>, или <a href='%s'>прегледайте сигнала</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5490,8 +5579,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5558,9 +5646,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5569,13 +5657,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5604,16 +5693,16 @@ msgstr "Име"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5633,8 +5722,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5667,7 +5756,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5698,19 +5787,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5718,8 +5807,8 @@ msgstr ""
 msgid "by %s"
 msgstr "от %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "община"
 
@@ -5750,6 +5839,10 @@ msgstr "редакция на потребителя"
 msgid "from %s different users"
 msgstr "от %s различни потребители"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5767,7 +5860,7 @@ msgstr "няма информация"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5850,12 +5943,12 @@ msgid "today"
 msgstr "днес"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5880,7 +5973,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "квартал"
 
@@ -5940,7 +6033,7 @@ msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5961,7 +6054,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5982,21 +6075,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big>поправени през изминалия месец"
 msgstr[1] "<big>%s</big>поправени през изминалия месец"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big>сигнал за изминалата седмица"
 msgstr[1] "<big>%s</big>сигнали за изминалата седмица"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> подаден наскоро"
 msgstr[1] "<big>%s</big> подадени наскоро"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6031,20 +6124,29 @@ msgid_plural "last updated %d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Затворен от общината"
+
+#~ msgid "Filter report list"
+#~ msgstr "Филтриране на списъка със сигнали"
+
+#~ msgid "Post"
+#~ msgstr "Публикувай"
+
 #~ msgid ""
 #~ "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
 #~ "                <br>\n"
diff --git a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po
index 54bd060ca..ce53c184b 100644
--- a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: Eduard Molist Gallifa <edumolist@gmail.com>, 2019\n"
 "Language-Team: Catalan (Spain) (https://www.transifex.com/mysociety/teams/12067/ca_ES/)\n"
@@ -21,8 +21,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "i"
@@ -57,7 +57,7 @@ msgstr "%d usuaris ja existeixen"
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Resum de notificacions"
 
@@ -118,7 +118,7 @@ msgstr "%s preguntes enviades &ndash; %s respostes (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; Col·laboradors d'<a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>"
 
@@ -164,6 +164,8 @@ msgstr "(ja no existeix)"
 msgid "(not sent to council)"
 msgstr "(no enviat a l'ajuntament)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -182,8 +184,8 @@ msgstr "(enviat als dos)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr "(també tenim canals RSS per incidències sobre %s)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Tria una categoria --"
@@ -212,17 +214,18 @@ msgstr ""
 "              Pots afegir algunes <code>MAPIT_TYPES</code> en el fitxer de configuració?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr "<h2>Notificacions, estadístiques i accions per</h2> <h1>%s</h1>"
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Mostra</label> %s notificacions <label for=\"filter_categories\">sobre</label> %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> desat."
 
@@ -252,7 +255,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Sí </strong> Tinc una contrasenya"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -269,7 +272,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -289,7 +292,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Afegeix un contacte utilitzant el formulari següent."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Afegeix una nova categoria"
@@ -322,7 +325,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Afegeix una nova categoria"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -331,8 +334,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -340,21 +343,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Afegeix un usuari"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Afegeix/edita categories d'incidències"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Afegeix/edita prioritats de resposta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Afegeix/edita plantilles de resposta"
 
@@ -370,6 +372,12 @@ msgstr ""
 msgid "Admin"
 msgstr "Admin"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr ""
@@ -382,8 +390,8 @@ msgstr ""
 msgid "Alert %d disabled (created %s)"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Avisa'm de futures actualitzacions"
 
@@ -395,10 +403,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Tot"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Totes les notificacions"
@@ -438,6 +448,11 @@ msgstr "Tots els informes entre %s i %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Oculta el meu nom en aquesta actualització"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -474,7 +489,7 @@ msgstr "Anònim"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -487,7 +502,7 @@ msgid "Another user"
 msgstr "Un altre usuari"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Estàs segur de voler cancel·lar aquesta càrrega?"
 
@@ -496,8 +511,8 @@ msgstr "Estàs segur de voler cancel·lar aquesta càrrega?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Estàs segur?"
@@ -508,7 +523,7 @@ msgstr "Estàs segur?"
 msgid "Area covered"
 msgstr "Àrea coberta"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Àrea:"
 
@@ -522,27 +537,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr "Assigna usuaris a àreas"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Assigna a una àrea competent:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Assigna a una categoria diferent:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Assigna a una àrea externa:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Assigna a subdivisió:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "Assigna usuaris a àreas"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Categories disponibles"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Assignat a %s"
@@ -555,7 +575,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -563,11 +583,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Resposta automática:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -579,12 +599,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Esperant moderació"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Torna"
@@ -605,14 +626,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Àrees"
 
@@ -625,11 +644,13 @@ msgstr "Àrees"
 msgid "Body"
 msgstr "Àrea"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Àrea:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -641,8 +662,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "No pots veure el mapa? <em>Salta aquest pas</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -658,15 +678,13 @@ msgstr "Categories:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -676,7 +694,7 @@ msgstr "Categoria"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Categoria canviada de ‘%s’ a ‘%s’"
 
@@ -699,6 +717,11 @@ msgstr "Categoria:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Canvia la contrasenya"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -715,7 +738,7 @@ msgstr "Canvia la contrasenya"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -725,12 +748,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr "Escull un altre"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr "Neteja les dades fora de línia"
 
@@ -767,8 +790,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -778,11 +801,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Tancat"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Tancat per l'ajuntament"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -815,13 +834,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Configuració"
@@ -938,7 +956,7 @@ msgstr "Crea un informe"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Crea una categoria"
@@ -948,27 +966,25 @@ msgstr "Crea una categoria"
 msgid "Create priority"
 msgstr "Crea una prioritat"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Crea una plantilla"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Creat"
@@ -977,6 +993,17 @@ msgstr "Creat"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Creat"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Creat"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -988,10 +1015,6 @@ msgstr "Creat:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -1001,19 +1024,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1025,7 +1050,7 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1035,7 +1060,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Elimina plantilla"
@@ -1057,9 +1082,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Descripció"
 
@@ -1068,7 +1091,7 @@ msgstr "Descripció"
 msgid "Destination"
 msgstr "Descripció"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1104,7 +1127,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1112,6 +1135,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Oculta el meu nom en aquesta actualització"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Oculta el meu nom en aquesta actualització"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1146,24 +1179,24 @@ msgstr ""
 msgid "Don't like forms?"
 msgstr "No t'agraden els formularis?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr "Duplicat de"
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr "Duplicats"
 
@@ -1175,7 +1208,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1187,7 +1220,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Edita"
@@ -1198,12 +1231,11 @@ msgstr "Edita"
 msgid "Edit body details"
 msgstr "Edita els detalls de l'àrea"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Edita la categoria d'informes"
 
@@ -1211,17 +1243,15 @@ msgstr "Edita la categoria d'informes"
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Edita la prioritat d'informes"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Edita els informes"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1258,8 +1288,9 @@ msgstr "Editor"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1268,15 +1299,14 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Adreça de correu electrònic"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1296,12 +1326,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "Correu electrònic verificat:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Correu electrònic:"
@@ -1364,11 +1395,11 @@ msgstr "Data final"
 msgid "Endpoint"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1395,10 +1426,10 @@ msgstr "Entra els detalls de la incidència"
 msgid "Error"
 msgstr "Error"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Tot"
 
@@ -1411,7 +1442,7 @@ msgstr "Exemple de codi postal %s"
 msgid "Examples:"
 msgstr "Exemples:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Categoria existent"
 
@@ -1420,7 +1451,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1445,7 +1476,7 @@ msgid "External body"
 msgstr "Àrea externa"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1457,20 +1488,20 @@ msgstr ""
 msgid "External team"
 msgstr "Equip extern"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Data extra:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1503,20 +1534,24 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr ""
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+msgid "Five most recent commented reports"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nous informes"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1546,7 +1581,7 @@ msgstr "Marca com esborrat"
 msgid "Flag user"
 msgstr "Marca l'usuari"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Marcat"
@@ -1555,7 +1590,7 @@ msgstr "Marcat"
 msgid "Flagged reports and users"
 msgstr "Informes i usuaris marcats"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1563,8 +1598,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Marcat:"
 
@@ -1590,11 +1625,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Has oblidat la teva contrasenya?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Suggeriment enviat a l'àrea externa"
 
@@ -1604,12 +1639,20 @@ msgstr "Suggeriment enviat a l'àrea externa"
 msgid "Frequently Asked Questions"
 msgstr "Preguntes mes freqüents (FAQ)"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1631,7 +1674,7 @@ msgstr "Obté actualitzacions de %s problemes"
 msgid "Get updates of problems in this %s"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr ""
 
@@ -1647,15 +1690,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1665,7 +1708,7 @@ msgstr "Ves"
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1691,6 +1734,7 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1725,7 +1769,8 @@ msgstr "Ocultat"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1753,7 +1798,7 @@ msgstr "Oculta el meu nom en aquest informe"
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr ""
 
@@ -1807,11 +1852,9 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1830,15 +1873,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1852,7 +1895,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1876,7 +1919,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1913,7 +1956,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1937,6 +1980,16 @@ msgstr "En taula d'abús?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+msgid "In wards"
+msgstr ""
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1946,20 +1999,20 @@ msgstr "Inactiu"
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1976,16 +2029,12 @@ msgstr "Notes internes"
 msgid "Internal notes"
 msgstr "Notes internes"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2037,13 +2086,13 @@ msgstr "Última actualització:"
 msgid "Last&nbsp;update:"
 msgstr "Última&nbsp;actualització:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Latitut/Longitut:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2060,7 +2109,7 @@ msgstr "Mostra totes les incidències notificades"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Carregant..."
@@ -2098,17 +2147,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2126,19 +2176,20 @@ msgstr ""
 msgid "MAP"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2152,24 +2203,24 @@ msgstr "Mapa"
 msgid "Mark as sent"
 msgstr "Marca com enviat"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Missatge"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Missatge al cos competent:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Missatge al cos extern:"
 
@@ -2182,7 +2233,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -2190,8 +2241,7 @@ msgstr ""
 msgid "Moderate"
 msgstr "Modera"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Modera detalls de l'informe"
 
@@ -2214,7 +2264,7 @@ msgstr "Moderat per %s a %s"
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2224,14 +2274,14 @@ msgstr ""
 msgid "Month"
 msgstr "Mes"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Més comentat"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2259,9 +2309,10 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Nom:"
@@ -2279,7 +2330,7 @@ msgstr "Navega a aquest problema"
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -2287,12 +2338,12 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2315,7 +2366,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Nou cos afegit"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Nova categoria de contacte afegida"
 
@@ -2328,8 +2379,8 @@ msgstr "Nova adreça de correu electrònic:"
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nova nota interna:"
 
@@ -2337,13 +2388,13 @@ msgstr "Nova nota interna:"
 msgid "New local problems on FixMyStreet"
 msgstr "Noves incidències locals a FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Nova contrasenya:"
 
@@ -2420,7 +2471,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "El més nou"
@@ -2433,7 +2484,6 @@ msgstr "Següent"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2442,11 +2492,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "No"
 
@@ -2458,11 +2508,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Sense cos"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr ""
 
@@ -2478,8 +2529,8 @@ msgstr "No s'han trobat problemes marcats."
 msgid "No flagged users found."
 msgstr "No s'han trobat usuaris marcats."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr ""
 
@@ -2515,15 +2566,15 @@ msgstr "Sense seguidors"
 msgid "None"
 msgstr "Cap"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2531,10 +2582,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr ""
@@ -2582,12 +2637,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2595,12 +2650,12 @@ msgstr ""
 msgid "Old state"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2609,7 +2664,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2640,7 +2695,7 @@ msgstr ""
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2652,7 +2707,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2660,16 +2715,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2701,7 +2756,7 @@ msgstr ""
 msgid "Parent"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Totes les categories"
@@ -2710,13 +2765,13 @@ msgstr "Totes les categories"
 msgid "Partial"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
 msgstr ""
 
@@ -2728,7 +2783,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2736,19 +2791,23 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+msgid "Phone"
+msgstr ""
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr ""
 
@@ -2756,30 +2815,26 @@ msgstr ""
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr ""
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2799,9 +2854,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2810,7 +2864,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2824,6 +2878,10 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+msgid "Pin map"
+msgstr ""
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2851,27 +2909,26 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2890,27 +2947,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2923,16 +2980,16 @@ msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2943,20 +3000,20 @@ msgstr ""
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2972,7 +3029,7 @@ msgid "Please enter your first name"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr ""
@@ -2983,9 +3040,9 @@ msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr ""
@@ -3026,18 +3083,18 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 msgid "Please make sure you are not including an email address"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3064,24 +3121,28 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -3089,7 +3150,7 @@ msgstr ""
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3101,7 +3162,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -3109,12 +3170,12 @@ msgstr ""
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3122,27 +3183,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr ""
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr ""
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -3158,7 +3215,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3166,11 +3223,11 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3186,9 +3243,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr ""
 
@@ -3234,7 +3291,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr ""
 
@@ -3242,8 +3299,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr ""
@@ -3268,18 +3324,18 @@ msgstr ""
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3287,7 +3343,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3295,11 +3351,15 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3313,11 +3373,11 @@ msgstr ""
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr ""
 
@@ -3325,12 +3385,12 @@ msgstr ""
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3372,11 +3432,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -3384,11 +3444,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -3396,13 +3456,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -3416,11 +3476,11 @@ msgstr ""
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3433,7 +3493,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3447,7 +3507,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3460,7 +3520,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3472,8 +3533,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3488,17 +3549,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3506,14 +3571,14 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3522,7 +3587,7 @@ msgid "Report a problem"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3537,7 +3602,7 @@ msgid "Report anonymously"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3573,7 +3638,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -3584,7 +3649,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr ""
@@ -3598,27 +3663,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -3637,17 +3702,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3675,15 +3738,15 @@ msgid "Reports published"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3696,7 +3759,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3749,39 +3812,45 @@ msgstr ""
 msgid "Right place?"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3797,20 +3866,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3827,13 +3896,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr ""
 
@@ -3846,7 +3914,7 @@ msgstr ""
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr ""
 
@@ -3861,12 +3929,12 @@ msgstr ""
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3876,8 +3944,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3887,7 +3954,7 @@ msgid "Select a body"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr ""
@@ -3908,7 +3975,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3921,7 +3988,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3930,11 +3997,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3972,7 +4039,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3983,7 +4050,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4008,8 +4075,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4020,7 +4087,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr ""
 
@@ -4080,7 +4147,7 @@ msgid "Some photos of recent reports"
 msgstr ""
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4089,12 +4156,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4112,9 +4178,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -4124,13 +4190,13 @@ msgstr ""
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4144,11 +4210,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4157,11 +4223,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4185,18 +4251,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4205,31 +4271,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr ""
 
@@ -4247,7 +4310,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4266,50 +4329,48 @@ msgstr ""
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4321,7 +4382,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4335,20 +4396,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr ""
 
@@ -4359,14 +4419,19 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4384,13 +4449,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr ""
@@ -4411,6 +4480,10 @@ msgstr ""
 msgid "Text:"
 msgstr ""
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+msgid "Textarea"
+msgstr ""
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4440,7 +4513,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4452,27 +4525,29 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
@@ -4518,8 +4593,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4573,7 +4648,7 @@ msgstr ""
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4635,8 +4710,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4669,7 +4744,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4687,12 +4762,12 @@ msgstr ""
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -4700,7 +4775,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -4776,10 +4851,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr ""
 
@@ -4796,19 +4871,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4821,26 +4900,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4848,15 +4927,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4880,6 +4962,10 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4905,7 +4991,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4930,11 +5016,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4957,16 +5038,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4976,7 +5057,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5006,10 +5087,10 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5021,13 +5102,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr ""
 
@@ -5078,29 +5159,27 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr ""
 
@@ -5111,7 +5190,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5141,6 +5220,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5154,8 +5241,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5173,7 +5260,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5186,27 +5273,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5214,9 +5299,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr ""
 
@@ -5242,7 +5327,7 @@ msgstr ""
 msgid "View report on site"
 msgstr ""
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5250,7 +5335,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5268,7 +5353,7 @@ msgstr ""
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -5338,7 +5423,7 @@ msgstr ""
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5358,7 +5443,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr ""
 
@@ -5370,7 +5455,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5381,12 +5465,12 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr ""
 
@@ -5399,7 +5483,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5412,7 +5496,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5421,7 +5505,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5451,7 +5535,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5461,7 +5545,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5469,7 +5553,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5478,8 +5562,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5543,9 +5626,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5554,13 +5637,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5589,16 +5673,16 @@ msgstr ""
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5618,8 +5702,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5652,7 +5736,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5683,19 +5767,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5703,8 +5787,8 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr ""
 
@@ -5735,6 +5819,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5752,7 +5840,7 @@ msgstr "n/a"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5834,12 +5922,12 @@ msgid "today"
 msgstr "avui"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5864,7 +5952,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr ""
 
@@ -5924,7 +6012,7 @@ msgid_plural "%d years"
 msgstr[0] "%d anys"
 msgstr[1] "%d anys"
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5945,7 +6033,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5966,21 +6054,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6015,28 +6103,28 @@ msgid_plural "last updated %d days ago"
 msgstr[0] "última actualització fa %d dies "
 msgstr[1] "última actualització fa %d dies"
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mesos"
 msgstr[1] "mesos"
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Tancat per l'ajuntament"
+
 #~ msgid "(ignored if type is \"String\")"
 #~ msgstr "(ignorat si el tipus és \"Cadena\")"
 
 #~ msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 #~ msgstr "<strong>Avís:</strong> Aquesta notificació s'ha enviat per resoldre-la. Els canvis realitzats no es transmetran."
 
-#~ msgid "Available categories"
-#~ msgstr "Categories disponibles"
-
 #~ msgid "Description:"
 #~ msgstr "Descripció:"
diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po
index 45031332d..9b4cb7434 100644
--- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/mysociety/teams/12067/cs_CZ/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " a "
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s -Souhrnné reporty"
 
@@ -111,7 +111,7 @@ msgstr "%s dotazníky zaslány -%s odpovědělo (%s %%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref: %s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -157,6 +157,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(není odesláno na úřad)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(odesláno dvoum??)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Vyberte kategorii --"
@@ -205,17 +207,18 @@ msgstr ""
 "             Asi upravte <code>MAPIT_TYPES</code> ve vašem konfiguračním souboru."
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -245,7 +248,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ano</strong>  Mám heslo"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -262,7 +265,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -285,7 +288,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Přidejte kontakt pomocí formuláře níže."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Přidat novou kategorii"
@@ -318,7 +321,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Přidat novou kategorii"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -327,8 +330,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -336,21 +339,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Přidat Uživatele"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -366,6 +368,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Opětovně:"
@@ -378,8 +386,8 @@ msgstr "Upozornění %d vytvořené pro %s, typu %s, parametry %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Upozornění %d zrušeno (vytvořeno %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Upozorněte mě na budoucí aktualizace"
 
@@ -391,10 +399,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Všechna hlášení"
@@ -434,6 +444,11 @@ msgstr "Všechna hlášení od  %s do  %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Nahlášeno v kategorii  %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -470,7 +485,7 @@ msgstr "Anonimní"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -483,7 +498,7 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -492,8 +507,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -504,7 +519,7 @@ msgstr ""
 msgid "Area covered"
 msgstr "Oblast pokrytí"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -518,27 +533,32 @@ msgstr "Vzhledem k tomu, že je ve stavu 'staging site' a  %s je 'nepravda', bud
 msgid "Assign selected to role:"
 msgstr "Přířazeno: %s"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Přiřaďte jinou kategorii:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Přiřaďte externí instituci:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Přiřaďte oddělení:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Přířazeno: %s"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Přířazeno: %s"
@@ -551,7 +571,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr "V současné době funguje pouze vyhledávání a prohlížení nahlášených problémů."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -559,11 +579,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -575,12 +595,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Čeká se na moderování"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Zpět"
@@ -601,14 +622,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Subjekty"
 
@@ -621,11 +640,13 @@ msgstr "Subjekty"
 msgid "Body"
 msgstr "Subjekt"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Subjekt:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -637,8 +658,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Nevidíte mapu? <em>vynechte tento krok</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -654,15 +674,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -672,7 +690,7 @@ msgstr "Katetorie"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -695,6 +713,11 @@ msgstr "Kategorie:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Změnit heslo"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -711,7 +734,7 @@ msgstr "Změnit heslo"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -723,12 +746,12 @@ msgstr ""
 "Jméno <strong> kategorie </strong> zvolte tak, aby dávalo smysl pro veřejnost (např, \"Díra v silnici \",  \"Pouliční osvětlení \"), ale je užitečné \n"
 "                   i pro daný úřad. Názvy kategorií se objeví v rozbalovací nabídce na stránce Nahlásit problém."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -765,8 +788,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -776,11 +799,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Uzavřena"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Uzavřena úřadem"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -813,13 +832,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Nastavení"
@@ -936,7 +954,7 @@ msgstr "Vytvořit report"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Vytvořit kategorii"
@@ -946,27 +964,25 @@ msgstr "Vytvořit kategorii"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr ""
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Vytvořeno"
@@ -975,6 +991,17 @@ msgstr "Vytvořeno"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Vytvořeno"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Vytvořeno"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -986,10 +1013,6 @@ msgstr "Vytvořeno:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -999,19 +1022,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "Doposud nebyl vytvořen žádný subjekt."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Přehledy"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1023,7 +1048,7 @@ msgstr "Odbavované úřadem  do 5 pracovních dnů"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1033,7 +1058,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr ""
@@ -1055,9 +1080,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Popis"
 
@@ -1066,7 +1089,7 @@ msgstr "Popis"
 msgid "Destination"
 msgstr "Popis"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1102,7 +1125,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1110,6 +1133,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Nahlášeno v kategorii  %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Nahlášeno v kategorii  %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1144,24 +1177,24 @@ msgstr "Není známo"
 msgid "Don't like forms?"
 msgstr "Nechcete řešit formulářem?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1173,7 +1206,7 @@ msgid ""
 "    "
 msgstr "Každému  kontaktu daného subjektu můžeme přidělit kategorii, která je zobrazena veřejně. Různé kategorie mohou mít společný kontakt (e-mail). To znamená, že můžete přidat mnoho kategorií, i když máte jen jednu kontaktní osobu pro daný subjekt."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1185,7 +1218,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Upravit"
@@ -1196,12 +1229,11 @@ msgstr "Upravit"
 msgid "Edit body details"
 msgstr "Editace podrobností subjektu"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1209,17 +1241,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1256,8 +1286,9 @@ msgstr "Úprava"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1266,15 +1297,14 @@ msgstr "Úprava"
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1294,12 +1324,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "E-mail:"
@@ -1362,12 +1393,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Endpoint"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Zadejte název ulice"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Zadejte nejbližší PSČ, název ulice nebo oblasti"
 
@@ -1394,10 +1425,10 @@ msgstr "Uveďte podrobnosti daného problému"
 msgid "Error"
 msgstr "Chyba"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1410,7 +1441,7 @@ msgstr "Příklad PSČ  %s"
 msgid "Examples:"
 msgstr "Příklady:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1419,7 +1450,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1444,7 +1475,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1456,20 +1487,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Doplňující data:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1502,20 +1533,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filtrovat seznam hlášení"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Poprvé"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Fotografie nedávných okolních hlášení"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nová hlášení"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Pro opravu vyberte <strong>oblast pokrytí</strong> v části <em>Editace podrobností subjektu</em> ve formuláři níže."
@@ -1545,7 +1581,7 @@ msgstr "Označené za smazané"
 msgid "Flag user"
 msgstr "Sledovat uživatele"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Určeno ke sledování"
@@ -1554,7 +1590,7 @@ msgstr "Určeno ke sledování"
 msgid "Flagged reports and users"
 msgstr "Sledovaná hlášení a sledovaní uživatelé"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Takto označení uživatelé jsou v seznamu na této <a href='%s'>stránce</a>."
 
@@ -1562,8 +1598,8 @@ msgstr "Takto označení uživatelé jsou v seznamu na této <a href='%s'>strán
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Označení uživatelé nejsou žádným způsobem omezováni. Je to jen seznam uživatelů, kteří byli označeni k Vaší pozornosti."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Sledováno:"
 
@@ -1589,11 +1625,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Zapomněli jste své heslo?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1603,12 +1639,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Často kladené dotazy"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1630,7 +1674,7 @@ msgstr "Získat aktualizace hlášení  %s "
 msgid "Get updates of problems in this %s"
 msgstr "Získat aktualizace hlášení %s "
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Přihlásit se k odběru RSS kanálu"
 
@@ -1646,15 +1690,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1664,7 +1708,7 @@ msgstr "OK"
 msgid "Going to send questionnaire?"
 msgstr "Odeslat dotazník?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1690,6 +1734,7 @@ msgstr "Už jste někdy před tím  hlásili problém úřadu a nebo je toto Va
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1724,7 +1769,8 @@ msgstr "Skrytý"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1752,7 +1798,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Schovat značky"
 
@@ -1806,11 +1852,9 @@ msgstr "Bohužel, nelze lokalizovat Vaše hlášení v databázi.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1831,15 +1875,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1855,7 +1899,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1879,7 +1923,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1916,7 +1960,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1940,6 +1984,17 @@ msgstr "V tabulce zneužívání?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "Kromě toho, tyto atributy, které nejsou součástí specifikace Open311 v2 jsou vráceny: agency_sent_datetime název (také vrácený jako součást popisu), interface_used, comment_count, requestor_name (přítomný pouze tehdy, pokud žadatel povolen název, který bude zobrazen na této stránce) ,"
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "okrsek"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1949,20 +2004,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Zahrnuty osobní údaje hlasatele problému"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Chybná  has_photo hodnota \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1979,16 +2034,12 @@ msgstr "Interní poznámky"
 msgid "Internal notes"
 msgstr "Interní poznámky"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Chybná agency_responsible hodnota %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Chybný formát %s specified."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2040,13 +2091,13 @@ msgstr "Poslední úpravy:"
 msgid "Last&nbsp;update:"
 msgstr "Poslední úpravy:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2063,7 +2114,7 @@ msgstr "Seznam všech hlášení"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Nahrávání..."
@@ -2101,17 +2152,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2129,19 +2181,20 @@ msgstr ""
 msgid "MAP"
 msgstr "MAPA"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2155,24 +2208,24 @@ msgstr "Mapa"
 msgid "Mark as sent"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Označte uživatele, jejichž chování chcete sledovat a označte je <strong>příznakem</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Zpráva"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2185,7 +2238,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Chybějící jurisdiction_id"
 
@@ -2193,8 +2246,7 @@ msgstr "Chybějící jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2217,7 +2269,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "Moderováno oddělením během jednoho pracovního dne"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2227,14 +2279,14 @@ msgstr ""
 msgid "Month"
 msgstr "Měsíc"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2262,9 +2314,10 @@ msgstr ""
 msgid "Name"
 msgstr "Jméno"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Jméno:"
@@ -2282,7 +2335,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Nejbližší pojmenovaná ulice k umístěné značce na mapě (automaticky generováno pomocí OpenStreetMap): %s%s"
 
@@ -2290,12 +2343,12 @@ msgstr "Nejbližší pojmenovaná ulice k umístěné značce na mapě (automati
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Nejbližší PSČ k umístěné značce na mapě (automaticky generováno) %s (%sm away)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Nejbližší cesta k umístěné značce na mapě (automaticky generováno pomocí Bing Mapy): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2320,7 +2373,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Přidán nový subjekt"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Do kategorie byl přidán nový kontakt"
 
@@ -2333,8 +2386,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nová interní poznámka:"
 
@@ -2342,13 +2395,13 @@ msgstr "Nová interní poznámka:"
 msgid "New local problems on FixMyStreet"
 msgstr "Nové lokální hlášení na FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2425,7 +2478,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2438,7 +2491,6 @@ msgstr "Další"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2447,11 +2499,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Ne"
 
@@ -2463,11 +2515,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Žádný subjekt"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Není vybrán žádný úřad"
 
@@ -2483,8 +2536,8 @@ msgstr "Nebyla nalazena žádná sledovaná hlášení."
 msgid "No flagged users found."
 msgstr "Nebyli nalezeni žádní sledovaní uživatelé."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Žádné další aktualizace"
 
@@ -2522,15 +2575,15 @@ msgstr "Žádný podporovatel."
 msgid "None"
 msgstr "Žádné"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2542,10 +2595,14 @@ msgstr ""
 "                V závislosti na implementaci, zaměstnanci institucí mohou mít přístup k přehledům (souhrny \n"
 "                aktivit jejich institucí), možnost smazat hlášení nebo nastavovat speciální stavy hlášení."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Není určeno pro naší oddělení"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Hlásil(a) jsem poprvé"
@@ -2593,12 +2650,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2606,12 +2663,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Starý stav"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2620,7 +2677,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2651,7 +2708,7 @@ msgstr "Úvodní webová stránka systému Open311"
 msgid "Open311 specification"
 msgstr "Specifikace systému Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2663,7 +2720,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2671,16 +2728,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2712,7 +2769,7 @@ msgstr "Stránka nenalezena"
 msgid "Parent"
 msgstr "Nadřazený subjekt"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Vytvořit kategorii"
@@ -2721,13 +2778,13 @@ msgstr "Vytvořit kategorii"
 msgid "Partial"
 msgstr "Částečně"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Heslo (volitelně)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Vaše heslo bylo změněno"
@@ -2742,7 +2799,7 @@ msgstr "Heslo (volitelně)"
 msgid "Permissions"
 msgstr "Trvalý odkaz"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2750,19 +2807,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefon:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Telefonní číslo"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Telefonní číslo (volitelně)"
 
@@ -2770,30 +2832,26 @@ msgstr "Telefonní číslo (volitelně)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefon:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2813,9 +2871,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2824,7 +2881,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr "Fotografie nedávných okolních hlášení"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2838,6 +2895,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Umísti špendlík na mapu"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2865,27 +2927,26 @@ msgid "Please check your email address is correct"
 msgstr "Zkontrolujte, zda je vaše emailová adresa správná"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Vyberte kategorii"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2904,27 +2965,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Nezneužívejte tento nástroj - zneužívání vašeho úřadu znehodnocuje službu pro všechny uživatele."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "prosím zadejte zprávu"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2937,16 +2998,16 @@ msgstr "Prosím zadejte heslo"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Prosím zadejte název"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2957,20 +3018,20 @@ msgstr "Prosím zadejte platný e-mail"
 msgid "Please enter a valid email address"
 msgstr "Prosím zadejte platnou emailovou adresu"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Prosím zadejte podrobnosti"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2986,7 +3047,7 @@ msgid "Please enter your first name"
 msgstr "Zadejte vaše jméno"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Zadejte své celé jméno, úřad potřebuje tyto informace - jestliže si přejete, aby Vaše jméno nebylo na webu zobrazeno,  odškrtněnte čvereček níže"
@@ -2998,9 +3059,9 @@ msgstr "Zadejte vaše jméno"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Zadejte vaše jméno"
@@ -3041,19 +3102,19 @@ msgstr "Vyplňte prosím níže uvedený formulář s údaji o problému, a popi
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Uveďte, zda chcete dostat další dotazník"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Prosím zadejte platnou emailovou adresu"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3080,24 +3141,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Vezměte prosím na vědomí:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Uveďte prosím nějaké vysvětlení, proč jste znovu otevřeli toto hlášení"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Uveďte prosím nějaký text, stejně jako fotografii"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Prosím, řekněte, jestli jste někdy předtím hlásili problémy na váš úřad"
 
@@ -3105,7 +3170,7 @@ msgstr "Prosím, řekněte, jestli jste někdy předtím hlásili problémy na v
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3117,7 +3182,7 @@ msgstr "Prosím, vyberte kanál, který chcete"
 msgid "Please select the type of alert you want"
 msgstr "Vyberte typ upozornění, které chcete"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Uveďte, prosím, zda byl či  nebyl problém vyřešen"
 
@@ -3125,12 +3190,12 @@ msgstr "Uveďte, prosím, zda byl či  nebyl problém vyřešen"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3138,27 +3203,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Napište zprávu"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Odeslat"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Nahlášeno anonymně v %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Odesláno uživatelem  %s v %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Odesláno uživatelem <strong>%s</strong> (%s) v %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Odesláno uživatelem <strong>%s</strong> v %s"
 
@@ -3174,7 +3235,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3182,11 +3243,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Předcházející"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3202,9 +3263,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Neveřejné"
 
@@ -3253,7 +3314,7 @@ msgstr "Hlášení  %s bylo odesláno na úřad  %s"
 msgid "Problem breakdown by state"
 msgstr "Členění hlášení podle stavu"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Hlášení bylo označeno za otevřené."
 
@@ -3261,8 +3322,7 @@ msgstr "Hlášení bylo označeno za otevřené."
 msgid "Problem state change based on survey results"
 msgstr "Stav hlášení byl změněn na základě výsledků šetření"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Hlášení"
@@ -3287,18 +3347,18 @@ msgstr "Hlášení označená za vyřešená na serveru FixMyStreet"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Hlášení   v  oblasti  %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Hlášení v oblasti %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3306,7 +3366,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3314,11 +3374,15 @@ msgstr ""
 msgid "Property address:"
 msgstr "Adresa nemovitosti:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3332,11 +3396,11 @@ msgstr "Poskytněte aktuální informace"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Poskytnutí hesla je volitelné, zato vám ale umožní snadněji nahlásit problémy, hlásit aktualizace a spravovat svá hlášení."
 
@@ -3344,12 +3408,12 @@ msgstr "Poskytnutí hesla je volitelné, zato vám ale umožní snadněji nahlá
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Veřejná reakce:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3392,11 +3456,11 @@ msgstr "Dotazník vyplňuje uživatel, který podal hlášení problému"
 msgid "RSS feed"
 msgstr "RSS kanál"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS kanál pro %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS kanál pro oblast  %s, %s"
 
@@ -3404,11 +3468,11 @@ msgstr "RSS kanál pro oblast  %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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS kanál pro %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS kanál pro  %s, v oblasti  %s "
 
@@ -3416,13 +3480,13 @@ msgstr "RSS kanál pro  %s, v oblasti  %s "
 msgid "RSS feed of nearby problems"
 msgstr "RSS kanál hlášení v okolí"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS kanál hlášení v oblasti  %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS kanál hlášení v oblasti  %s "
 
@@ -3436,11 +3500,11 @@ msgstr "RSS kanál aktuálních lokálních hlášení"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS kanál aktualizací tohoto hlášení"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3453,7 +3517,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Dostávat e-mail, když je hlášení aktualizováno."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3467,7 +3531,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Nedávno nahlášené problémy"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3480,7 +3544,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Uvědomte si, že FixMyStreet je především pro hlášení fyzických problémů, které mohou být opraveny. Pokud váš problém není vhodný pro hlášení prostřednictvím tohoto webu, můžete se obrátit na váš úřad přímo pomocí jejich internetových stránek."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3492,8 +3557,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Odstranit příznak"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3508,17 +3573,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Odstranit fotografii (nelze vrátit zpět!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3526,14 +3595,14 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3542,7 +3611,7 @@ msgid "Report a problem"
 msgstr "Nahlásit problém"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3558,7 +3627,7 @@ msgid "Report anonymously"
 msgstr "Nahlášeno anonymně v %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3594,7 +3663,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Hlášení, zobrazení a diskuse nad lokálními problémy"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Nahlášeno anonymně v %s"
@@ -3605,7 +3674,7 @@ msgstr "Nahlášeno anonymně v %s"
 msgid "Reported before"
 msgstr "Hlásil(a) jsem již dříve"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Nahlášeno uživatelem  %s, určeno pro %s"
@@ -3619,27 +3688,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Nahlášeno v kategorii  %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Nahlášeno anonymně v  %s v kategorii  %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Nahlášeno v kategorii %s uživatelem %s v %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Nahlášeno prostřednictvím %s anonymně v %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Nahlášeno prostřednictvím %s uživatelem  %s v  %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Nahlášeno prostřednictvím %s  v kategorii %s anonymně v %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Nahlášeno prostřednictvím %s v kategorii %s uživatelem %s v  %s"
 
@@ -3658,17 +3727,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr "Hlášení problému"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Hlášení"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3696,15 +3763,15 @@ msgid "Reports published"
 msgstr "Publikovaná hlášení"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3717,7 +3784,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3770,39 +3837,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "Správné místo?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Otočit doleva"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3818,20 +3891,20 @@ msgstr ""
 msgid "Satellite"
 msgstr "Satelitní"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3848,13 +3921,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Vyhledat hlášení"
 
@@ -3867,7 +3939,7 @@ msgstr "Vyhledat uživatele"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Vyhledat hlášení"
 
@@ -3882,12 +3954,12 @@ msgstr "Vyhledat:"
 msgid "Searching found no reports."
 msgstr "Nebylo nalezeno žádné hlášení."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Nebyli nalezeni žádní sledovaní uživatelé."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3897,8 +3969,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3908,7 +3979,7 @@ msgid "Select a body"
 msgstr "Zvolte subjekt"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Zvolte oblast"
@@ -3929,7 +4000,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3942,7 +4013,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3951,11 +4022,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "odesláno do %s o %s později"
 
@@ -3993,7 +4064,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4004,7 +4075,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4029,8 +4100,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4041,7 +4112,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Zobrazit značky"
 
@@ -4101,7 +4172,7 @@ msgid "Some photos of recent reports"
 msgstr "Některé fotografie současných hlášení"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Specifický název pro lokalizaci"
 
@@ -4110,12 +4181,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Je nám líto, že se zdá, že toto PSČ nepokrýváme."
 
@@ -4133,9 +4203,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Omlouváme se, došlo k chybě potvrzující váš problém."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Nemůžeme bohužel nalézt tuto lokalitu."
 
@@ -4145,13 +4215,13 @@ msgstr "Nemůžeme bohužel nalézt tuto lokalitu."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Omlouváme se,  nelze lokalizovat. Zkuste ještě jednou."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4166,11 +4236,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4179,11 +4249,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4207,18 +4277,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Stav"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4227,31 +4297,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Stav:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Statistiky"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Stav"
 
@@ -4269,7 +4336,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Oddělení/Instituce"
 
@@ -4288,50 +4355,48 @@ msgstr "Předmět:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Odeslat"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Odeslat změny"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Odeslat dotazník"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Odesláno"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Přihlásit se k odběru"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4344,7 +4409,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Aktualizace je omezena na %s znaků její délky. Prosím, zkraťte ji"
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4358,20 +4423,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Přehled"
 
@@ -4382,14 +4446,19 @@ msgstr "Souhrnný přehled"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4407,13 +4476,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Text"
@@ -4434,6 +4507,11 @@ msgstr "Pouze textová verze"
 msgid "Text:"
 msgstr "Text:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Text"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4463,7 +4541,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Díky, rádi slyšíme, že to bylo vyřešeno! Můžeme se ještě zeptat, jestli jste někdy předtím hlásili úřadům problém?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4475,27 +4553,29 @@ msgstr "Zdá se, že se obrázek nenahrál správně (%s), zkuste to prosím zno
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Zdá se, že tato lokalita nepatří do žádné městské části nebo obecního úřadu na území ČR. Možná se jedná o offshore nebo se nachází v zahraničí. Zkuste to prosím znovu."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "To místo se nezdá být v České republice; prosím zkuste to znovu."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Omlouváme se, ale poštovní směrovací číslo nebylo rozpoznáno."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Hlášení bude nyní opět odesláno."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Toto hlášení bylo vyjmuto z FixMyStreet."
 
@@ -4543,8 +4623,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4600,7 +4680,7 @@ msgstr "Nastala chyba: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4662,8 +4742,8 @@ msgstr "Uživatel nemohl lokalizovat problém v mapě, ale je zobrazeno okolí l
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4698,7 +4778,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4716,12 +4796,12 @@ msgstr "Nastal problém v zobrazení této stránky. Prosím, zkuste později."
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Nastal problém s vaší aktualizací. Prosím opakujte ještě jednou."
 
@@ -4729,7 +4809,7 @@ msgstr "Nastal problém s vaší aktualizací. Prosím opakujte ještě jednou."
 msgid "There were problems with your report. Please see below."
 msgstr "Nastal problém s vaším hlášením. Prosím, přečtěte si informace níže."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Nastal problém s Vaší aktualizací. Prosím, přečtěte si informace níže."
 
@@ -4815,10 +4895,10 @@ msgstr "Tento e-mail byl odeslán na oba úřady působící v dané lokalitě,
 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 "Tento e-mail byl odeslán na několik úřadů působících v dané lokalitě, protože zvolená kategorie hlášení je uvedena pro všechny z nich. Prosím ignorujte, pokud nejste oprávněný úřad kompetentní řešit nahlášený problém."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Tato informace je vyžadována"
 
@@ -4835,19 +4915,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Hlášení bylo vyřešeno"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Hlášení nemohlo být vyřešeno"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4860,26 +4944,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Hlášení čeká na moderování operátorem."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Hlášení je aktuálně označené za uzavřené."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Hlášení je aktuálně označené za vyřešené."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Hlášení je aktuálně označené za otevřené."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4887,15 +4971,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Webová stránka také obsahuje fotografii hlášení, poskytnutou uživatelem."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4919,6 +5006,10 @@ msgstr "Nadpis"
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4944,7 +5035,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "Pro  zobrazení mapy přesného umístění tohoto problému"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4969,11 +5060,6 @@ msgstr ""
 msgid "Total"
 msgstr "Celkem"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4996,16 +5082,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5015,7 +5101,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5045,10 +5131,10 @@ msgstr "Neznámá chyba"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "Neznámé ID hlášení"
 
@@ -5060,13 +5146,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Aktualizovat"
 
@@ -5117,29 +5203,27 @@ msgstr "Aktualizovat znovu otevřené hlášení"
 msgid "Update statuses"
 msgstr "Aktualizovat status"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Aktualizováno!"
 
@@ -5150,7 +5234,7 @@ msgstr "Aktualizováno!"
 msgid "Updates"
 msgstr "Aktualizace"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Aktualizace je omezena na %s znaků její délky. Prosím, zkraťte ji"
 
@@ -5180,6 +5264,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5193,8 +5285,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5212,7 +5304,7 @@ msgid "User flagged"
 msgstr "Uživatel sledován"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5225,27 +5317,25 @@ msgstr "Při vyhledávání byly nalezeny shody  v uživatelských jménech nebo
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Uživatelé"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5253,9 +5343,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Hodnoty aktualizovány"
 
@@ -5281,7 +5371,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Zobrazit hlášení na serveru"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Zobrazení hlášení podle okrsků"
 
@@ -5289,7 +5379,7 @@ msgstr "Zobrazení hlášení podle okrsků"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5307,7 +5397,7 @@ msgstr "Zobrazení hlášení"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Oddělení tohoto úřadu"
 
@@ -5377,7 +5467,7 @@ msgstr "Odesláno:"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5397,7 +5487,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "Chcete se podílet na rozvoji projektu FixMyStreet? Náš kód je open source  a je  k dispozici na <a href=\"https://fixmystreet.org\">fixmystreet.org </a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Můžeme Vám za měsíc odeslat další dotazník, který Vám připomene zkontrolovat stav Vašeho hlášení?"
 
@@ -5409,7 +5499,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Psaní zprávy pouze hůlkovým písmem je těžké číst, stejně jako chybějící interpunkce."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5420,12 +5509,12 @@ msgstr "Psaní zprávy pouze hůlkovým písmem je těžké číst, stejně jako
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Ano"
 
@@ -5438,7 +5527,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5451,7 +5540,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Upozorňuji na níže uvedený záznam, který může obsahovat urážlivé nebo osobní informace, případně jiný problematický text:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5460,7 +5549,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Můžete <a href=\"%s%s\">zobrazit hlášení na tomto webu</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Můžete přidat e-mail zneužívajícího uživatele do seznamu zneužívání a hlášení těchto uživatelů budou skryty (nikdy nebudou odesílány)."
 
@@ -5492,7 +5581,7 @@ msgstr "Pomozte nám najít email na kontaktní osobu pro oblast <strong>%s </st
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Pokud nechcete, aby byl subjekt dále na serveru aktivní, můžete ho označit za smazaný."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5502,7 +5591,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Odmítnuto; vyplňte rámeček nahoře"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5510,7 +5599,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Na tento dotazník jste již odpověděli. Máte-li dotazy, prosím <a href='%s'>spojte se s námi</a>, nebo si můžete <a href='%s'>zobrazit hlášení</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5519,8 +5608,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5587,9 +5675,9 @@ msgstr "Vaše hlášení"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5598,13 +5686,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5633,16 +5722,16 @@ msgstr "Vaše jméno a příjmení"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5662,8 +5751,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5696,7 +5785,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5727,19 +5816,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5747,8 +5836,8 @@ msgstr ""
 msgid "by %s"
 msgstr "uživatelem  %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "úřad"
 
@@ -5779,6 +5868,10 @@ msgstr "editace uživatele"
 msgid "from %s different users"
 msgstr "od %s různých uživatelů"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5796,7 +5889,7 @@ msgstr "neuvedeno"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5879,12 +5972,12 @@ msgid "today"
 msgstr "dnes"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5909,7 +6002,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "okrsek"
 
@@ -5985,7 +6078,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6012,7 +6105,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6039,7 +6132,7 @@ msgstr[1] "<big>%s</big> vyřešeno poslední měsíc"
 msgstr[2] "<big>%s</big> vyřešeno poslední měsíc"
 msgstr[3] "<big>%s</big> vyřešeno poslední měsíc"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
@@ -6048,7 +6141,7 @@ msgstr[1] "<big>%s</big> hlášení minulý týden"
 msgstr[2] "<big>%s</big> hlášení minulý týden"
 msgstr[3] "<big>%s</big> hlášení minulý týden"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
@@ -6057,7 +6150,7 @@ msgstr[1] "<big>%s</big> aktuální hlášení"
 msgstr[2] "<big>%s</big> aktuální hlášení"
 msgstr[3] "<big>%s</big> aktuální hlášení"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6102,7 +6195,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
@@ -6111,7 +6204,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
@@ -6120,6 +6213,18 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Uzavřena úřadem"
+
+#~ msgid "Filter report list"
+#~ msgstr "Filtrovat seznam hlášení"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Chybná agency_responsible hodnota %s"
+
+#~ msgid "Post"
+#~ msgstr "Odeslat"
+
 #~ msgid ""
 #~ "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
 #~ "                <br>\n"
diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po
index 9ce9ee529..af6cb9b2d 100644
--- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Welsh (https://www.transifex.com/mysociety/teams/12067/cy/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "a"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Adroddiadau"
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "%s ref:&nbsp;%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -157,6 +157,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(heb ei anfon at y cyngor)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(anfonwyd i'r ddau)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Dewiswch gategori --"
@@ -202,17 +204,18 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -242,7 +245,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Oes</strong>, mae gen i gyfrinair"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -259,7 +262,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -279,7 +282,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Ychwanegu categori newydd"
@@ -312,7 +315,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Ychwanegu categori newydd"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -321,8 +324,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -330,21 +333,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Ychwanegu defnyddiwr"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -360,6 +362,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Eto:"
@@ -372,8 +380,8 @@ msgstr ""
 msgid "Alert %d disabled (created %s)"
 msgstr "Analluogwyd yr hysbysiad %d (créwyd %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Rhoi gwybod am ddiweddariadau i ddod"
 
@@ -385,10 +393,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Pob adroddiad"
@@ -428,6 +438,11 @@ msgstr "Pob adroddiad rhwng %s a %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Adroddwyd yn y categori %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -464,7 +479,7 @@ msgstr "Dienw"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -477,7 +492,7 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -486,8 +501,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -498,7 +513,7 @@ msgstr ""
 msgid "Area covered"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -511,27 +526,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Ychwanegu categori newydd"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr ""
@@ -544,7 +564,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -552,11 +572,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -568,12 +588,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr ""
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Yn ôl"
@@ -594,14 +615,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Cyrff"
 
@@ -614,11 +633,13 @@ msgstr "Cyrff"
 msgid "Body"
 msgstr "Corff"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Corff:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -630,8 +651,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -647,15 +667,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -665,7 +683,7 @@ msgstr "Categori"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -688,6 +706,11 @@ msgstr "Categori:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Newid cyfrinair"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -704,7 +727,7 @@ msgstr "Newid cyfrinair"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -714,12 +737,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -756,8 +779,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -767,11 +790,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Ar gau"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Caewyd gan y cyngor"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -804,13 +823,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr ""
@@ -927,7 +945,7 @@ msgstr "Creu adroddiad"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Creu categori"
@@ -937,27 +955,25 @@ msgstr "Creu categori"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr ""
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Crëwyd"
@@ -966,6 +982,17 @@ msgstr "Crëwyd"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Crëwyd"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Crëwyd"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -977,10 +1004,6 @@ msgstr "Crëwyd:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -990,19 +1013,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "Ar hyn o bryd does dim cyrff."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1014,7 +1039,7 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1024,7 +1049,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr ""
@@ -1046,9 +1071,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Disgrifiad"
 
@@ -1057,7 +1080,7 @@ msgstr "Disgrifiad"
 msgid "Destination"
 msgstr "Disgrifiad"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1093,7 +1116,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1101,6 +1124,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Adroddwyd yn y categori %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Adroddwyd yn y categori %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1135,24 +1168,24 @@ msgstr ""
 msgid "Don't like forms?"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1164,7 +1197,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1176,7 +1209,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Golygu"
@@ -1187,12 +1220,11 @@ msgstr "Golygu"
 msgid "Edit body details"
 msgstr "Golygu manylion y corff"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1200,17 +1232,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1247,8 +1277,9 @@ msgstr "Golygydd"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1257,15 +1288,14 @@ msgstr "Golygydd"
 msgid "Email"
 msgstr "E-bost"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1285,12 +1315,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "E-bost:"
@@ -1353,12 +1384,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Rhowch enw stryd ac ardal gerllaw"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Rhowch god post DU, neu enw stryd ac ardal"
 
@@ -1385,10 +1416,10 @@ msgstr "Rhowch fanylion am y broblem"
 msgid "Error"
 msgstr "Gwall"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1401,7 +1432,7 @@ msgstr "Cod post enghreifftiol %s"
 msgid "Examples:"
 msgstr "Enghraifft:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1410,7 +1441,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1435,7 +1466,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1447,20 +1478,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Data ychwanegol:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1493,20 +1524,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr ""
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Tro cyntaf"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Lluniau o adroddiadau diweddar gerllaw"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Adroddiadau newydd"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1536,7 +1572,7 @@ msgstr ""
 msgid "Flag user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr ""
@@ -1545,7 +1581,7 @@ msgstr ""
 msgid "Flagged reports and users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1553,8 +1589,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr ""
 
@@ -1580,11 +1616,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Wedi anghofio eich cyfrinair?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1594,12 +1630,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Cwestiynau a ofynnir yn aml"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1621,7 +1665,7 @@ msgstr "Derbyn diweddariadau am broblemau %s"
 msgid "Get updates of problems in this %s"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Derbyn ffrwd RSS"
 
@@ -1637,15 +1681,15 @@ msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1655,7 +1699,7 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1681,6 +1725,7 @@ msgstr "Ydych chi wedi adrodd problem at y cyngor o'r blaen, neu ai dyma eich tr
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1715,7 +1760,8 @@ msgstr "Cudd"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1743,7 +1789,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Cuddio'r piniau"
 
@@ -1797,11 +1843,9 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1820,15 +1864,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1842,7 +1886,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1866,7 +1910,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1903,7 +1947,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1927,6 +1971,17 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "ward"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1936,20 +1991,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1966,16 +2021,12 @@ msgstr "Nodiadau mewnol"
 msgid "Internal notes"
 msgstr "Nodiadau mewnol"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2027,13 +2078,13 @@ msgstr "Diweddariad diwethaf:"
 msgid "Last&nbsp;update:"
 msgstr "Diweddariad&nbsp;diwethaf:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2050,7 +2101,7 @@ msgstr "Rhestru'r holl broblemau a adroddwyd"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Wrthi'n llwytho..."
@@ -2088,17 +2139,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2116,19 +2168,20 @@ msgstr ""
 msgid "MAP"
 msgstr "MAP"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2142,24 +2195,24 @@ msgstr "Map"
 msgid "Mark as sent"
 msgstr "Nodi ei fod wedi'i anfon"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Neges"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2172,7 +2225,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "jurisdiction_id coll"
 
@@ -2180,8 +2233,7 @@ msgstr "jurisdiction_id coll"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2204,7 +2256,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2214,14 +2266,14 @@ msgstr ""
 msgid "Month"
 msgstr "Mis"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2249,9 +2301,10 @@ msgstr ""
 msgid "Name"
 msgstr "Enw"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Enw:"
@@ -2269,7 +2322,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -2277,12 +2330,12 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2305,7 +2358,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Ychwanegwyd corff newydd"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr ""
 
@@ -2318,8 +2371,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nodyn mewnol newydd:"
 
@@ -2327,13 +2380,13 @@ msgstr "Nodyn mewnol newydd:"
 msgid "New local problems on FixMyStreet"
 msgstr "Problemau lleol newydd ar FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2410,7 +2463,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2423,7 +2476,6 @@ msgstr "Nesaf"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2432,11 +2484,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr ""
 
@@ -2448,11 +2500,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Dim corff"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr ""
 
@@ -2468,8 +2521,8 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Dim diweddariadau pellach"
 
@@ -2505,15 +2558,15 @@ msgstr "Dim cefnogwyr"
 msgid "None"
 msgstr "Dim"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2521,10 +2574,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr ""
@@ -2572,12 +2629,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2585,12 +2642,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Hen gyflwr"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2599,7 +2656,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2630,7 +2687,7 @@ msgstr "gwefan menter Open311"
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2642,7 +2699,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2650,16 +2707,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2691,7 +2748,7 @@ msgstr "Ni chanfuwyd y dudalen"
 msgid "Parent"
 msgstr "Rhiant"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Creu categori"
@@ -2700,13 +2757,13 @@ msgstr "Creu categori"
 msgid "Partial"
 msgstr "Rhannol"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Cyfrinair (dewisol)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Newidiwyd eich cyfrinair"
@@ -2721,7 +2778,7 @@ msgstr "Cyfrinair (dewisol)"
 msgid "Permissions"
 msgstr "Dolen barhaol"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2729,19 +2786,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Ffôn:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Rhif ffôn"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Rhif ffôn (dewisol)"
 
@@ -2749,30 +2811,26 @@ msgstr "Rhif ffôn (dewisol)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Ffôn:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2792,9 +2850,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2803,7 +2860,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr "Lluniau o adroddiadau diweddar gerllaw"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2817,6 +2874,10 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+msgid "Pin map"
+msgstr ""
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2844,27 +2905,26 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2883,27 +2943,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Peidiwch â bod yn sarhaus&nbsp;&mdash; byddai sarhau eich cyngor yn dibrisio'r gwasanaeth i bawb."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Rhowch neges"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2916,16 +2976,16 @@ msgstr "Rhowch gyfrinair"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Rhowch bwnc"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2936,20 +2996,20 @@ msgstr "Rhowch e-bost dilys"
 msgid "Please enter a valid email address"
 msgstr "Rhowch gyfeiriad e-bost dilys"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Rhowch fanylion"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2965,7 +3025,7 @@ msgid "Please enter your first name"
 msgstr "Rhowch eich enw cyntaf"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Rhowch eich enw llawn, mae angen y wybodaeth hon ar y cyngor – os na hoffech ddatgelu eich enw ar y wefan, dad-diciwch y blwch isod"
@@ -2977,9 +3037,9 @@ msgstr "Rhowch eich enw"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Rhowch eich enw"
@@ -3020,19 +3080,19 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Rhowch gyfeiriad e-bost dilys"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3059,24 +3119,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Noder:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Rhowch destun yn ogystal â llun"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Dywedwch wrthym a ydych wedi adrodd problem i'ch cyngor o'r blaen"
 
@@ -3084,7 +3148,7 @@ msgstr "Dywedwch wrthym a ydych wedi adrodd problem i'ch cyngor o'r blaen"
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3096,7 +3160,7 @@ msgstr "Dewiswch y ffrwd hoffech chi ei chael"
 msgid "Please select the type of alert you want"
 msgstr "Dewiswch pa fath o hysbysiad hoffech chi ei gael"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Dywedwch a gafodd y broblem ei thrwsio"
 
@@ -3104,12 +3168,12 @@ msgstr "Dywedwch a gafodd y broblem ei thrwsio"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3117,27 +3181,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Ysgrifennwch neges"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr ""
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Postiwyd yn ddienw am %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Postiwyd gan %s am %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Postiwyd gan <strong>%s</strong> (%s) am %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Postiwyd gan <strong>%s</strong> am %s"
 
@@ -3153,7 +3213,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3161,11 +3221,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Blaenorol"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3181,9 +3241,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Preifat"
 
@@ -3232,7 +3292,7 @@ msgstr "Anfonwyd y broblem %s at y cyngor"
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr ""
 
@@ -3240,8 +3300,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemau"
@@ -3266,18 +3325,18 @@ msgstr ""
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemau yn %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemau yn ward %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3285,7 +3344,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3293,11 +3352,15 @@ msgstr ""
 msgid "Property address:"
 msgstr "Cyfeiriad yr eiddo:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3311,11 +3374,11 @@ msgstr "Darparu diweddariad"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Mae darparu cyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau."
 
@@ -3323,12 +3386,12 @@ msgstr "Mae darparu cyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd pr
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Ymateb cyhoeddus:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3371,11 +3434,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr "Ffrwd RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "Ffrwd RSS ar gyfer %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "Ffrwd RSS ar gyfer ward %s, %s"
 
@@ -3383,11 +3446,11 @@ msgstr "Ffrwd RSS ar gyfer ward %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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "Ffrwd RSS %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "Ffrwd RSS %s, o fewn ward %s"
 
@@ -3395,13 +3458,13 @@ msgstr "Ffrwd RSS %s, o fewn ward %s"
 msgid "RSS feed of nearby problems"
 msgstr "Ffrwd RSS o broblemau gerllaw"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "Ffrwd RSS  o broblemau yn %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "Ffrwd RSS o broblemau o fewn ward %s"
 
@@ -3415,11 +3478,11 @@ msgstr "Ffrwd RSS o broblemau lleol diweddar"
 msgid "RSS feed of updates to this problem"
 msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3432,7 +3495,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Derbyn e-bost pan fydd diweddariadau i'r broblem hon."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3446,7 +3509,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Problemau a adroddwyd yn ddiweddar"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3459,7 +3522,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3471,8 +3535,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3487,17 +3551,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3505,14 +3573,14 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3521,7 +3589,7 @@ msgid "Report a problem"
 msgstr "Adrodd problem"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3537,7 +3605,7 @@ msgid "Report anonymously"
 msgstr "Adroddwyd yn ddienw am %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3573,7 +3641,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Adrodd, gweld, neu drafod problemau lleol"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Adroddwyd yn ddienw am %s"
@@ -3584,7 +3652,7 @@ msgstr "Adroddwyd yn ddienw am %s"
 msgid "Reported before"
 msgstr "Adroddwyd eisoes"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Adroddwyd gan %s am %s"
@@ -3598,27 +3666,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Adroddwyd yn y categori %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Adroddwyd yn y categori %s yn ddienw am %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Adroddwyd yn y categori %s am %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Adroddwyd drwy %s yn ddienw am %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Adroddwyd drwy %s gan %s am %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Adroddwyd drwy %s yn y categori %s yn ddienw am %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Adroddwyd drwy %s yn y categori %s am %s"
 
@@ -3637,17 +3705,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr "Adrodd problem"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Adroddiadau"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3675,15 +3741,15 @@ msgid "Reports published"
 msgstr "Adroddiadau a gyhoeddwyd"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3696,7 +3762,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3749,39 +3815,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "Y lle cywir?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Cylchdroi i'r chwith"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3797,20 +3869,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3827,13 +3899,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Chwilio am adroddiadau"
 
@@ -3846,7 +3917,7 @@ msgstr "Chwilio am ddefnyddwyr"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Chwilio am adroddiadau"
 
@@ -3861,12 +3932,12 @@ msgstr "Chwilio:"
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3876,8 +3947,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3887,7 +3957,7 @@ msgid "Select a body"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr ""
@@ -3908,7 +3978,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3921,7 +3991,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3930,11 +4000,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3972,7 +4042,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3983,7 +4053,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4008,8 +4078,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4020,7 +4090,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Dangos piniau"
 
@@ -4080,7 +4150,7 @@ msgid "Some photos of recent reports"
 msgstr "Lluniau o adroddiadau diweddar"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Testun i'w leoleiddio"
 
@@ -4089,12 +4159,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4112,9 +4181,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Mae'n ddrwg gennym, bu gwall tra'n cadarnhau eich problem."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Mae'n ddrwg gennym, ni allwn ddod o hyd i'r lleoliad hwnnw."
 
@@ -4124,13 +4193,13 @@ msgstr "Mae'n ddrwg gennym, ni allwn ddod o hyd i'r lleoliad hwnnw."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4144,11 +4213,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4157,11 +4226,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4185,18 +4254,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Cyflwr"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4205,31 +4274,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Cyflwr:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Ystadegau"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Statws"
 
@@ -4247,7 +4313,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4266,50 +4332,48 @@ msgstr "Pwnc:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Cyflwyno"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Cyflwyno newidiadau"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Cyflwyno'r holiadur"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Cyflwynwyd"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Tanysgrifio"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4321,7 +4385,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4335,20 +4399,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Crynodeb"
 
@@ -4359,14 +4422,19 @@ msgstr "Adroddiadau"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4384,13 +4452,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Testun"
@@ -4411,6 +4483,11 @@ msgstr "Fersiwn testun yn unig"
 msgid "Text:"
 msgstr "Testun:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Testun"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Diolch am adrodd y broblem hon!"
@@ -4440,7 +4517,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Diolch, mae'n dda gennym glywed y cafodd ei drwsio! Gawn ni ofyn a ydych wedi adrodd problem i gyngor o'r blaen?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4452,27 +4529,29 @@ msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto."
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arni."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Ailanfonir y broblem nawr."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet."
 
@@ -4518,8 +4597,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4573,7 +4652,7 @@ msgstr "Y gwall oedd: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4635,8 +4714,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4669,7 +4748,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4687,12 +4766,12 @@ msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen."
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni."
 
@@ -4700,7 +4779,7 @@ msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni."
 msgid "There were problems with your report. Please see below."
 msgstr "Bu gwallau gyda'r adroddiad. Gwelwch isod."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Bu gwallau gyda'r diweddariad. Gwelwch isod."
 
@@ -4776,10 +4855,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Mae'r wybodaeth hon yn ofynnol"
 
@@ -4796,19 +4875,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Trwsiwyd y broblem hon"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Ni thrwsiwyd y broblem hon"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4821,26 +4904,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Mae'r adroddiad hwn wedi'i nodi ar gau."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4848,15 +4931,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Mae'r dudalen we hon yn cynnwys llun o'r broblem, a ddarparwyd gan y defnyddiwr."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4880,6 +4966,10 @@ msgstr "Teitl"
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4905,7 +4995,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4930,11 +5020,6 @@ msgstr ""
 msgid "Total"
 msgstr "Cyfanswm"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4957,16 +5042,16 @@ msgstr "Ceisiwch anfon e-bost atom yn uniongyrchol:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4976,7 +5061,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5006,10 +5091,10 @@ msgstr "Gwall anhysbys"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5021,13 +5106,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr ""
 
@@ -5077,29 +5162,27 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Diweddarwyd"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Diweddarwyd!"
 
@@ -5110,7 +5193,7 @@ msgstr "Diweddarwyd!"
 msgid "Updates"
 msgstr "Diweddariadau"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5140,6 +5223,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5153,8 +5244,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5172,7 +5263,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5185,27 +5276,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5213,9 +5302,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr ""
 
@@ -5241,7 +5330,7 @@ msgstr ""
 msgid "View report on site"
 msgstr ""
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Gweld adroddiadau yn ôl ward"
 
@@ -5249,7 +5338,7 @@ msgstr "Gweld adroddiadau yn ôl ward"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5267,7 +5356,7 @@ msgstr ""
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Wardiau'r cyngor hwn"
 
@@ -5337,7 +5426,7 @@ msgstr ""
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5357,7 +5446,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Hoffech chi dderbyn holiadur arall ymhen 4 wythnos, i'ch atgoffa i wirio'r statws?"
 
@@ -5369,7 +5458,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Mae ysgrifennu eich holl neges mewn priflythrennau yn ei gwneud hi'n anodd i'w darllen, ac felly hefyd diffyg atalnodi."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5380,12 +5468,12 @@ msgstr "Mae ysgrifennu eich holl neges mewn priflythrennau yn ei gwneud hi'n ano
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr ""
 
@@ -5398,7 +5486,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5411,7 +5499,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5420,7 +5508,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Gallwch <a href=\"%s%s\">weld y broblem ar y wefan hon</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5450,7 +5538,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5460,7 +5548,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Gwrthodoch chi; llenwch y blwch uchod"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5468,7 +5556,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5477,8 +5565,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5542,9 +5629,9 @@ msgstr "Eich adroddiadau"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5553,13 +5640,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5588,16 +5676,16 @@ msgstr "Eich enw"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5617,8 +5705,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5651,7 +5739,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5682,19 +5770,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5702,8 +5790,8 @@ msgstr ""
 msgid "by %s"
 msgstr "gan %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "cyngor"
 
@@ -5734,6 +5822,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5751,7 +5843,7 @@ msgstr "ddim yn berthnasol"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5833,12 +5925,12 @@ msgid "today"
 msgstr "heddiw"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5863,7 +5955,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "ward"
 
@@ -5939,7 +6031,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5966,7 +6058,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5993,7 +6085,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
@@ -6002,7 +6094,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
@@ -6011,7 +6103,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6056,7 +6148,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
@@ -6065,7 +6157,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
@@ -6074,6 +6166,9 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Caewyd gan y cyngor"
+
 #~ msgid "OK"
 #~ msgstr "Iawn"
 
diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po
index 6a42c24ed..261c0279a 100644
--- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Danish (Denmark) (https://www.transifex.com/mysociety/teams/12067/da_DK/)\n"
@@ -20,8 +20,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " og "
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - opsummeringsrapporter"
 
@@ -111,7 +111,7 @@ msgstr "%s spørgeskemaer sendt &ndash; %s besvaret (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> -bidragsydere"
 
@@ -157,6 +157,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(ikke rapporteret til myndigheden)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(sendt til begge)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Vælg en kategori --"
@@ -202,17 +204,18 @@ msgid ""
 msgstr "<code>MAPIT_URL</code> er sat, (<code>%s</code>) men ingen <code>MAPIT_TYPES</code>.<br>Dette er nok grunden til at \"dækket område\" er tom (nedenfor).<br>Måske skal du tilføje nogen <code>MAPIT_TYPES</code> i konfigurationsfilen?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -242,7 +245,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ja</strong>, jeg har en adgangskode"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -259,7 +262,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -279,7 +282,7 @@ msgstr "Tilføj en <strong>administration</strong> for hver administrativ instan
 msgid "Add a contact using the form below."
 msgstr "Tilføj en kontakt ved at bruge formularen nedenfor."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Tilføj ny kategori"
@@ -312,7 +315,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Tilføj ny kategori"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -321,8 +324,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -330,21 +333,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Tilføj bruger"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -360,6 +362,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Gentag:"
@@ -372,8 +380,8 @@ msgstr "Varsel %d oprettet for %s, type %s, parameter %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Varsel %d koblet fra (oprettet %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Send mig varsel ved fremtidige opdateringer"
 
@@ -385,10 +393,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Alle rapporter"
@@ -428,6 +438,11 @@ msgstr "Alle rapporter mellem %s og %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Rapporteret i kategorien %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -464,7 +479,7 @@ msgstr "Anonym"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -477,7 +492,7 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -486,8 +501,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -498,7 +513,7 @@ msgstr ""
 msgid "Area covered"
 msgstr "Dækket område"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -512,27 +527,32 @@ msgstr "Da reproduktionsstedet og %s ikke stemmer, vil beskeden som er lavet her
 msgid "Assign selected to role:"
 msgstr "Tildelt %s"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Flyt til en anden kategori:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Tildel til ekstern myndighed:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Tildelt underafdeling:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Tildelt %s"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Tildelt %s"
@@ -545,7 +565,7 @@ msgstr "Højst %d forespørgsler bliver returneret i hver forespørgsel.  De ret
 msgid "At the moment only searching for and looking at reports work."
 msgstr "For øjeblikket er det kun søgning efter og at visning af rapporter som fungerer."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -553,11 +573,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -569,12 +589,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Afventer moderation"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Tilbage"
@@ -595,14 +616,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Administrationer"
 
@@ -615,11 +634,13 @@ msgstr "Administrationer"
 msgid "Body"
 msgstr "Administration"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Administration:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -631,8 +652,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Hvis du ikke kan se kortet, <em>så overspring dette trin</em>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -648,15 +668,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -666,7 +684,7 @@ msgstr "Kategori"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -689,6 +707,11 @@ msgstr "Kategori:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Skift adgangskode"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -705,7 +728,7 @@ msgstr "Skift adgangskode"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -715,12 +738,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr "Vælg et <strong>kategorinavn</strong> som giver mening for indbyggerne (f.eks. \"Hul i vejen\", \"Gadebelysning\") men som også er nyttigt for myndigheden. Disse vil dukke op i rullegardinmenuen på rapportér-et-problem-siden."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -757,8 +780,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -768,11 +791,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Lukket"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Lukket af myndigheden"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -805,13 +824,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Opsætning"
@@ -928,7 +946,7 @@ msgstr "Lav en rapport"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Lav kategori"
@@ -938,27 +956,25 @@ msgstr "Lav kategori"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr ""
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Oprettet"
@@ -967,6 +983,17 @@ msgstr "Oprettet"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Oprettet"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Oprettet"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -978,10 +1005,6 @@ msgstr "Oprettet:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -991,19 +1014,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "I øjeblikket er der ikke lavet nogen instanser."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Oversigt"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1015,7 +1040,7 @@ msgstr "Behandlet af underafdeling inden 5 arbejdsdage"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1025,7 +1050,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr ""
@@ -1047,9 +1072,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -1058,7 +1081,7 @@ msgstr "Beskrivelse"
 msgid "Destination"
 msgstr "Beskrivelse"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1094,7 +1117,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1102,6 +1125,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Rapporteret i kategorien %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Rapporteret i kategorien %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1136,24 +1169,24 @@ msgstr "Véd ikke"
 msgid "Don't like forms?"
 msgstr "Kan du ikke lide skemaer?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1168,7 +1201,7 @@ msgstr ""
 "Forskellige kategorier kan have same kontakt</strong> (e-postadresse).\n"
 "Dette betyder at du kan tilføje mange grupper/kategorier selv om du bare har <strong>én<strong> kontakt for myndigheden."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1180,7 +1213,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Redigér"
@@ -1191,12 +1224,11 @@ msgstr "Redigér"
 msgid "Edit body details"
 msgstr "Redigér detaljer for myndighed"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1204,17 +1236,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1251,8 +1281,9 @@ msgstr "Opdateret af"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1261,15 +1292,14 @@ msgstr "Opdateret af"
 msgid "Email"
 msgstr "E-post"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1289,12 +1319,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "E-post:"
@@ -1363,12 +1394,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Endepunkt"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Indtast et vejnavn i Z&uuml;rich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Indtast et britisk postnummer i nærheden, eller vejnavn og sted"
 
@@ -1395,10 +1426,10 @@ msgstr "Indtast detaljer om problemet"
 msgid "Error"
 msgstr "Fejl"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1411,7 +1442,7 @@ msgstr "Eksempel-postnummer %s"
 msgid "Examples:"
 msgstr "Eksempler:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1420,7 +1451,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1445,7 +1476,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1457,20 +1488,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Ekstra data:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1503,20 +1534,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filtrér rapportliste"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Første gang"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Billeder af nye problemer i nærheden"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nye rapporter"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Fiks dette ved at vælge en <strong>area covered</strong> i <em> Edit body details</em>-skemaet nedenfor."
@@ -1546,7 +1582,7 @@ msgstr "Markér som slettet"
 msgid "Flag user"
 msgstr "Markér bruger"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Markeret:"
@@ -1555,7 +1591,7 @@ msgstr "Markeret:"
 msgid "Flagged reports and users"
 msgstr "Markerede rapporter og brugere"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Markerede brugere er listet op på <a href='%s'>Markerede</a>-siden."
 
@@ -1563,8 +1599,8 @@ msgstr "Markerede brugere er listet op på <a href='%s'>Markerede</a>-siden."
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Markerede brugere er ikke begrænset på noget måde.  Dette er bare en liste med brugere som er blevet markeret for at give dem opmærksomhed."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Markeret:"
 
@@ -1590,11 +1626,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Glemt din adgangskode?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1604,12 +1640,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Ofte spurgte spørgsmål"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1631,7 +1675,7 @@ msgstr "Få opdateringer for problemer i denne %s"
 msgid "Get updates of problems in this %s"
 msgstr "Få opdateringer for problemer i denne %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Giv mig en RSS-strøm"
 
@@ -1647,15 +1691,15 @@ msgstr "Glad for at høre at det er i orden!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1665,7 +1709,7 @@ msgstr "Søg"
 msgid "Going to send questionnaire?"
 msgstr "Skal der sendes spørgeskema?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1691,6 +1735,7 @@ msgstr "Har du rapporteret et problem til en myndighed før, eller er dette før
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1725,7 +1770,8 @@ msgstr "Skjul"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1753,7 +1799,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Skjul nåle"
 
@@ -1807,11 +1853,9 @@ msgstr "Jeg er bange for at vi ikke kunne finde dit problem i databasen.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1830,15 +1874,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1852,7 +1896,7 @@ msgstr "Hvis to eller flere instanser er lokaliseret på samme sted,  kombinerer
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1876,7 +1920,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1913,7 +1957,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1937,6 +1981,17 @@ msgstr "I misbrugstabel?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "Yderligere bliver følgende attributter, som ikke er del af Open311 v2-specifikationen, returneret: agency_sent_datetime, title (også returneret som del af description), interface_used, comment_count, requestor_name (kun tilstede hvis indsender tillod at navnet kunne vises på dette netsted)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "bydel"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1946,20 +2001,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr "Tom indboks, her kommer vi!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Inkludér rapportørens personlige detaljer"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Forkert has_photo-værdi \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1976,16 +2031,12 @@ msgstr "Interne notater"
 msgid "Internal notes"
 msgstr "Interne notater"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Ugyldig agency_responsible-værdi %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Ugyldigt format %s angivet."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2037,13 +2088,13 @@ msgstr "Sidste opdatering:"
 msgid "Last&nbsp;update:"
 msgstr "Sidste&nbsp;opdatering:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2060,7 +2111,7 @@ msgstr "List alle rapporterede problemer"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Indlæser..."
@@ -2098,17 +2149,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2126,19 +2178,20 @@ msgstr ""
 msgid "MAP"
 msgstr "KORT"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2152,24 +2205,24 @@ msgstr "Kort"
 msgid "Mark as sent"
 msgstr "Markér som afsendt"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Markér brugere hvis adfærd du ønsker at have tjek på som <strong>markeret</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Besked"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2182,7 +2235,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Mangler jurisdiction_id"
 
@@ -2190,8 +2243,7 @@ msgstr "Mangler jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2214,7 +2266,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "Modereret af afdeling inden for en arbejdsdag"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2224,14 +2276,14 @@ msgstr ""
 msgid "Month"
 msgstr "Måned"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2259,9 +2311,10 @@ msgstr ""
 msgid "Name"
 msgstr "Navn"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Navn:"
@@ -2279,7 +2332,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Nærmeste navngivne vej til nålen placeret på kortet (automatisk genereret ved hjælp af OpenStreetMap): %s%s"
 
@@ -2287,12 +2340,12 @@ msgstr "Nærmeste navngivne vej til nålen placeret på kortet (automatisk gener
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Nærmeste postnummer for nålen placeret på kortet (automatisk genereret): %s (%sm væk)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Nærmeste vej for nålen placeret på kortet (automatisk genereret ved hjælp af Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2317,7 +2370,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Ny myndighed tilføjet"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Ny kategorikontakt tilføjet"
 
@@ -2330,8 +2383,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nyt internt notat:"
 
@@ -2339,13 +2392,13 @@ msgstr "Nyt internt notat:"
 msgid "New local problems on FixMyStreet"
 msgstr "Nye lokale problemer på FixMinVej"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2422,7 +2475,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2435,7 +2488,6 @@ msgstr "Næste"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2444,11 +2496,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Nej"
 
@@ -2460,11 +2512,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Ingen myndighed"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Ingen myndighed er valgt"
 
@@ -2480,8 +2533,8 @@ msgstr "Fandt ingen markerede problemer."
 msgid "No flagged users found."
 msgstr "Fant ingen markerede brugere."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Ikke flere opdateringer"
 
@@ -2520,15 +2573,15 @@ msgstr "Ingen supportere"
 msgid "None"
 msgstr "Ingen"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2540,10 +2593,14 @@ msgstr ""
 "Afhængig af implementeringen kan ansatte brugere have adgang til dashbordet (sammendrag af \n"
 "aktivitet for hele instansen), mulighed at skjule beskeder eller sætte status for specialrapporter."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Ikke for min underafdeling"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Ikke rapporteret tidligere"
@@ -2591,12 +2648,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2604,12 +2661,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Gammel tilstand"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2618,7 +2675,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2649,7 +2706,7 @@ msgstr "Open311-initiativets netside"
 msgid "Open311 specification"
 msgstr "Open311-specifikation"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2661,7 +2718,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2669,16 +2726,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2710,7 +2767,7 @@ msgstr "Fandt ikke siden"
 msgid "Parent"
 msgstr "Forælder"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Lav kategori"
@@ -2719,13 +2776,13 @@ msgstr "Lav kategori"
 msgid "Partial"
 msgstr "Delvis"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Adgangskode (valgfrit)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Din adgangskode er blevet ændret"
@@ -2740,7 +2797,7 @@ msgstr "Adgangskode (valgfrit)"
 msgid "Permissions"
 msgstr "Permalink"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2748,19 +2805,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefon:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Telefonnummer (valgfrit)"
 
@@ -2768,30 +2830,26 @@ msgstr "Telefonnummer (valgfrit)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefon:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2811,9 +2869,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2822,7 +2879,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr "Billeder af nye problemer i nærheden"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2836,6 +2893,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Placér tegnestiften på kortet"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2863,27 +2925,26 @@ msgid "Please check your email address is correct"
 msgstr "Venligst kontrollér at du har skrevet en gyldig e-postadresse"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Vælg en kategori"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2902,27 +2963,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Vær ikke ufin &mdash; at skælde ud på din myndighed skader værdien af tjenesten for alle brugerne."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Venligst indlæg en besked"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2935,16 +2996,16 @@ msgstr "Indtast en adgangskode"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Venligst angiv et emne"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2955,20 +3016,20 @@ msgstr "Tilføj en gyldig e-post"
 msgid "Please enter a valid email address"
 msgstr "Angiv din e-post"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Angiv oplysninger om problemet"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2984,7 +3045,7 @@ msgid "Please enter your first name"
 msgstr "Venligst angiv dit fornavn"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Venligst angiv dit fulde navn, myndigheder som modtager dit problem har brug for dette - hvis du ikke ønsker at dit navn skal vises, så fjern hakket nedenfor"
@@ -2996,9 +3057,9 @@ msgstr "Angiv dit navn"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Angiv dit navn"
@@ -3041,19 +3102,19 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Venligst indikér om du ønsker at modtage et nyt spørgeskema"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Angiv din e-post"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3080,24 +3141,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Venligst bemærk:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Venligst bidrag med en forklaring på hvorfor du genåbner denne problemrapport"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Venligst bidrag med lidt tekst i tillæg til et billede"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Venligst oplys om du har rapporteret et problem til din myndighed tidligere"
 
@@ -3105,7 +3170,7 @@ msgstr "Venligst oplys om du har rapporteret et problem til din myndighed tidlig
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3117,7 +3182,7 @@ msgstr "Vælg den kilde du ønsker"
 msgid "Please select the type of alert you want"
 msgstr "Venligst vælg hvilken type varsel du ønsker"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Venligs angiv om dette problem er blevet fikset eller ikke"
 
@@ -3125,12 +3190,12 @@ msgstr "Venligs angiv om dette problem er blevet fikset eller ikke"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3138,27 +3203,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Indtast en besked"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Indsend"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Publiceret anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Sendt ind af %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Sendt ind af <strong>%s</strong> (%s) %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Sendt ind af <strong>%s</strong> %s"
 
@@ -3174,7 +3235,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3182,11 +3243,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Forrige"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3202,9 +3263,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privat"
 
@@ -3253,7 +3314,7 @@ msgstr "Problem %s sendt til myndighed %s"
 msgid "Problem breakdown by state"
 msgstr "Tilstandsfordeling af problemer"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problem markeret som åbent."
 
@@ -3261,8 +3322,7 @@ msgstr "Problem markeret som åbent."
 msgid "Problem state change based on survey results"
 msgstr "Problemtilstandsændring baseret på spørgeundersøgelsesresultater"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemer"
@@ -3287,18 +3347,18 @@ msgstr "Problemer nyligt rapporteret fikset på FixMinVej"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemer indenfor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemer indenfor %s bydel"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3306,7 +3366,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3314,11 +3374,15 @@ msgstr ""
 msgid "Property address:"
 msgstr "Ejendomsadresse:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3332,11 +3396,11 @@ msgstr "Bidrag med en opdatering"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Det er valgfrit at angive en adgangskode, men hvis du gør det vil det blive nemmere for dig at rapportere problemer, lave opdateringer og håndtere dine rapporter"
 
@@ -3344,12 +3408,12 @@ msgstr "Det er valgfrit at angive en adgangskode, men hvis du gør det vil det b
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Offentlig respons:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3392,11 +3456,11 @@ msgstr "Spørgeskema udfyldt af fejlrapportøren"
 msgid "RSS feed"
 msgstr "RSS-strøm"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS-strøm for %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS-strøm for %s bydel, %s"
 
@@ -3404,11 +3468,11 @@ msgstr "RSS-strøm for %s bydel, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS-strøm fra %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS-strøm af %s, indenfor %s bydel"
 
@@ -3416,13 +3480,13 @@ msgstr "RSS-strøm af %s, indenfor %s bydel"
 msgid "RSS feed of nearby problems"
 msgstr "RSS-strøm med problemer i nærheden"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS-strøm for problemer indenfor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS-strøm for problemer indenfor %s bydel"
 
@@ -3436,11 +3500,11 @@ msgstr "RSS-strøm med nylige lokale problemer"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS-strøm med opdateringer for dette problem"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3453,7 +3517,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Modtag e-post når der er opdateringer på dette problem"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3467,7 +3531,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Nyligt meldte problemer"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3480,7 +3544,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Husk at FixMinVej primært er lavet for at rapportere fysiske problemer som kan blive fikset. Hvis dit problem ikke er egnet til at sende ind via denne tjeneste, så husk at du kan kontakte myndigheden direkte via deres egen netside."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3492,8 +3557,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Fjern markering"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3508,17 +3573,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Fjern billede (kan ikke fortrydes!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3526,14 +3595,14 @@ msgstr ""
 msgid "Report"
 msgstr "Rapport"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3542,7 +3611,7 @@ msgid "Report a problem"
 msgstr "Rapportér et problem"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3558,7 +3627,7 @@ msgid "Report anonymously"
 msgstr "Rapporteret anonymt %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3594,7 +3663,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Rapportér, find eller diskutér lokale problemer"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Rapporteret anonymt %s"
@@ -3605,7 +3674,7 @@ msgstr "Rapporteret anonymt %s"
 msgid "Reported before"
 msgstr "Rapporteret tidligere"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Publiceret af %s %s"
@@ -3619,27 +3688,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Rapporteret i kategorien %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Rapporteret i kategorien %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Rapporteret i kategorien %s af %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Publiceret af %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Rapporteret af %s af %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Rapporteret af %s i kategorien %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Rapporteret af %s i kategorien %s af %s %s"
 
@@ -3658,17 +3727,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr "Rapporterer et problem"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Rapporter"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3696,15 +3763,15 @@ msgid "Reports published"
 msgstr "Publicerede rapporter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3717,7 +3784,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3770,39 +3837,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "Rigtig sted?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Vejoperatør for denne navngivne vej (udledt af vejens referencenummer og type) %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Vejoperatør for denne navngivne vej (fra OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Rotér til venstre"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3818,20 +3891,20 @@ msgstr ""
 msgid "Satellite"
 msgstr "Satelit"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3848,13 +3921,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Søg i rapporter"
 
@@ -3867,7 +3939,7 @@ msgstr "Søg i brugere"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Søg i rapporter"
 
@@ -3882,12 +3954,12 @@ msgstr "Søg:"
 msgid "Searching found no reports."
 msgstr "Søgningen fandt ingen rapporter."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Søgningen fandt ingen brugere."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3897,8 +3969,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3908,7 +3979,7 @@ msgid "Select a body"
 msgstr "Vælg en myndighed"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Vælg et område"
@@ -3929,7 +4000,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3942,7 +4013,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3951,11 +4022,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Sendt til %s %s senere"
 
@@ -3993,7 +4064,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4004,7 +4075,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4029,8 +4100,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4041,7 +4112,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Vis nåle"
 
@@ -4104,7 +4175,7 @@ msgid "Some photos of recent reports"
 msgstr "Nogen billeder af nylig meldte problemer"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Noget tekst at oversætte"
 
@@ -4113,12 +4184,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Beklager det ser ud til at være et \"Crown dependency\"-postnummer, som vi ikke dækker."
 
@@ -4136,9 +4206,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Beklager, men der opstod et problem når vi forsøgte at bekræfte din problemrapport"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Beklager, men vi kunne ikke finde dette sted."
 
@@ -4148,13 +4218,13 @@ msgstr "Beklager, men vi kunne ikke finde dette sted."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Beklager, men vi kunne ikke tolke den position. Prøv venligst igen."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4169,11 +4239,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4182,11 +4252,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4210,18 +4280,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Tilstand"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4230,31 +4300,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Tilstand:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Statistik"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Status"
 
@@ -4272,7 +4339,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Underafdeling/myndighed"
 
@@ -4291,50 +4358,48 @@ msgstr "Emne:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Send ind"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Indsend ændringer"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Indsend spørgeskema"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Sendt ind"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4347,7 +4412,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Opdateringer er begrænset til %s tegn i længde. Venligst skriv en kortere tekst."
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4361,20 +4426,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Opsummering"
 
@@ -4385,14 +4449,19 @@ msgstr "Opsummeringsrapporter"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4410,13 +4479,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Tekst"
@@ -4437,6 +4510,11 @@ msgstr "Tekst-version"
 msgid "Text:"
 msgstr "Tekst:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Tekst"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Tak for at du rapporterede dette problem!"
@@ -4466,7 +4544,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Tak, glad for at høre at problemet er fikset! Vi vil gjerne spørge dig om du har rapporteret et problem til en myndighed tidligere?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4478,27 +4556,29 @@ msgstr "Billedet ser ikke ud til at være blevet lagt op rigtigt (%s), prøv ige
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Det sted dækkes ikke af nogen myndighed, måske det er til søs eller udenfor landet - venligst forsøgm med et andet sted."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Det sted virker ikke til at være i Storbritannien. Venligst prøv igen."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Det postnummer blev ikke genkendt, beklager."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Det problem er blevet markeret som sendt."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Det problem vil nu blive sendt igen."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Den rapport er blevet fjernet fra FixMinVej."
 
@@ -4548,8 +4628,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4612,7 +4692,7 @@ msgstr "Fejlen var: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "De følgende Open311 v2-atributter bliver returneret for hver forespørgsel: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code og service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "Følgende information om nærmeste vej kan være unøjagtigt eller irrelevant, hvis problemet er nær flere veje eller nær en vej uden navn registreret i OpenStreetmap."
 
@@ -4674,8 +4754,8 @@ msgstr "Brugeren kunne ikke placere problemet på et kort, men kontrollér områ
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4710,7 +4790,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4728,12 +4808,12 @@ msgstr "Der var problemer med at vise denne side. Venligst prøv igen senere."
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Der var problemer med din opdatering. Vær sød at forsøge igen."
 
@@ -4741,7 +4821,7 @@ msgstr "Der var problemer med din opdatering. Vær sød at forsøge igen."
 msgid "There were problems with your report. Please see below."
 msgstr "Der var problemer med din rapport. Venligst se nedenfor."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Der var problemer med din opdatering. Venligst se nedenfor."
 
@@ -4826,10 +4906,10 @@ msgstr "Denne e-post er blevet sendt til begge myndigheder som dækker stedet fo
 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 "Denne e-post er blevet sendt til flere myndigheder som dækker stedet for problemet, da den valgte kategori er tilgængelig for disse. Vær sød at ignorere e-posten hvis I ikke er korrekt myndighed for at håndtere denne sag."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Denne information er påkrævet"
 
@@ -4846,19 +4926,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Dette problem er løst"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Dette problem er ikke blevet løst"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4871,26 +4955,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Denne rapport afventer moderation"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Denne rapport er for tiden markeret som lukket."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Denne rapport er for tiden markeret som fikset."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Denne rapport er for tiden markeret som åben."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4898,15 +4982,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Denne netside indeholder også et billede af problemet, sendt ind af brugeren."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4930,6 +5017,10 @@ msgstr "Titel"
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4955,7 +5046,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "For at se et kort med en mere præsis placering for dette problem."
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4980,11 +5071,6 @@ msgstr ""
 msgid "Total"
 msgstr "Totalt"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -5007,16 +5093,16 @@ msgstr "Forsøg at sende epost direkte til os:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5026,7 +5112,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5056,10 +5142,10 @@ msgstr "Ukendt fejl"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "Ukendt problem-Id"
 
@@ -5071,13 +5157,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Opdatering"
 
@@ -5128,29 +5214,27 @@ msgstr "En opdatering gennåbnede problemet"
 msgid "Update statuses"
 msgstr "Opdatér tilstanden"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Opdateret"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Opdateret!"
 
@@ -5161,7 +5245,7 @@ msgstr "Opdateret!"
 msgid "Updates"
 msgstr "Opdateringer"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Opdateringer er begrænset til %s tegn i længde. Venligst skriv en kortere tekst."
 
@@ -5191,6 +5275,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5204,8 +5296,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5223,7 +5315,7 @@ msgid "User flagged"
 msgstr "Bruger markeret"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5236,27 +5328,25 @@ msgstr "Brugersøgning finder træf på brugernavne og epostadresser. "
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Brugere"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5264,9 +5354,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Værdier opdateret"
 
@@ -5292,7 +5382,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Se rapport på netstedet"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Se rapport per bydel"
 
@@ -5300,7 +5390,7 @@ msgstr "Se rapport per bydel"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5318,7 +5408,7 @@ msgstr "Ser på et problem"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Bydele indenfor denne myndighed"
 
@@ -5388,7 +5478,7 @@ msgstr "Hvornår sendt"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5408,7 +5498,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "Kunne du tænke dig at bidrage til FixMinVej?  Vores kKildekoden er frit programmel og <a href=\"https://fixmystreet.org\">tilgængelig via fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Kunne du tænke dig at modtage en ny forespørgsel om 4 uger, som minder dig om at tjekke status?"
 
@@ -5420,7 +5510,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Når du skriver din besked med kun store bogstaver bliver den vanskelig at læse. Det samme gælder manglende tegnsætning."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5431,12 +5520,12 @@ msgstr "Når du skriver din besked med kun store bogstaver bliver den vanskelig
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Ja"
 
@@ -5449,7 +5538,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5462,7 +5551,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Du rapporterer at følgende opdatering er stødende, indeholder personlig information, eller lignende:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5471,7 +5560,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Du kan <a href=\"%s%s\">læse om problemet på denne side</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Du kan føje en misbrugers epostadresse til misbrugslisten, hvilket automatisk skjuler (og aldrig sender) rapporter vedkommende opretter."
 
@@ -5503,7 +5592,7 @@ msgstr "Du kan hjælpe os ved at finde en kontakt-e-post for lokale problemer i
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Du kan markere en myndighed som slettet hvis du ikke ønsker at den skal være aktiv på dette netsted."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5513,7 +5602,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Du afviste; venligst udfyld boksen ovenfor"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5521,7 +5610,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Du har allerede besvaret dette spørgeskema. Hvis du har spørgsmål, venligst <a href='%s'>tag kontakt</a>, eller <a href='%s'>se på dit problem</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5530,8 +5619,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5597,9 +5685,9 @@ msgstr "Dine rapporter"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5608,13 +5696,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5643,16 +5732,16 @@ msgstr "Dit navn"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5672,8 +5761,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5706,7 +5795,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5737,19 +5826,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5757,8 +5846,8 @@ msgstr ""
 msgid "by %s"
 msgstr "af %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "myndighed (fx kommune)"
 
@@ -5789,6 +5878,10 @@ msgstr "redigér bruger"
 msgid "from %s different users"
 msgstr "fra %s forskellige brugere"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5806,7 +5899,7 @@ msgstr "n/a"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5889,12 +5982,12 @@ msgid "today"
 msgstr "idag"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5919,7 +6012,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "bydel"
 
@@ -5979,7 +6072,7 @@ msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6000,7 +6093,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6021,21 +6114,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> fikset sidste måned"
 msgstr[1] "<big>%s</big> fikset sidste måned"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> rapport sidste uge"
 msgstr[1] "<big>%s</big> rapporter sidste uge"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> rapporteret<br>for nyligt"
 msgstr[1] "<big>%s</big> rapporteret<br>for nyligt"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6070,20 +6163,32 @@ msgid_plural "last updated %d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Lukket af myndigheden"
+
+#~ msgid "Filter report list"
+#~ msgstr "Filtrér rapportliste"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Ugyldig agency_responsible-værdi %s"
+
+#~ msgid "Post"
+#~ msgstr "Indsend"
+
 #~ msgid ""
 #~ "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
 #~ "                <br>\n"
diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
index 6700fa0ce..70fe085bd 100644
--- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-07-17 11:27+0200\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: German (Switzerland) (https://www.transifex.com/mysociety/teams/12067/de_CH/)\n"
@@ -21,8 +21,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2.3\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "und"
@@ -57,7 +57,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "Alle Meldungen"
 
@@ -112,7 +112,7 @@ msgstr ""
 msgid "%s ref:&nbsp;%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -158,6 +158,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -176,8 +178,8 @@ msgstr ""
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Wählen Sie eine Kategorie --"
@@ -204,17 +206,18 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Zeige</label> %s Meldungen <label for=\"filter_categories\">über</label> %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -244,7 +247,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "Passwort"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -261,7 +264,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -281,7 +284,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Füge neue Kategorie hinzu"
@@ -314,7 +317,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Füge neue Kategorie hinzu"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -323,8 +326,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -332,21 +335,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "User hinzufügen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Füge neue Kategorie hinzu"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Vorlagen für %s"
 
@@ -362,6 +364,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Nochmals"
@@ -374,8 +382,8 @@ msgstr ""
 msgid "Alert %d disabled (created %s)"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr ""
 
@@ -387,10 +395,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Alle"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Alle Meldungen"
@@ -430,6 +440,11 @@ msgstr "Alle Meldungen von %s bis %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "In der Kategorie %s gemeldet"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -466,7 +481,7 @@ msgstr "Anonym"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -479,7 +494,7 @@ msgid "Another user"
 msgstr "User hinzufügen"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -488,8 +503,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -500,7 +515,7 @@ msgstr ""
 msgid "Area covered"
 msgstr "Gebiet"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -514,27 +529,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr "User an Gegenden zuweisen"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Nachricht an zuständige Stelle:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Einer anderen Kategorie (DA) zuweisen"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Nachricht an zuständige Stelle"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "An Fachbereich zuweisen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "User an Gegenden zuweisen"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Alle Kategorien"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Besten Dank für Ihre Meldung. Wir haben Ihr Anliegen an %s weitergeleitet, da es nicht in den Zuständigkeitsbereich der am Pilot beteiligten Fachbereiche fällt.<br/>Freundliche Grüsse <br/>Ihre Stadt Zürich"
@@ -547,7 +567,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -555,11 +575,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Rückmeldung an User"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -571,12 +591,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Vermeiden Sie persönliche Informationen auf dem Foto wie Kfz-Kennzeichen oder Personen"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Überprüfung ausstehend"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Zurück"
@@ -597,14 +618,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Externe Adressen"
 
@@ -617,11 +636,13 @@ msgstr "Externe Adressen"
 msgid "Body"
 msgstr "Organisation"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Organisation"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -633,8 +654,7 @@ msgstr "Falls Sie kein E-Mail erhalten haben, überprüfen Sie bitte Ihren Spamo
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Karte nicht sichtbar? <em>Überspringen Sie diesen Schritt</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -650,15 +670,13 @@ msgstr "Kategorie:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -668,7 +686,7 @@ msgstr "Kategorie"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Kategorie von ‘%s’ nach ‘%s’ geändert"
 
@@ -691,6 +709,11 @@ msgstr "Kategorie:"
 msgid "Change"
 msgstr "Anpassen"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Passwort ändern"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -707,7 +730,7 @@ msgstr "Passwort ändern"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -717,12 +740,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -759,8 +782,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -770,11 +793,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Beantwortet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr ""
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -807,13 +826,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr ""
@@ -930,7 +948,7 @@ msgstr "Erfasse eine Meldung"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Kategorie erstellen"
@@ -940,27 +958,25 @@ msgstr "Kategorie erstellen"
 msgid "Create priority"
 msgstr "Priorität erstellen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Vorlage erstellen"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Erstellt"
@@ -969,6 +985,17 @@ msgstr "Erstellt"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Erstellt"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Erstellt"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -980,10 +1007,6 @@ msgstr "Erstellt"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -993,19 +1016,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "Bisher wurden noch keine Organisationseinheiten erfasst."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Kunde nicht kontaktierbar"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1017,7 +1042,7 @@ msgstr "Innerhalb von fünf Arbeitstagen abgeschlossen"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1027,7 +1052,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Vorlage löschen"
@@ -1049,9 +1074,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1060,7 +1083,7 @@ msgstr "Beschreibung"
 msgid "Destination"
 msgstr "Beschreibung"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1096,7 +1119,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1104,6 +1127,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "In der Kategorie %s gemeldet"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "In der Kategorie %s gemeldet"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1138,25 +1171,25 @@ msgstr ""
 msgid "Don't like forms?"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Fotos hierhin ziehen oder <u>hochladen</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1168,7 +1201,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1180,7 +1213,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Anpassen"
@@ -1191,12 +1224,11 @@ msgstr "Anpassen"
 msgid "Edit body details"
 msgstr "Details editieren"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Kategorie editieren"
 
@@ -1204,17 +1236,15 @@ msgstr "Kategorie editieren"
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Priorität editieren"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Meldungen editieren"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1251,8 +1281,9 @@ msgstr ""
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1261,15 +1292,14 @@ msgstr ""
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Ihre E-Mail Adresse"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1289,12 +1319,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "E-Mail verifiziert:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "E-mail:"
@@ -1357,11 +1388,11 @@ msgstr ""
 msgid "Endpoint"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
 msgstr "Ungefähre Adresse des Schadens"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Geben Sie eine Adresse an"
 
@@ -1388,10 +1419,10 @@ msgstr "Beschreiben Sie den Schaden"
 msgid "Error"
 msgstr "Fehler"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Alles"
 
@@ -1404,7 +1435,7 @@ msgstr "Beispieladresse"
 msgid "Examples:"
 msgstr "Beispiele:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Bestehende Kategorie"
 
@@ -1413,7 +1444,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1438,7 +1469,7 @@ msgid "External body"
 msgstr "Externe Stelle"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1450,20 +1481,20 @@ msgstr ""
 msgid "External team"
 msgstr "Externes Team"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "Zusätzliche Felder"
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1496,20 +1527,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Alle Meldungen"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Fotos von neuen Meldungen in der Nähe"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Neu"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1539,7 +1575,7 @@ msgstr "Als gelöscht markieren"
 msgid "Flag user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr ""
@@ -1548,7 +1584,7 @@ msgstr ""
 msgid "Flagged reports and users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1556,8 +1592,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr ""
 
@@ -1583,11 +1619,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Ihr Passwort"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "An externe Stelle weitergeleitet"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Wunsch an externe Stelle weitergeleitet"
 
@@ -1597,12 +1633,20 @@ msgstr "Wunsch an externe Stelle weitergeleitet"
 msgid "Frequently Asked Questions"
 msgstr "Hilfe"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1624,7 +1668,7 @@ msgstr "Beschreiben Sie den Schaden"
 msgid "Get updates of problems in this %s"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr ""
 
@@ -1640,15 +1684,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1658,7 +1702,7 @@ msgstr "Los"
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1684,6 +1728,7 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1718,7 +1763,8 @@ msgstr "Unsichtbar"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1746,7 +1792,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Stecknadeln ausblenden"
 
@@ -1800,11 +1846,9 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1823,15 +1867,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1845,7 +1889,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1869,7 +1913,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1906,7 +1950,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1930,6 +1974,16 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+msgid "In wards"
+msgstr ""
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1939,20 +1993,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Persönliche Angaben des Meldenden mitsenden"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1969,16 +2023,12 @@ msgstr "Interne Notizen"
 msgid "Internal notes"
 msgstr "Interne Notizen"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2030,13 +2080,13 @@ msgstr "Letzte Bearbeitung"
 msgid "Last&nbsp;update:"
 msgstr "Letzte Bearbeitung"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Älteste Bearbeitung"
@@ -2053,7 +2103,7 @@ msgstr "Liste aller Meldungen"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr ""
@@ -2091,17 +2141,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2119,19 +2170,20 @@ msgstr ""
 msgid "MAP"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2145,24 +2197,24 @@ msgstr ""
 msgid "Mark as sent"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Nachricht"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Nachricht an zuständige Stelle"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Nachricht an zuständige Stelle"
 
@@ -2175,7 +2227,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -2183,8 +2235,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Meldungsdetails anpassen"
 
@@ -2207,7 +2258,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "Innerhalb eines Arbeitstages moderiert"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2217,14 +2268,14 @@ msgstr ""
 msgid "Month"
 msgstr "Monat"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Am meisten kommentiert"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2252,9 +2303,10 @@ msgstr ""
 msgid "Name"
 msgstr "Name"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Name:"
@@ -2272,7 +2324,7 @@ msgstr "Zu dieser Meldung zoomen"
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -2280,12 +2332,12 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2308,7 +2360,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Neue Organisation hinzugefügt"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr ""
 
@@ -2322,8 +2374,8 @@ msgstr "Neue E-Mail Adresse"
 msgid "New field"
 msgstr "Feld hinzufügen"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Neue interne Notiz"
 
@@ -2331,13 +2383,13 @@ msgstr "Neue interne Notiz"
 msgid "New local problems on FixMyStreet"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Neue Nachricht an die Kommunikation"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Neues Passwort"
 
@@ -2414,7 +2466,7 @@ msgstr "Neue Vorlage"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Neueste"
@@ -2427,7 +2479,6 @@ msgstr "Weiter"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2436,11 +2487,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Nein"
 
@@ -2452,11 +2503,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr ""
 
@@ -2472,8 +2524,8 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Bearbeitung abschliessen"
 
@@ -2509,15 +2561,15 @@ msgstr ""
 msgid "None"
 msgstr "Keine"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2525,10 +2577,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Anderer Fachbereich zuständig"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr ""
@@ -2576,12 +2632,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2589,12 +2645,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Alter Status"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Älteste"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2603,7 +2659,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2634,7 +2690,7 @@ msgstr ""
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2646,7 +2702,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2654,16 +2710,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2695,7 +2751,7 @@ msgstr ""
 msgid "Parent"
 msgstr "Gehört zu"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Alle Kategorien"
@@ -2704,13 +2760,13 @@ msgstr "Alle Kategorien"
 msgid "Partial"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Passwort"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Ihr Passwort wurde geändert"
@@ -2724,7 +2780,7 @@ msgstr "Passwort"
 msgid "Permissions"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2732,19 +2788,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefonnummer:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Telefonnummer (optional)"
 
@@ -2752,30 +2813,26 @@ msgstr "Telefonnummer (optional)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr "Telefonnummer verifiziert:"
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefonnummer:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2795,9 +2852,8 @@ msgstr "Foto benötigt"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Fotos"
@@ -2806,7 +2862,7 @@ msgstr "Fotos"
 msgid "Photos of recent nearby reports"
 msgstr "Fotos von neuen Meldungen in der Nähe"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2820,6 +2876,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Pin auf der Karte absetzen"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2847,27 +2908,26 @@ msgid "Please check your email address is correct"
 msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Bitte wählen Sie eine Kategorie"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2886,27 +2946,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "Obligatorisches Feld"
 
@@ -2919,16 +2979,16 @@ msgstr "Obligatorisches Feld"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2939,20 +2999,20 @@ msgstr "Bitte geben Sie eine gültige E-Mail Adresse an"
 msgid "Please enter a valid email address"
 msgstr "Bitte geben Sie eine gültige E-Mail Adresse an"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Bitte beschreiben Sie den Schaden"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2968,7 +3028,7 @@ msgid "Please enter your first name"
 msgstr "Bitte geben Sie Ihren Namen an"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr ""
@@ -2980,9 +3040,9 @@ msgstr "Bitte geben Sie Ihren Namen an"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Bitte geben Sie Ihren Namen an"
@@ -3023,19 +3083,19 @@ msgstr "Füllen Sie das Formular mit den Details des Schadens aus und beschreibe
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Bitte geben Sie eine gültige E-Mail Adresse an"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3062,24 +3122,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Hinweise:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -3087,7 +3151,7 @@ msgstr ""
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Organisation wählen"
 
@@ -3099,7 +3163,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -3107,12 +3171,12 @@ msgstr ""
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3120,27 +3184,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr ""
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr ""
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -3156,7 +3216,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3164,11 +3224,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Zurück"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3184,9 +3244,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr ""
 
@@ -3234,7 +3294,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr "Meldungen nach Status sortiert"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr ""
 
@@ -3242,8 +3302,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Meldungen"
@@ -3268,18 +3327,18 @@ msgstr "Meldungen, welche kürzlich beantwortet wurden"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Meldungen innerhalb %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3287,7 +3346,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Meldungen innerhalb %s, %s"
 
@@ -3295,11 +3354,15 @@ msgstr "Meldungen innerhalb %s, %s"
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3313,11 +3376,11 @@ msgstr "Meldung aktualisieren"
 msgid "Provide update as"
 msgstr "Meldung aktualisieren als"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr ""
 
@@ -3325,12 +3388,12 @@ msgstr ""
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Rückmeldung an User"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Rückmeldung an User"
 
@@ -3372,11 +3435,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -3384,11 +3447,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -3396,13 +3459,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -3416,11 +3479,11 @@ msgstr ""
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3433,7 +3496,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Erhalten Sie Aktualisierungen dieser Meldung."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3447,7 +3510,7 @@ msgstr "Kürzlich erfasste Meldungen, %s"
 msgid "Recently reported problems"
 msgstr "Kürzlich erfasste Meldungen:"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Neueste Bearbeitung"
@@ -3460,7 +3523,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "«Züri wie neu» dient dazu Schäden an der Infrastruktur zu melden. Meldungen und Wünsche bezüglich Verbesserungen an der Infrastruktur sowie Gestaltungsvorschläge können über «Züri wie neu» nicht berücksichtigt werden. Notfälle müssen der Polizei gemeldet werden via Telefon 117."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3472,8 +3536,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3488,17 +3552,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Antwort an User"
 
@@ -3506,14 +3574,14 @@ msgstr "Antwort an User"
 msgid "Report"
 msgstr "Meldung"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "Meldungs-ID"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3522,7 +3590,7 @@ msgid "Report a problem"
 msgstr "Eine Meldung erfassen"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3538,7 +3606,7 @@ msgid "Report anonymously"
 msgstr "Anonym gemeldet um"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3574,7 +3642,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Melden Sie Schäden an der Infrastruktur von Zürich"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Anonym gemeldet um"
@@ -3585,7 +3653,7 @@ msgstr "Anonym gemeldet um"
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Gemeldet von %s um %s"
@@ -3599,27 +3667,27 @@ msgstr "Gemeldet von"
 msgid "Reported in the %s category"
 msgstr "In der Kategorie %s gemeldet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "In der Kategorie %s um %s gemeldet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Gemeldet in der Kategorie %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Anonym gemeldet von %s um %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -3638,17 +3706,15 @@ msgstr "Gemeldet"
 msgid "Reporting a problem"
 msgstr "Ihre Meldung"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Meldungen"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3676,15 +3742,15 @@ msgid "Reports published"
 msgstr "Beantwortet"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3697,7 +3763,7 @@ msgstr "Ausstehender Meldungsversand"
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3750,39 +3816,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "Richtiger Ort?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Links drehen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3798,20 +3870,20 @@ msgstr "Durch das Drehen des Fotos gehen nicht gespeicherte Änderungen verloren
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3828,13 +3900,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Meldungen suchen"
 
@@ -3847,7 +3918,7 @@ msgstr "User suchen"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Meldungen suchen"
 
@@ -3862,12 +3933,12 @@ msgstr "Suchen:"
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3877,8 +3948,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3888,7 +3958,7 @@ msgid "Select a body"
 msgstr "Organisation wählen"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Gebiet wählen"
@@ -3909,7 +3979,7 @@ msgstr ""
 msgid "Select:"
 msgstr "Auswählen"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3922,7 +3992,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3931,11 +4001,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "Meldung zurückgewiesen"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3973,7 +4043,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3984,7 +4054,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4009,8 +4079,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4021,7 +4091,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Zeige Stecknadeln"
 
@@ -4081,7 +4151,7 @@ msgid "Some photos of recent reports"
 msgstr ""
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4090,12 +4160,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4113,9 +4182,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Diese Adresse wurde nicht gefunden."
 
@@ -4125,13 +4194,13 @@ msgstr "Diese Adresse wurde nicht gefunden."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Diese Adresse wurde nicht gefunden."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4146,11 +4215,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Sortieren nach"
@@ -4159,11 +4228,11 @@ msgstr "Sortieren nach"
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4187,18 +4256,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Status"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4207,31 +4276,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Status"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Statistik"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr ""
 
@@ -4249,7 +4315,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "FB/Externe"
 
@@ -4268,50 +4334,48 @@ msgstr "Titel"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Abschicken"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Speichern"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Erfasst"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4323,7 +4387,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4337,20 +4401,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Fassen Sie Ihre Änderungen zusammen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Zusammenfassung"
 
@@ -4361,14 +4424,19 @@ msgstr "Alle Meldungen"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4386,13 +4454,18 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr "Vorlage &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Vorlagen"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Älteste Bearbeitung"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr ""
@@ -4414,6 +4487,10 @@ msgstr ""
 msgid "Text:"
 msgstr ""
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+msgid "Textarea"
+msgstr ""
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4443,7 +4520,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4455,27 +4532,29 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Sie können Schäden nur innerhalb der Stadt Zürich melden. Verwenden Sie dafür die Adressuche."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Die Meldung wurde als gesendet markiert."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Diese Meldung wurde von «Züri wie neu» entfernt."
 
@@ -4521,8 +4600,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4577,7 +4656,7 @@ msgstr ""
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4639,8 +4718,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4673,7 +4752,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4691,12 +4770,12 @@ msgstr ""
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -4704,7 +4783,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -4780,10 +4859,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Diese Information wird benötigt"
 
@@ -4800,19 +4879,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Dieser Schaden wurde behoben"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Dieser Schaden wurde nicht behoben"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4825,26 +4908,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Überprüfung ausstehend"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4852,15 +4935,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Aufwand (in Minuten)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4884,6 +4970,10 @@ msgstr "Titel"
 msgid "Title:"
 msgstr "Titel"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4909,7 +4999,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4934,11 +5024,6 @@ msgstr ""
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4961,16 +5046,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4980,7 +5065,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5010,10 +5095,10 @@ msgstr "Unbekannter Fehler"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5025,13 +5110,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Speichern"
 
@@ -5082,29 +5167,27 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Aktualisiert!"
 
@@ -5115,7 +5198,7 @@ msgstr "Aktualisiert!"
 msgid "Updates"
 msgstr "Antwort"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5145,6 +5228,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5158,8 +5249,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5177,7 +5268,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5190,27 +5281,25 @@ msgstr "Diese Suche sucht in den Namen der Benützer und deren E-Mail-Adressen."
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5218,9 +5307,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Aktualisiert"
 
@@ -5246,7 +5335,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Meldung auf der Webseite betrachten"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5254,7 +5343,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5272,7 +5361,7 @@ msgstr "Meldung anschauen"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -5342,7 +5431,7 @@ msgstr "Wann gesendet"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5362,7 +5451,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr ""
 
@@ -5374,7 +5463,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Meldungen gänzlich in Grossbuchstaben zu schreiben macht diese unleserlich. Ebenso wenn keine Satzzeichen verwendet werden."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5385,12 +5473,12 @@ msgstr "Meldungen gänzlich in Grossbuchstaben zu schreiben macht diese unleserl
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Ja"
 
@@ -5403,7 +5491,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5416,7 +5504,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5425,7 +5513,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Danke! Sie können Ihre aktualisierte Meldung <a href=\"%s%s\">auf der Webseite anschauen</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5455,7 +5543,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5465,7 +5553,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Nicht freigeschaltet; Bitte geben Sie eine Adresse an"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5473,7 +5561,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 #, fuzzy
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Sie haben dieser Meldung bereits Fotos angehängt. Sie können maximal 3 Fotos anhängen (wenn Sie mehr anhängen, wird das Älteste entfernt)."
@@ -5483,8 +5571,7 @@ msgstr "Sie haben dieser Meldung bereits Fotos angehängt. Sie können maximal 3
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Sie haben dieser Meldung bereits Fotos angehängt. Sie können maximal 3 Fotos anhängen (wenn Sie mehr anhängen, wird das Älteste entfernt)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5548,9 +5635,9 @@ msgstr "Ihre Meldungen"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Ihr Account"
@@ -5559,13 +5646,14 @@ msgstr "Ihr Account"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5594,16 +5682,16 @@ msgstr "Ihr Name"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5623,8 +5711,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5657,7 +5745,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5688,19 +5776,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5708,8 +5796,8 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr ""
 
@@ -5740,6 +5828,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr "von %s verschiedenen Personen"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5757,7 +5849,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5840,12 +5932,12 @@ msgid "today"
 msgstr "heute"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5870,7 +5962,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr ""
 
@@ -5930,7 +6022,7 @@ msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5951,7 +6043,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5972,21 +6064,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> bearbeitete Meldung im letzten Monat"
 msgstr[1] "<big>%s</big> bearbeitete Meldungen im letzten Monat"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> Meldung in der letzten Woche"
 msgstr[1] "<big>%s</big> Meldungen in der letzten Woche"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> Meldung in letzter Zeit"
 msgstr[1] "<big>%s</big> Meldungen in letzter Zeit"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6021,20 +6113,23 @@ msgid_plural "last updated %d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid "Filter report list"
+#~ msgstr "Alle Meldungen"
+
 #~ msgid "Coordinates:"
 #~ msgstr "Koordinaten"
 
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
index 532c20acf..23a08fb7d 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2020-03-05 09:59+0000\n"
 "Last-Translator: l0cKy93 <corvin.blanc@yahoo.de>, 2020\n"
 "Language-Team: German (Germany) (https://www.transifex.com/mysociety/teams/12067/de_DE/)\n"
@@ -22,8 +22,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " und "
@@ -49,7 +49,7 @@ msgstr "%d bearbeitet von %s"
 
 #: templates/web/base/pagination.html:7
 msgid "%d to %d of %d"
-msgstr "%d an %d von %d"
+msgstr "%d - %d von %d"
 
 #: templates/web/base/admin/users/import.html:42
 msgid "%d users already existed"
@@ -58,7 +58,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Zusammenfassungen"
 
@@ -69,7 +69,7 @@ msgstr "%s Admin:"
 
 #: templates/web/base/status/stats.html:26
 msgid "%s bodies"
-msgstr ""
+msgstr "%s Verwaltungen"
 
 #: templates/web/base/status/stats.html:24
 msgid "%s confirmed alerts, %s unconfirmed"
@@ -78,7 +78,7 @@ msgstr "%s bestätigte Alarme, %s unbestätigt"
 #: templates/web/base/status/stats.html:27
 #: templates/web/zurich/admin/index.html:6
 msgid "%s council contacts &ndash; %s confirmed, %s unconfirmed"
-msgstr ""
+msgstr "%s Verwaltungskontakte &ndash; %s eingetragen als bestätigt, %s als unbestätigt"
 
 #. ("%s is the site name")
 #: templates/web/base/alert/_index_text.html:3
@@ -98,7 +98,7 @@ msgstr "%s besitzt die Möglichkeit Sie per RSS Feed oder E-Mail bei Bearbeitung
 
 #: templates/web/base/status/stats.html:23
 msgid "%s live updates"
-msgstr "%s Aktualisierungen in Echtzeit"
+msgstr "%s Updates in Echtzeit"
 
 #: templates/web/base/dashboard/index.html:166
 #: templates/web/base/dashboard/index.html:169
@@ -113,7 +113,7 @@ msgstr "%s Fragebögen versandt &ndash; %s beantwortet (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>-Beitragende"
 
@@ -159,6 +159,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -177,8 +179,8 @@ msgstr "(gesendet an beide)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Wählen Sie eine Kategorie --"
@@ -204,17 +206,18 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> gespeichert."
 
@@ -244,7 +247,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ja</strong>, ich habe ein Passwort"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -254,14 +257,14 @@ msgstr ""
 
 #: templates/web/base/report/new/form_user.html:8
 msgid "About the problem"
-msgstr "Problemzusammenfassung"
+msgstr "Meldungsübersicht"
 
 #: perllib/FixMyStreet/App/Controller/Root.pm:128
 msgid "Access denied"
 msgstr "Zugriff verweigert"
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr "Zwei-Faktor-Authentifizierung aktivieren"
 
@@ -281,7 +284,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Füge Kontakt mit dem Formular unten hinzu."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 msgid "Add another parent category"
 msgstr "Füge neue Oberkategorie hinzu"
 
@@ -289,7 +292,7 @@ msgstr "Füge neue Oberkategorie hinzu"
 #: templates/web/base/admin/bodies/index.html:78
 #: templates/web/zurich/admin/bodies/form.html:63
 msgid "Add body"
-msgstr ""
+msgstr "Verwaltung erstellen"
 
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:7
@@ -313,7 +316,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Füge neue Kategorie hinzu"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "Füge Option hinzu"
 
@@ -322,30 +325,29 @@ msgstr "Füge Option hinzu"
 msgid "Add phone number"
 msgstr "Telefonnummer hinzufügen"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
 msgid "Add to shortlist"
-msgstr ""
+msgstr "Zur Arbeitsliste hinzufügen"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Benutzer hinzufügen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Bearbeite/Ergänze Problem Kategorien"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Bearbeite/Ergänze Antwortprioritäten"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Bearbeite/Ergänze Antwortvorlagen"
 
@@ -355,12 +357,18 @@ msgstr "%s hinzugefügt"
 
 #: templates/web/base/report/_main.html:158
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
-msgstr ""
+msgstr "Wenn Sie die Meldung zu Ihrer Arbeitsliste hinzufügen wird diese aus der Arbeitsliste von %s entfernt."
 
 #: templates/web/base/main_nav_items.html:31
 msgid "Admin"
 msgstr "Admin"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Wiederholen:"
@@ -373,8 +381,8 @@ msgstr "Benachrichtigung %d erstellt für %s, Typ %s, Parameter %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Alarm %d deaktiviert (erstellt %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Benachrichtige mich zu zukünftigen Änderungen"
 
@@ -386,10 +394,12 @@ msgstr "Benachrichtigungen:"
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Alle"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Alle Meldungen"
@@ -429,9 +439,14 @@ msgstr "Alle Berichte zwischen %s und %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Meldungen dieser Kategorie ausblenden"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
-msgstr ""
+msgstr "Wurde es bereits gemeldet?"
 
 #: templates/web/base/my/anonymize.html:20
 msgid "Alternatively, we can hide your name on <strong>all of your reports and updates</strong> across the site:"
@@ -452,7 +467,7 @@ msgstr "Eine E-Mail-Adresse."
 
 #: templates/web/base/questionnaire/index.html:33
 msgid "An update marked this problem as fixed."
-msgstr "Eine Aktualisierung hat das Problem als gelöst markiert."
+msgstr "Ein Update hat das Problem als gelöst markiert."
 
 #: templates/web/base/admin/list_updates.html:33
 #: templates/web/base/admin/problem_row.html:20
@@ -464,7 +479,7 @@ msgstr "Anonym"
 msgid "Anonymous user"
 msgstr "Anonymer Benutzer"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -477,17 +492,17 @@ msgid "Another user"
 msgstr "Anderer Benutzer"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
-msgstr ""
+msgstr "Wollen Sie den Upload abbrechen ?"
 
 #. ("JS")
 #: templates/web/base/admin/manifesttheme/form.html:62
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
@@ -498,7 +513,7 @@ msgstr "Sind Sie sicher?"
 msgid "Area covered"
 msgstr "Gebiet abgedeckt"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Gebiet:"
 
@@ -511,30 +526,35 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
-msgstr ""
+msgstr "Einer anderen Kategorie zuweisen:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
-msgstr ""
+msgstr "Externer Verwaltung zuweisen:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
-msgstr ""
+msgstr "Unterabteilung zuweisen:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Alle Kategorien"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
-msgstr ""
+msgstr "Wird bearbeitet von %s"
 
 #: templates/web/base/open311/index.html:76
 msgid "At most %d requests are returned in each query.  The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date."
@@ -544,7 +564,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -552,28 +572,29 @@ msgstr ""
 msgid "Auto Response"
 msgstr "Automatische Antwort"
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Automatische Antwort:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
 #: templates/web/base/reports/index.html:112
 msgid "Average time between a problem being reported and being fixed, last 100 reports."
-msgstr ""
+msgstr "Durchschnittliche Zeitdauer zwischen Problemmeldung und Behebung in den letzten 100 Meldungen."
 
 #: templates/web/base/report/new/after_photo.html:7
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Vermeiden Sie Fotos mit persönlichen Informationen wie Gesichter von Personen oder Autokennzeichen"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Wartet auf Moderation"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Zurück"
@@ -588,22 +609,20 @@ msgstr "Hintergrundfarbe"
 
 #: templates/web/base/admin/report_blocks.html:18
 msgid "Ban user"
-msgstr ""
+msgstr "Benutzer sperren"
 
 #: templates/web/base/admin/extra-metadata-item.html:35
 msgid "Behaviour"
 msgstr "Verhalten"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
-msgstr ""
+msgstr "Verwaltungen"
 
 #: templates/web/base/admin/flagged.html:17
 #: templates/web/base/admin/index.html:69
@@ -612,26 +631,27 @@ msgstr ""
 #: templates/web/base/admin/users/import.html:48
 #: templates/web/base/admin/users/index.html:45
 msgid "Body"
-msgstr ""
+msgstr "Verwaltung"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
-msgstr ""
+msgstr "Verwaltung:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr "CSV Datei"
 
 #: templates/web/base/auth/token.html:27 templates/web/base/email_sent.html:20
 msgid "Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time."
-msgstr ""
+msgstr "Prüfen Sie Ihren Spam Ordner, wenn Sie die Mail noch nicht erhalten haben."
 
 #: templates/web/base/around/_report_banner.html:5
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Wird keine Karte angezeigt? <em>Diesen Schritt überspringen</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -647,15 +667,13 @@ msgstr "Kategorien:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -665,7 +683,7 @@ msgstr "Kategorie"
 msgid "Category and State"
 msgstr "Kategorie und Status"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Kategorie wurde geändert von '%s' zu '%s'"
 
@@ -688,6 +706,11 @@ msgstr "Kategorie:"
 msgid "Change"
 msgstr "Ändern"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Passwort ändern"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -704,28 +727,28 @@ msgstr "Passwort ändern"
 msgid "Change phone number"
 msgstr "Telefonnummer ändern"
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
-msgstr ""
+msgstr "Zweifaktor Authentifizierung ändern"
 
 #: templates/web/base/admin/bodies/_category_field.html:3
 msgid ""
 "Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n"
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
-msgstr ""
+msgstr "Geben Sie der <strong>Kategorie</strong> einen aussagekräftigen Namen. Die Kategoriennamen werden beim Erfassen einer neuen Meldung den Benutzer in einem Auswahlmenü angezeigt."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr "Lösche Offline Daten"
 
 #: templates/web/base/around/_report_banner.html:2
 msgid "Click map to report a problem"
-msgstr "Klicken Sie in die Karte um eine Meldung zu erfassen"
+msgstr "Auf die Karte klicken um den Ort des Problems zu erfassen"
 
 #: templates/web/base/email_sent.html:13
 msgid "Click the link in our confirmation email to activate your alert."
@@ -756,8 +779,8 @@ msgid "Close"
 msgstr "Schließen"
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -767,13 +790,9 @@ msgstr "Schließen"
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr ""
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
-msgstr ""
+msgstr "Geschlossen für Updates"
 
 #: templates/web/base/admin/reports/edit.html:38
 msgid "Co-ordinates:"
@@ -784,17 +803,17 @@ msgstr "Koordinaten:"
 #: templates/web/base/admin/reportextrafields/edit.html:24
 #: templates/web/base/admin/reportextrafields/index.html:7
 msgid "Cobrand"
-msgstr ""
+msgstr "Cobrand"
 
 #: templates/web/base/admin/reports/edit.html:99
 #: templates/web/base/admin/update_edit.html:54
 msgid "Cobrand data:"
-msgstr ""
+msgstr "Cobrand Daten:"
 
 #: templates/web/base/admin/reports/edit.html:98
 #: templates/web/base/admin/update_edit.html:53
 msgid "Cobrand:"
-msgstr ""
+msgstr "Cobrand:"
 
 #: templates/web/base/admin/extra-metadata-item.html:29
 #: templates/web/base/auth/2fa/form-add.html:11
@@ -804,13 +823,12 @@ msgid "Code"
 msgstr "Code"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
-msgstr ""
+msgstr "Karte verkleinern"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Konfiguration"
@@ -927,7 +945,7 @@ msgstr "Erfasse eine Meldung"
 msgid "Create an account"
 msgstr "Konto erstellen"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Kategorie erstellen"
@@ -937,27 +955,25 @@ msgstr "Kategorie erstellen"
 msgid "Create priority"
 msgstr "Priorität festlegen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
-msgstr ""
+msgstr "Meldung/Aktualisierung als anonymer Benutzer erstellen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
-msgstr ""
+msgstr "Meldung/Updates als Verwaltung erstellen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Vorlage erstellen"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Erstellt"
@@ -966,6 +982,17 @@ msgstr "Erstellt"
 msgid "Created %d new users"
 msgstr "%d Benutzer erstellt"
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Erstellt"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Erstellt"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -977,10 +1004,6 @@ msgstr "Erstellt:"
 msgid "Current password:"
 msgstr "Aktuelles Passwort:"
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -988,21 +1011,23 @@ msgstr ""
 #: templates/web/base/admin/bodies/index.html:9
 #: templates/web/base/admin/index.html:17
 msgid "Currently no bodies have been created."
-msgstr ""
+msgstr "Derzeit existieren keine Verwaltungen."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Übersichtsseite"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr "Zwei-Faktor-Authentifizierung deaktivieren"
 
@@ -1014,7 +1039,7 @@ msgstr ""
 msgid "Default"
 msgstr "Standard"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1024,7 +1049,7 @@ msgid "Delete"
 msgstr "Löschen"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Vorlage löschen"
@@ -1042,12 +1067,10 @@ msgstr "Gelöscht"
 #: templates/web/base/report/_main.html:125
 #: templates/web/base/report/update.html:56
 msgid "Describe why you are moderating this"
-msgstr ""
+msgstr "Gründe für die Moderierung"
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1055,7 +1078,7 @@ msgstr "Beschreibung"
 msgid "Destination"
 msgstr "Bearbeitende Stelle"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr "Maximal %d Zeichen für die detaillierte Beschreibung."
 
@@ -1091,13 +1114,23 @@ msgid "Disable"
 msgstr "Deaktivieren"
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
-msgstr ""
+msgstr "Formular deaktivieren wenn diese Kategorie ausgewählt ist"
 
 #: templates/web/base/admin/extra-metadata-option.html:18
 msgid "Disable form when this option is selected"
-msgstr ""
+msgstr "Formular deaktivieren wenn diese Option ausgewählt ist"
+
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Meldungen dieser Kategorie ausblenden"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Meldungen dieser Kategorie ausblenden"
 
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
@@ -1110,7 +1143,7 @@ msgstr "Änderungen verwerfen"
 
 #: templates/web/base/admin/extra-metadata-item.html:67
 msgid "Display as"
-msgstr ""
+msgstr "Angezeigt als"
 
 #: templates/web/base/admin/extra-metadata-option.html:10
 msgid "Displayed label"
@@ -1133,26 +1166,26 @@ msgstr "Weiß ich nicht"
 msgid "Don't like forms?"
 msgstr "Sie mögen keine Formulare?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Fotos hier ablegen oder <u>Foto hochladen</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr "Drop-down Liste"
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
-msgstr ""
+msgstr "Dublikat zu"
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
-msgstr ""
+msgstr "Dublikate"
 
 #: templates/web/base/admin/bodies/body.html:136
 msgid ""
@@ -1162,7 +1195,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1174,7 +1207,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -1183,38 +1216,35 @@ msgstr "Bearbeiten"
 #: templates/web/base/admin/index.html:43
 #: templates/web/zurich/admin/bodies/body.html:47
 msgid "Edit body details"
-msgstr ""
+msgstr "Details einer Verwaltung anpassen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
-msgstr ""
+msgstr "Benutzerrechte ändern"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
-msgstr ""
+msgstr "Kategorie der Meldung ändern"
 
 #: templates/web/base/report/new/form_user.html:13
 msgid "Edit report details"
-msgstr ""
+msgstr "Meldung überarbeiten"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
-msgstr ""
+msgstr "Bearbeitungspriorität ändern"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Meldung überarbeiten"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
 #: templates/web/base/report/update/form_user.html:8
 msgid "Edit your update"
-msgstr ""
+msgstr "Ihr Update bearbeiten"
 
 #: templates/web/base/admin/reports/edit.html:0
 #: templates/web/base/admin/reports/edit.html:15
@@ -1229,7 +1259,7 @@ msgstr "Problem %d wird bearbeitet"
 #: templates/web/base/admin/update_edit.html:1
 #: templates/web/zurich/admin/update_edit.html:1
 msgid "Editing update %d"
-msgstr "Aktualisierung %d wird bearbeitet"
+msgstr "Update %d wird bearbeitet"
 
 #: templates/web/base/admin/users/edit.html:2
 msgid "Editing user %d"
@@ -1245,8 +1275,9 @@ msgstr "Editor"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1255,15 +1286,14 @@ msgstr "Editor"
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr "E-Mail-Adresse (optional)"
 
@@ -1277,18 +1307,19 @@ msgstr "E-Mail-Benachrichtigung gelöscht"
 
 #: templates/web/base/auth/general.html:106
 msgid "Email me a link or text me a code to sign in"
-msgstr ""
+msgstr "Mail oder SMS zum anmelden schicken"
 
 #: templates/web/base/auth/general.html:108
 msgid "Email me a link to sign in"
 msgstr "Senden Sie mir zur Anmeldung einen Link per Email"
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "Verifizierte E-Mail:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "E-Mail:"
@@ -1351,11 +1382,11 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Endpunkt"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1382,10 +1413,10 @@ msgstr "Beschreiben sie den Mangel"
 msgid "Error"
 msgstr "Fehler"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Alles"
 
@@ -1398,7 +1429,7 @@ msgstr "Beispieladresse"
 msgid "Examples:"
 msgstr "Beispiele:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Vorhandene Kategorie"
 
@@ -1407,7 +1438,7 @@ msgid "Existing users won't be modified."
 msgstr "Bestehende Benutzerkonten werden nicht verändert."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr "Karte vergrößern"
 
@@ -1429,35 +1460,35 @@ msgstr "Externe URL"
 
 #: templates/web/base/admin/reports/edit.html:105
 msgid "External body"
-msgstr ""
+msgstr "Externe Verwaltung"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
-msgstr ""
+msgstr "Externer Statuscode"
 
 #: templates/web/base/admin/update_edit.html:57
 msgid "External status code:"
-msgstr ""
+msgstr "Externer Statuscode:"
 
 #: templates/web/base/admin/reports/edit.html:107
 msgid "External team"
-msgstr ""
+msgstr "Externes Team"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "Zusätzliche Felder"
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Zusätzliche Daten:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1473,16 +1504,16 @@ msgstr "Zusätzliche dem Benutzer angezeigte Frage"
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
-msgstr ""
+msgstr "Nachricht konnte nicht gesendet werden"
 
 #: templates/web/base/admin/reportextrafields/edit.html:58
 #: templates/web/base/admin/reportextrafields/index.html:9
 msgid "Fields"
-msgstr ""
+msgstr "Felder"
 
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:42
 msgid "File type not recognised. Please upload an image."
-msgstr ""
+msgstr "Dateityp wird nicht unterstützt. Bitte laden Sie ein Bild hoch."
 
 #: templates/web/base/report/form/user_loggedout_password.html:21
 #: templates/web/base/report/form/user_loggedout_password.html:8
@@ -1490,20 +1521,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
-msgstr ""
-
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Berichtliste filtern"
+msgstr "Filter"
 
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Erstes Mal"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Fotos von neuen Meldungen in der Nähe"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Neue Berichte"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1518,11 +1554,11 @@ msgstr "Gelöst"
 
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:67
 msgid "Fixed - Council"
-msgstr ""
+msgstr "Gelöst - Verwaltung"
 
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:68
 msgid "Fixed - User"
-msgstr ""
+msgstr "Gelöst - Benutzer"
 
 #: templates/web/base/admin/bodies/form.html:96
 #: templates/web/zurich/admin/bodies/form.html:47
@@ -1531,29 +1567,29 @@ msgstr "Auf inaktiv stellen"
 
 #: templates/web/base/admin/report_blocks.html:23
 msgid "Flag user"
-msgstr ""
+msgstr "Benutzer unter Beobachung stellen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
-msgstr ""
+msgstr "Unter Beobachtung"
 
 #: templates/web/base/admin/flagged.html:1
 msgid "Flagged reports and users"
-msgstr ""
+msgstr "Beobachtete Meldungen und Benutzer"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
-msgstr ""
+msgstr "Unter Beobachtung stehende Benutzer werden in die <a href='%s'>Beobachtungsliste</a> eingetragen. "
 
 #: templates/web/base/admin/flagged.html:31
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
-msgstr ""
+msgstr "Unter Beobachtung stehende Benutzer sind bei der Verwendung der Website nicht eingeschränkt. Die Liste dieser Nutzer ermöglicht es sie genauer zu betrachten."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
-msgstr ""
+msgstr "Unter Beobachtung:"
 
 #: templates/web/base/reports/_ward-list.html:6
 msgid "Follow a ward link to view only reports within that ward."
@@ -1565,7 +1601,7 @@ msgstr "Machen Sie ein Foto von der Situation und den Details"
 
 #: templates/web/base/admin/bodies/form.html:73
 msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
-msgstr ""
+msgstr "Mehr Informationen zu <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>wie FixMyStreet MapIt verwendet</a>."
 
 #: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:3
 msgid "Forgot password"
@@ -1577,13 +1613,13 @@ msgstr "Passwort vergessen"
 msgid "Forgotten your password?"
 msgstr "Passwort vergessen?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
-msgstr ""
+msgstr "An externe Stelle weiterleiten"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
-msgstr ""
+msgstr "Wunsch an externe Stelle weitergeleitet"
 
 #: templates/web/base/about/_sidebar.html:4
 #: templates/web/base/about/faq-en-gb.html:1
@@ -1591,12 +1627,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Häufig gestellte Fragen"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr "Generiere Token"
 
@@ -1606,19 +1650,19 @@ msgstr "Generiere Token"
 #: templates/web/base/report/new/duplicate_suggestions.html:39
 #: templates/web/base/report/new/duplicate_suggestions.html:45
 msgid "Get updates"
-msgstr "Aktualisierungen holen"
+msgstr "Aktualisieren"
 
 #: templates/web/base/reports/_rss.html:12
 #: templates/web/base/reports/_rss.html:4
 msgid "Get updates of %s problems"
-msgstr "Aktualisierungen von %s Problemen holen"
+msgstr "Updates zu %s Problemen holen"
 
 #: templates/web/base/reports/_rss.html:14
 #: templates/web/base/reports/_rss.html:4
 msgid "Get updates of problems in this %s"
-msgstr "Aktualisierungen von Problemen in diesem %s holen"
+msgstr "Updates zu Problemen in diesem %s holen"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "RSS Feed erstellen"
 
@@ -1628,21 +1672,21 @@ msgstr ""
 
 #: templates/web/base/questionnaire/completed.html:14
 msgid "Glad to hear it’s been fixed!"
-msgstr ""
+msgstr "Schön, dass das Problem gelöst wurde!"
 
 #: templates/web/base/admin/index.html:29
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1650,11 +1694,11 @@ msgstr "Los"
 
 #: templates/web/base/admin/reports/edit.html:101
 msgid "Going to send questionnaire?"
-msgstr ""
+msgstr "Mail mit Fragen senden?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
-msgstr ""
+msgstr "Besitzt Administrator Rechte"
 
 #: templates/web/base/admin/stats/index.html:7
 msgid "Graph of problem creation by status over time"
@@ -1670,7 +1714,7 @@ msgstr ""
 
 #: templates/web/base/questionnaire/index.html:34
 msgid "Has this problem been fixed?"
-msgstr ""
+msgstr "Wurde das Problem behoben?"
 
 #: templates/web/base/questionnaire/index.html:63
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
@@ -1678,6 +1722,7 @@ msgstr "Dies dies Ihre erste Problemmeldung an eine Behörde?"
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr "Heatmap"
 
@@ -1695,7 +1740,7 @@ msgstr ""
 
 #: templates/web/base/around/on_map_list_items.html:8
 msgid "Here are some other nearby reports:"
-msgstr ""
+msgstr "Gemeldete Probleme in der Umgebung:"
 
 #: templates/web/zurich/footer.html:11
 msgid "Hi %s"
@@ -1712,7 +1757,8 @@ msgstr "Unsichtbar"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1740,7 +1786,7 @@ msgstr "Meinen Namen in diesem Report verbergen"
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Stecknadeln ausblenden"
 
@@ -1793,11 +1839,9 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1816,15 +1860,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1838,7 +1882,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1862,7 +1906,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1899,13 +1943,13 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr "Beschreiben Sie für andere Administratoren welche Änderungen sie vorgenommen haben."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:166
 msgid "Illegal ID"
-msgstr "Unbekannt ID"
+msgstr "Unbekannte ID"
 
 #: perllib/FixMyStreet/App/Controller/Alert.pm:106
 msgid "Illegal feed selection"
@@ -1923,6 +1967,16 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+msgid "In wards"
+msgstr ""
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1930,22 +1984,22 @@ msgstr "Inaktiv"
 
 #: templates/web/base/tokens/confirm_alert.html:11
 msgid "Inbox zero, here we come!"
-msgstr "Alle gemeldeten Probleme sind gelöst!"
+msgstr "Keine gemeldeten Probleme!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Inkorrekter has_photo Wert \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1961,16 +2015,12 @@ msgstr "Interner Schlüssel"
 msgid "Internal notes"
 msgstr "Interne Hinweise"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Ungültiges Format %s angegeben."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2019,15 +2069,15 @@ msgstr "Letzte Bearbeitung:"
 
 #: templates/web/base/admin/problem_row.html:39
 msgid "Last&nbsp;update:"
-msgstr "Letzte&nbsp;Aktualisierung:"
+msgstr "Letztes&nbsp;Update:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Breitengrad/Längengrad:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Älteste Bearbeitung"
@@ -2044,7 +2094,7 @@ msgstr "Liste aller Meldungen"
 msgid "Loading reports…"
 msgstr "Lade Meldungen…"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Lade..."
@@ -2082,17 +2132,18 @@ msgid "Log in with Twitter"
 msgstr "Mit Twitter anmelden"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "Mit E-Mail anmelden"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr "Mit E-Mail/Text anmelden"
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr "Abmelden"
 
@@ -2110,19 +2161,20 @@ msgstr ""
 msgid "MAP"
 msgstr "KARTE"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
-msgstr "Favoritenliste verwalten"
+msgstr "Arbeitslisten verwalten"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2136,26 +2188,26 @@ msgstr "Karte"
 msgid "Mark as sent"
 msgstr "Als gesendet markieren"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
-msgstr ""
+msgstr "Stellen Sie Benutzer deren Verhalten sie prüfen wollen unter <strong>beobachtung</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Nachricht"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
-msgstr ""
+msgstr "Nachricht an externe Verwaltung:"
 
 #: templates/web/base/admin/bodies/contact-form.html:62
 #: templates/web/base/admin/extra-metadata-option.html:21
@@ -2164,58 +2216,57 @@ msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:72
 msgid "Missing bodies:"
-msgstr ""
+msgstr "Fehlende Verwaltungen:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Fehlendes jurisdiction_id"
 
 #: templates/web/base/report/_main.html:143
 msgid "Moderate"
-msgstr ""
+msgstr "Moderieren"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
 #: templates/web/base/report/_main.html:143
 msgid "Moderate this report"
-msgstr ""
+msgstr "Diese Meldung moderieren"
 
 #: templates/web/base/report/update.html:15
 msgid "Moderate this update"
-msgstr ""
+msgstr "Dieses Update moderieren"
 
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/_main.html:85
 #: templates/web/base/report/_update_state.html:19
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "Moderated by %s at %s"
-msgstr ""
+msgstr "Moderiert von %s (%s)"
 
 #: templates/web/zurich/admin/stats/index.html:55
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
-msgstr ""
+msgstr "Moderationsverlau"
 
 #: templates/web/base/dashboard/index.html:103
 #: templates/web/zurich/admin/stats/index.html:9
 msgid "Month"
 msgstr "Monat"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Meistkommentiert"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr "Mehrere Gruppen"
@@ -2243,9 +2294,10 @@ msgstr "Mehrere Gruppen"
 msgid "Name"
 msgstr "Name"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Name:"
@@ -2253,7 +2305,7 @@ msgstr "Name:"
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:20
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:26
 msgid "Names are limited to %d characters in length."
-msgstr ""
+msgstr "Namen sind auf %d Zeichen beschränkt."
 
 #: templates/web/base/report/inspect/information.html:40
 msgid "Navigate to this problem"
@@ -2263,24 +2315,26 @@ msgstr "Zu diesem Problem springen"
 msgid "Nearest calculated address:"
 msgstr "Berechnete Adresse:"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
-msgstr ""
+msgstr "Nächstgelegene Straße zum auf der Karte gesetzten Pin (automatisch über OpenStreetMap berechnet): %s%s"
 
 #: perllib/FixMyStreet/Geocode/Address.pm:21
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
-msgstr ""
+msgstr "Nächstgelegene Postleitzahl zum auf der Karte gesetzten Pin (automatisch berechnet): %s (%sm entfernt)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
-msgstr ""
+msgstr "Nächstgelegene Straße zum auf der Karte gesetzten Pin (automatisch über Bing Maps berechnet): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
 msgstr ""
+"Nächstgelegene Straße zum auf der Karte gesetzten Pin (automatisch über Bing Maps berechnet): %s\n"
+"\n"
 
 #: templates/web/base/auth/token.html:18
 msgid "Nearly done!"
@@ -2297,9 +2351,9 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:54
 msgid "New body added"
-msgstr ""
+msgstr "Verwaltung hinzugefügt"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Bearbeitende Stelle der Kategorie hinzugefügt"
 
@@ -2312,8 +2366,8 @@ msgstr "Neue E-Mail Adresse:"
 msgid "New field"
 msgstr "Neues Feld"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Neue interne Anmerkung:"
 
@@ -2321,13 +2375,13 @@ msgstr "Neue interne Anmerkung:"
 msgid "New local problems on FixMyStreet"
 msgstr "Neue lokale Probleme auf FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Neues Passwort:"
 
@@ -2404,7 +2458,7 @@ msgstr "Neue Vorlage"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Neueste"
@@ -2417,7 +2471,6 @@ msgstr "Weiter"
 msgid "Next:"
 msgstr "Nächster Schritt:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2426,11 +2479,11 @@ msgstr "Nächster Schritt:"
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Nein"
 
@@ -2442,11 +2495,12 @@ msgstr "Keine Gruppe"
 msgid "No account?"
 msgstr "Kein Benutzerkonto?"
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
-msgstr ""
+msgstr "Keine Verwaltung"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Kein Rat ausgewählt"
 
@@ -2456,16 +2510,16 @@ msgstr "Es liegen noch keine Bearbeitungen vor."
 
 #: templates/web/base/admin/flagged.html:25
 msgid "No flagged problems found."
-msgstr ""
+msgstr "Es stehen keine Meldungen unter Beobachtung."
 
 #: templates/web/base/admin/flagged.html:58
 msgid "No flagged users found."
-msgstr ""
+msgstr "Es stehen keine Benutzer unter Beobachtung."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
-msgstr "Keine weiteren Aktualisierungen"
+msgstr "Keine weiteren Updates"
 
 #: templates/web/base/report/form/user.html:33
 #: templates/web/base/report/form/user.html:40
@@ -2499,15 +2553,15 @@ msgstr "Keine Unterstützer"
 msgid "None"
 msgstr "Keine"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2515,10 +2569,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Nicht vorher berichtet"
@@ -2555,7 +2613,7 @@ msgstr ""
 
 #: templates/web/base/reports/index.html:127
 msgid "Number of problems reported in each category, in the last 7 days."
-msgstr ""
+msgstr "Meldungen pro Kategorie in den letzten 7 Tagen."
 
 #: templates/web/base/reports/index.html:99
 msgid "Number of problems reported in each ward, in the last 7 days."
@@ -2566,12 +2624,12 @@ msgid "Offline"
 msgstr "Offline"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr "Offline Daten gelöscht"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr "Offline Daten gespeichert"
 
@@ -2579,21 +2637,21 @@ msgstr "Offline Daten gespeichert"
 msgid "Old state"
 msgstr "Alter Status"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Älteste"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:46
 msgid "Only staff users will be able to add reports in this category."
-msgstr ""
+msgstr "Nur Verwaltungsmitglieder können Meldungen in dieser Kategorie erstellen."
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2624,19 +2682,19 @@ msgstr ""
 msgid "Open311 specification"
 msgstr "Open311-Spezifikation"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr "Optionen"
 
 #: templates/web/base/report/new/fill_in_details_form.html:8
 msgid "Or <a href=\"/\">search for a different location</a>"
-msgstr ""
+msgstr "Oder <a href=\"/\">nach anderer Stelle suchen</a>"
 
 #: templates/web/base/report/form/private_details.html:6
 msgid "Or sign in with password to prefill this information."
-msgstr ""
+msgstr "Oder melden Sie sich mit ihrem Account an"
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr "Oder RSS-Feed abonnieren"
 
@@ -2644,16 +2702,16 @@ msgstr "Oder RSS-Feed abonnieren"
 msgid "Order"
 msgstr "Reihenfolge"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2685,7 +2743,7 @@ msgstr "Seite nicht gefunden"
 msgid "Parent"
 msgstr "Übergeordnet"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 msgid "Parent categories"
 msgstr "Oberkategorien"
 
@@ -2693,13 +2751,13 @@ msgstr "Oberkategorien"
 msgid "Partial"
 msgstr "Teilweise"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Passwort (optional)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
 msgstr "Passwortzurücksetzen abgebrochen:"
 
@@ -2711,7 +2769,7 @@ msgstr "Passwort abgelaufen"
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Berechtigungen:"
 
@@ -2719,19 +2777,24 @@ msgstr "Berechtigungen:"
 msgid "Permit blank updates"
 msgstr "Erlaube leere Updates"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefonnummer:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Telefonnummer (optional)"
 
@@ -2739,30 +2802,26 @@ msgstr "Telefonnummer (optional)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr "Telefonnummern dürfen maximal %s Zeichen besitzen."
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr "Verifizierte Telefonnummer:"
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefonnummer:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2782,9 +2841,8 @@ msgstr "Foto erforderlich"
 msgid "Photo upload failed."
 msgstr "Fehler beim Hochladen den Fotos."
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Fotos"
@@ -2793,20 +2851,25 @@ msgstr "Fotos"
 msgid "Photos of recent nearby reports"
 msgstr "Fotos von neuen Meldungen in der Nähe"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr "Fotos/Dokumente"
 
 #: templates/web/base/reports/index.html:76
 #: templates/web/base/reports/index.html:79
 msgid "Pick your council"
-msgstr ""
+msgstr "Zu Ihrer Bereich gehen"
 
 #: templates/web/base/reports/index.html:66
 #: templates/web/base/reports/index.html:69
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Stecknadel auf Karte platzieren"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2834,27 +2897,26 @@ msgid "Please check your email address is correct"
 msgstr "Bitte überprüfen Sie ob Ihre E-Mail-Adresse korrekt ist"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr "Bitte überprüfen Sie ob Ihre Telefonnummer korrekt ist"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Bitte wählen Sie eine Kategorie"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr "Bitte wählen Sie ein sichereres Passwort"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2873,29 +2935,29 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Bitte geben Sie eine Nachricht ein"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr "Bitte geben Sie Ihre Telefonnummer an"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Bitte geben Sie Ihren Namen ein"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
-msgstr ""
+msgstr "Geben Sie den Namen der Verwaltung an"
 
 #. ("JS")
 #: templates/web/base/auth/change_password.html:26
@@ -2906,16 +2968,16 @@ msgstr "Bitte geben Sie ein Passwort ein"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Bitte geben Sie einen Betreff ein"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2926,20 +2988,20 @@ msgstr "Bitte geben Sie eine gültige E-Mail-Adresse an"
 msgid "Please enter a valid email address"
 msgstr "Bitte geben Sie eine gültige E-Mail-Adresse an"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr "Bitte geben Sie eine gültige E-Mail-Adresse oder Telefonnummer an"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Bitte geben Sie einiges Details an"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2955,7 +3017,7 @@ msgid "Please enter your first name"
 msgstr "Bitte geben Sie Ihren Vornamen ein"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr ""
@@ -2966,9 +3028,9 @@ msgstr "Bitte geben Sie Ihren Namen an."
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Bitte geben Sie Ihren Namen an"
@@ -2998,7 +3060,7 @@ msgstr "Melden sie sich  <a href=\"%s\">wieder an</a>, oder gehen Sie zurück zu
 #: templates/web/base/report/new/fill_in_details_text.html:2
 #: templates/web/base/report/new/fill_in_details_text.html:8
 msgid "Please fill in details of the problem below."
-msgstr ""
+msgstr "Bitte nennen Sie Details zu dem Problem"
 
 #: templates/web/base/report/new/sidebar.html:7
 #: templates/web/zurich/report/new/sidebar.html:14
@@ -3007,27 +3069,27 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/form.html:9
 msgid "Please generate a two-factor code and enter it below:"
-msgstr ""
+msgstr "Bitte erstellen sie einen Zwei-Faktor Code und fügen Sie ihn ein"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 msgid "Please make sure you are not including an email address"
-msgstr ""
+msgstr "Bitte stellen Sie sicher keine E-Mail Adressen in der Beschreibung mitzusenden"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr "Bitte stellen Sie sicher, dass Ihr Passwort mindestens %d Zeichen besitzt"
 
 #: templates/web/base/report/updates-sidebar-notes.html:2
 msgid "Please note that updates are not sent to the council."
-msgstr ""
+msgstr "Bitte beachten Sie, dass Updates zu dem Problem nicht an die Verwaltung geschickt werden."
 
 #: templates/web/base/report/new/oauth_email_form.html:4
 msgid "Please note your report has <strong>not yet been sent</strong>."
@@ -3040,41 +3102,45 @@ msgstr "Beachten Sie, dass Ihre Meldung <strong> noch nicht gesendet</strong> wu
 
 #: templates/web/base/report/display.html:34
 msgid "Please note your update has <strong>not yet been posted</strong>."
-msgstr "Beachten Sie, dass Ihre Aktualisierung  <strong>noch nicht veröffentlicht</strong> wurde."
+msgstr "Beachten Sie, dass Ihr Update  <strong>noch nicht veröffentlicht</strong> wurde."
 
 #: templates/web/base/report/new/notes.html:1
 #: templates/web/zurich/report/new/notes.html:1
 msgid "Please note:"
 msgstr "Hinweise:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
-msgid "Please provide a duplicate ID or public update for this report."
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
+msgid "Please provide a duplicate ID or public update for this report."
+msgstr "Bitte geben Sie die ID des Dublikates oder ein Problemupdate zu dieser Meldung an."
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
-msgstr ""
+msgstr "Bitte geben Sie im Textfeld ein Update zur Meldung an."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
-msgstr ""
+msgstr "Bitte nennen Sie Gründe warum Sie den Status dieser Meldung erneut auf 'offen' stellen"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
-msgstr ""
+msgstr "Bitte geben Sie eine Beschreibung sowie ein Foto an"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
-msgstr ""
+msgstr "Haben Sie bereits vorher schon einmal einen Mangel an die Verwaltung gemeldet"
 
 #: templates/web/base/auth/2fa/form-add.html:1
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
-msgstr ""
+msgstr "Bitte wählen Sie eine zuständige Verwaltung aus"
 
 #: perllib/FixMyStreet/App/Controller/Alert.pm:86
 msgid "Please select the feed you want"
@@ -3084,64 +3150,60 @@ msgstr "Bitte wählen Sie den Feed"
 msgid "Please select the type of alert you want"
 msgstr "Bitte wählen Sie die Benachrichtigungsart"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
-msgstr ""
+msgstr "Bitte geben Sie an ob das Problem behoben wurde"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Bitte laden Sie nur ein Bild hoch"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
-msgstr ""
+msgstr "Bitte geben Sie eine Emailadresse oder Telefonnummer an"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:148
 msgid "Please write a message"
 msgstr "Bitte schreiben Sie eine Nachricht"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr ""
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr "Postleitzahl oder Straßen Name und Gebiet"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
-msgstr ""
+msgstr "Anonym gemeldet bei %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
-msgstr ""
+msgstr "Gemeldet von %s bei %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
-msgstr ""
+msgstr "Gemeldet von <strong>%s</strong> (%s) bei %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
-msgstr ""
+msgstr "Gemeldet von <strong>%s</strong> bei %s"
 
 #: templates/web/base/front/footer-marketing.html:6
 msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>"
-msgstr ""
+msgstr "Auf der Basis von <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>"
 
 #: templates/web/base/admin/bodies/contact-form.html:41
 msgid "Prevent new reports from using this category, <em>and</em> also remove it from map filters."
-msgstr ""
+msgstr "Keine neuen Meldungen mehr in dieser Kategorie zulässig <em>und</em> die Kategorie wird aus der Karte entfernt."
 
 #: templates/web/base/admin/bodies/contact-form.html:36
 msgid "Prevent new reports from using this category, but keep it available in map filters."
-msgstr ""
+msgstr "Keine neuen Meldungen mehr in dieser Kategorie zulässig, aber sie ist noch in der Karte verzeichnet."
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr "Beantworten der Frage ist zum Senden der Meldung erforderlich."
 
@@ -3149,11 +3211,11 @@ msgstr "Beantworten der Frage ist zum Senden der Meldung erforderlich."
 msgid "Previous"
 msgstr "Vorherige"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Prioritäten"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Priorität"
@@ -3169,15 +3231,15 @@ msgid "Privacy and cookies"
 msgstr "Datenschutz und Cookies"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
-msgstr "Privat"
+msgstr "Nicht öffentlich"
 
 #: templates/web/base/reports/_list-filter-status.html:28
 msgid "Private only"
-msgstr ""
+msgstr "Nicht öffentlich"
 
 #: templates/web/base/maps/pin.html:14
 msgid "Problem"
@@ -3189,7 +3251,7 @@ msgstr "Problem %d erstellt"
 
 #: templates/web/base/admin/users/log.html:54
 msgid "Problem %s added to shortlist"
-msgstr "Probelm %s zur Favoritenlisten hinzugefügt"
+msgstr "Probelm %s zur Aufgabenliste hinzugefügt"
 
 #: templates/web/base/admin/timeline.html:24
 msgid "Problem %s confirmed"
@@ -3205,7 +3267,7 @@ msgstr ""
 
 #: templates/web/base/admin/users/log.html:56
 msgid "Problem %s removed from shortlist"
-msgstr ""
+msgstr "Problem %s von der Arbeitsliste entfernt"
 
 #: templates/web/base/admin/timeline.html:26
 msgid "Problem %s sent to council %s"
@@ -3217,16 +3279,15 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problem als offen markiert."
 
 #: templates/web/base/admin/stats/questionnaire.html:21
 msgid "Problem state change based on survey results"
-msgstr ""
+msgstr "Problemstatus aufgrund von Umfrageergebnissen geändert"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Meldungen"
@@ -3251,18 +3312,18 @@ msgstr "Meldungen, welche kürzlich gelöst wurden"
 msgid "Problems within %.1fkm of %s"
 msgstr "Probleme innhalb %.1fkm von %s"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Meldungen innerhalb %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3270,7 +3331,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3278,11 +3339,15 @@ msgstr ""
 msgid "Property address:"
 msgstr "Immobilien-Adresse:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr "Gesperrt für Open311 Veränderungen"
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 #, fuzzy
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr "Gesperrt für Open311 Veränderungen"
@@ -3295,28 +3360,28 @@ msgstr "Meldung aktualisieren"
 
 #: templates/web/base/report/update/form_user_loggedin.html:12
 msgid "Provide update as"
-msgstr ""
+msgstr "Update veröffentlichen als"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
-msgstr ""
+msgstr "Das Setzen eines Passwortes ist optional, erleichtert es Ihnen aber in Zukunft weitere Meldungen oder Updates zu gemeldeten Problemen zu erstellen."
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
-msgstr ""
+msgstr "Das Setzen eines Passwortes ist optional, erleichtert es Ihnen aber weitere Meldungen oder Updates zu gemeldeten Problemen zu erstellen."
 
 #: templates/web/base/report/new/form_public_councils_text.html:2
 msgid "Public details"
 msgstr "Öffentliche Details"
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Öffentliche Antwort:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
-msgstr "Öffentliche Aktualisierung:"
+msgstr "Öffentliches Update:"
 
 #: templates/web/zurich/admin/reports/edit.html:110
 #: templates/web/zurich/admin/stats/index.html:59
@@ -3356,11 +3421,11 @@ msgstr "Fragebogen von ProblemmelderIn beantwortet"
 msgid "RSS feed"
 msgstr "RSS-Feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS-Feed für %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -3368,11 +3433,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS-Feed von %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -3380,13 +3445,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr "RSS-Feed von Problem in der Umgebung"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS-Feed der Problem innerhalb von %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -3400,11 +3465,11 @@ msgstr "RSS-Feed von neuen lokalen Problemen"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS-Feed zu Aktualisierungen dieses Problems"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr "Weniger anzeigen"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr "Mehr anzeigen"
 
@@ -3415,9 +3480,9 @@ msgstr "Grund:"
 #: templates/web/base/alert/updates.html:14
 #: templates/web/base/report/display_tools.html:46
 msgid "Receive email when updates are left on this problem."
-msgstr "Erhalten Sie Aktualisierungen dieser Meldung."
+msgstr "E-Mail erhalten wenn ein Update zu dieser Meldung vorliegt."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3431,22 +3496,23 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Kürzlich erfasste Meldungen"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Neuste Bearbeitung"
 
 #: templates/web/base/report/inspect/information.html:52
 msgid "Reject report"
-msgstr ""
+msgstr "Meldung ablehnen"
 
 #: templates/web/zurich/report/new/notes.html:5
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Fix My Zürich wird primär dafür verwendet, physische Mängel zu melden, welche behoben werden können. Wenn Ihr Problem dafür nicht passend erscheint, können sie die entsprechende Dienststelle weiterhin telefonisch oder per E-Mail erreichen."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
-msgstr ""
+msgstr "Profildetails entfernen"
 
 #: templates/web/base/admin/extra-metadata-item.html:23
 msgid "Remove field"
@@ -3454,15 +3520,15 @@ msgstr "Feld entfernen"
 
 #: templates/web/base/admin/report_blocks.html:23
 msgid "Remove flag"
-msgstr ""
+msgstr "Markierung entfernen"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
 msgid "Remove from shortlist"
-msgstr ""
+msgstr "Von der Arbeitsliste entfernen"
 
 #: templates/web/base/report/display_tools.html:7
 msgid "Remove from site"
@@ -3470,19 +3536,24 @@ msgstr "Von Seite entfernen"
 
 #: templates/web/base/admin/extra-metadata-option.html:26
 msgid "Remove option"
-msgstr ""
+msgstr "Option entfernen"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Foto entfernen (kann nicht rückgängig gemacht werden!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Benutzerrechte ändern"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "An Benutzer antworten:"
 
@@ -3490,14 +3561,14 @@ msgstr "An Benutzer antworten:"
 msgid "Report"
 msgstr "Meldung"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "Meldungsnummer:"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3506,7 +3577,7 @@ msgid "Report a problem"
 msgstr "Ein Problem erfassen"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr "Ein neues Problem melden"
@@ -3518,22 +3589,22 @@ msgstr "Missbrauch melden"
 #: templates/web/base/report/form/user.html:32
 #: templates/web/base/report/form/user.html:39
 msgid "Report anonymously"
-msgstr ""
+msgstr "Anonym berichten "
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
-msgstr ""
+msgstr "Ein weiteres Problem melden"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 msgid "Report as"
-msgstr ""
+msgstr "Melden als"
 
 #: templates/web/base/report/new/form_public_councils_text.html:3
 msgid "Report details"
-msgstr ""
+msgstr "Meldungsdetails"
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:306
 msgid "Report on %s"
@@ -3556,7 +3627,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Lokale Mängel melden, anzeigen oder diskutieren"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Anonym gemeldet um"
@@ -3567,7 +3638,7 @@ msgstr "Anonym gemeldet um"
 msgid "Reported before"
 msgstr "Vorher berichtet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Gemeldet von %s um %s"
@@ -3581,27 +3652,27 @@ msgstr "Gemeldet von:"
 msgid "Reported in the %s category"
 msgstr "Gemeldet in der Kategorie %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
-msgstr ""
+msgstr "Anonym in der Kategorie %s gemeldet (%s)"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
-msgstr ""
+msgstr "Gemeldet in der Kategorie %s von %s (%s)"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Anonym gemeldet von %s um %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Gemeldet von %s um %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Anonym gemeldet von %s um %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Gemeldet von %s um %s"
 
@@ -3620,17 +3691,15 @@ msgstr "Gemeldet:"
 msgid "Reporting a problem"
 msgstr "Verfassen Sie eine Meldung"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Berichte"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3658,28 +3727,28 @@ msgid "Reports published"
 msgstr "Berichte veröffentlicht"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr "Meldungen offline gespeichert."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr "Meldungen gesendet an %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
 #: templates/web/base/admin/index.html:62
 msgid "Reports waiting to be sent"
-msgstr ""
+msgstr "Noch nicht versendete Meldungen"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:42
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr "Erforderlich"
 
@@ -3732,39 +3801,45 @@ msgstr "Auf ursprünglichen Titel zurücksetzen"
 msgid "Right place?"
 msgstr "Richtiger Ort?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr "Rolle"
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr "Rolle:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr "Rollen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Nach links drehen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3780,20 +3855,20 @@ msgstr "Drehen des Fotos löscht ungespeicherte Änderungen der Meldung."
 msgid "Satellite"
 msgstr "Satellit"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr "Speichern und als Duplikat schließen"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3807,16 +3882,15 @@ msgstr "Neue Felder speichern"
 
 #: templates/web/base/report/inspect/public_update.html:7
 msgid "Save with a public update"
-msgstr ""
+msgstr "Mit öffentlichem Update speichern"
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr "Meldung offline speichern"
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Berichte suchen"
 
@@ -3829,7 +3903,7 @@ msgstr "Benutzer suchen"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Berichte suchen"
 
@@ -3844,12 +3918,12 @@ msgstr "Suchen:"
 msgid "Searching found no reports."
 msgstr "Keine Meldungen gefunden."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Keine Benutzer gefunden."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr "Sicherheit"
@@ -3857,20 +3931,19 @@ msgstr "Sicherheit"
 #: templates/web/base/report/form/private_details.html:14
 #: templates/web/base/report/new/councils_text_private.html:8
 msgid "See our privacy policy"
-msgstr ""
+msgstr "Unsere Datenschutzrichtlinie"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:41
 #: templates/web/zurich/admin/bodies/form.html:16
 msgid "Select a body"
-msgstr ""
+msgstr "Wählen Sie eine Verwaltung aus"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Wählen Sie ein Gebiet"
@@ -3891,7 +3964,7 @@ msgstr ""
 msgid "Select:"
 msgstr "Auswählen:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr "Senden"
@@ -3904,7 +3977,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr "Login E-Mail senden"
 
@@ -3913,11 +3986,11 @@ msgstr "Login E-Mail senden"
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
-msgstr ""
+msgstr "Meldung zurücksenden"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3938,7 +4011,7 @@ msgstr "Setze Passwort"
 
 #: templates/web/base/report/inspect/information.html:44
 msgid "Set to my current location"
-msgstr ""
+msgstr "Auf meinen aktuellen Standort setzen"
 
 #: templates/web/base/report/display_tools.html:18
 msgid "Share"
@@ -3953,9 +4026,9 @@ msgstr ""
 #: templates/web/base/report/_main.html:27
 #: templates/web/base/report/_main.html:35
 msgid "Shortlist"
-msgstr ""
+msgstr "Arbeitsliste"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3964,12 +4037,12 @@ msgstr ""
 #: templates/web/base/report/_main.html:31
 #: templates/web/base/reports/_list-filter-status.html:24
 msgid "Shortlisted"
-msgstr ""
+msgstr "Auf Arbeitsliste"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
-msgstr ""
+msgstr "Auf der Arbeitsliste von %s"
 
 #: templates/web/base/report/update.html:23
 msgid "Show Photo?"
@@ -3977,7 +4050,7 @@ msgstr "Foto anzeigen?"
 
 #: templates/web/base/questionnaire/index.html:56
 msgid "Show all updates"
-msgstr ""
+msgstr "Alle Updates anzeigen"
 
 #: templates/web/base/report/_show_name_label.html:3
 msgid "Show my name publicly"
@@ -3991,8 +4064,8 @@ msgstr "Name öffentlich anzeigen?"
 msgid "Show older"
 msgstr "Zeige ältere"
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr "Ältere Meldungen anzeigen"
 
@@ -4003,13 +4076,13 @@ msgstr "Foto anzeigen"
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Zeige Stecknadeln"
 
 #: templates/web/base/report/_main.html:72
 msgid "Show reporter&rsquo;s name"
-msgstr ""
+msgstr "Namen des Bürgers anzeigen"
 
 #: templates/web/base/reports/index.html:64
 msgid "Show reports in your area"
@@ -4026,7 +4099,7 @@ msgstr "Anmelden"
 
 #: templates/web/base/auth/create.html:26
 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated."
-msgstr ""
+msgstr "Passwort zurücksetzen. Sie erhalten eine E-Mail mit einem Anmeldelink um das Passwort zurückzusetzen."
 
 #: templates/web/base/auth/create.html:24
 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated."
@@ -4063,7 +4136,7 @@ msgid "Some photos of recent reports"
 msgstr ""
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4072,12 +4145,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4095,43 +4167,43 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
-msgstr ""
+msgstr "Dieser Ort konnte leider nicht gefunden werden."
 
 #: templates/web/base/auth/general.html:16
 #: templates/web/base/report/display.html:29
 #: templates/web/base/report/new/fill_in_details_form.html:26
 msgid "Sorry, we could not log you in. Please fill in the form below."
-msgstr ""
+msgstr "Leider konnten Sie nicht angemeldet werden. Bitte füllen Sie das untere Formular aus."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
-msgstr ""
+msgstr "Leider konnten ihre Dateien nicht gespeichert werden. Bitte versuchen Sie es später noch einmal"
 
 #: templates/web/base/offline/fallback.html:6
 msgid "Sorry, we don’t have a good enough connection to fetch that page."
-msgstr ""
+msgstr "Die Verbindung ist zu langsam um diese Seite zu laden"
 
 #: perllib/FixMyStreet/App/Controller/Root.pm:129
 msgid "Sorry, you don't have permission to do that."
-msgstr ""
+msgstr "Sie haben nicht die Berechtigungen zu dieser Änderung"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
-msgstr ""
+msgstr "Keine Zugrifsberechtigung. Melden Sie müssen sich <a href=\"%s\">anmelden</a> um die Meldung betrachten zu können."
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Sortieren nach"
@@ -4140,21 +4212,21 @@ msgstr "Sortieren nach"
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
 #: templates/web/base/debug_header.html:3
 msgid "Staging site"
-msgstr ""
+msgstr "Entwicklungsmodus"
 
 #: templates/web/base/dashboard/index.html:75
 msgid "Start Date"
-msgstr ""
+msgstr "Startdatum"
 
 #: templates/web/base/admin/bodies/body.html:74
 #: templates/web/base/admin/bodies/category.html:30
@@ -4168,18 +4240,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Status"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4188,31 +4260,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Status:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Statistiken"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Status"
 
@@ -4228,9 +4297,9 @@ msgstr "Straßenansicht"
 
 #: templates/web/base/report/new/category.html:35
 msgid "Subcategory"
-msgstr ""
+msgstr "Unterkategorie"
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4249,62 +4318,60 @@ msgstr "Titel:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
-msgstr "Abschicken"
+msgstr "Senden"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Änderungen senden"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Fragebogen absenden"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Gesendet"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr "Per E-Mail abonniert"
 
 #: templates/web/base/admin/users/alerts.html:22
 msgid "Subscribed:"
-msgstr "Abboniert:"
+msgstr "Abonniert:"
 
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:34
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
-msgstr ""
+msgstr "Beschreibungen dürfen nicht länger als %d Zeichen sein"
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4312,26 +4379,25 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:10
 msgid "Summaries are limited to {0} characters in length. Please shorten your summary"
-msgstr ""
+msgstr "Beschreibungen dürfen nicht länger als %d Zeichen sein"
 
 #: templates/web/base/report/new/form_title.html:1
 msgid "Summarise the problem"
 msgstr "Problembeschreibung"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Beschreiben Sie Ihre Änderungen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Zusammenfassung"
 
@@ -4342,14 +4408,19 @@ msgstr "Zusammenfassungsberichte"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr "Statistikübersicht"
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4367,13 +4438,18 @@ msgstr "Informationen zu Ihrer Person"
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Vorlagen"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Älteste Bearbeitung"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Text"
@@ -4394,9 +4470,14 @@ msgstr "Nur-Text-Version"
 msgid "Text:"
 msgstr "Text:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Text"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
-msgstr ""
+msgstr "Vielen Dank, dass Sie dieses Problem gemeldet haben!"
 
 #: templates/web/base/tokens/error.html:6
 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
@@ -4404,11 +4485,11 @@ msgstr ""
 
 #: templates/web/base/tokens/confirm_update.html:16
 msgid "Thank you for updating this issue!"
-msgstr ""
+msgstr "Vielen Dank für das Update zu dieser Meldung!"
 
 #: templates/web/base/contact/submit.html:6
 msgid "Thank you for your enquiry"
-msgstr ""
+msgstr "Vielen Dank für ihre Beteiligung"
 
 #: templates/web/base/questionnaire/completed.html:5
 msgid "Thank you for your feedback"
@@ -4416,64 +4497,66 @@ msgstr "Vielen Dank für Ihre Rückmeldung"
 
 #: templates/web/base/around/_error_multiple.html:26
 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:"
-msgstr ""
+msgstr "Vielen Dank für das Hochladen des Fotos. Um das Problem zu lokalisieren, geben Sie bitte eine nahegelegene Straße oder Postleitzahl in das Suchfeld ein&nbsp;:"
 
 #: templates/web/base/questionnaire/creator_fixed.html:9
 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 ""
+msgstr "Schön dass dieses Problem nun gelöst wurde! Haben Sie in der Vergangenheit bereits schon einmal der Verwaltung ein Problem gemeldet?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
-msgstr ""
+msgstr "Sie haben erfolgreich die Zweifaktor-Authentifizierung aktiviert"
 
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
-msgstr ""
+msgstr "Das Bild konnte nicht hochgeladen werden (%s), bitte versuchen Sie es erneut."
 
 #: perllib/FixMyStreet/App/Controller/Council.pm:105
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
-msgstr ""
+msgstr "Die gesuchte Stelle liegt in keinem Zuständigkeitsgebiet einer Verwaltung. Bitte versuchen Sie es erneut"
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
-msgstr ""
+msgstr "Diese Postleitzahl ist uns nicht bekannt."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
-msgstr ""
+msgstr "Die Meldung wurde als gesendet markiert."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Das Problem wird jetzt erneut gesendet."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Diese Meldung wurde von Fix My Zürich entfernt."
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:581
 msgid "That user has been logged out."
-msgstr ""
+msgstr "Der Benutzer wurde abgemeldet."
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:588
 msgid "That user has been made anonymous on all reports and updates."
-msgstr ""
+msgstr "Der Nutzer wurde auf allen Meldungen und Updates auf anonym gestellt."
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:637
 msgid "That user’s personal details have been removed."
-msgstr ""
+msgstr "Benutzerdetails wurden entfernt"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:602
 msgid "That user’s reports and updates have been hidden."
-msgstr ""
+msgstr "Die Meldungen und Updates des Benutzers wurden ausgeblendet."
 
 #: templates/web/base/admin/manifesttheme/form.html:20
 msgid "The <strong>background colour</strong> defines a placeholder background colour for the application splash screen before it has loaded.  Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</code></strong>."
@@ -4501,8 +4584,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4535,7 +4618,7 @@ msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:31
 msgid "The contact has been confirmed as correct."
-msgstr ""
+msgstr "Diese Stelle wurde als korrekt bestätigt."
 
 #: templates/web/base/report/new/fill_in_details_text.html:2
 #: templates/web/base/report/new/fill_in_details_text.html:3
@@ -4550,20 +4633,20 @@ msgstr ""
 #: perllib/FixMyStreet/App/Controller/Dashboard.pm:45
 #: perllib/FixMyStreet/App/Controller/Reports.pm:58
 msgid "The error was: %s"
-msgstr "Der Fehler war: %s"
+msgstr "Der Fehler lautet: %s"
 
 #: templates/web/base/open311/index.html:78
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
 #: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27
 #: db/alert_types.pl:31
 msgid "The latest local problems reported by users"
-msgstr ""
+msgstr "Neuste von Nutzern gemeldete lokale Probleme"
 
 #: db/alert_types.pl:35
 msgid "The latest problems for {{COUNCIL}} reported by users"
@@ -4575,7 +4658,7 @@ msgstr ""
 
 #: db/alert_types.pl:11
 msgid "The latest problems reported by users"
-msgstr ""
+msgstr "Neuste von Nutzern gemeldete Probleme"
 
 #: db/alert_types.pl:15
 msgid "The latest problems reported fixed by users"
@@ -4583,15 +4666,15 @@ msgstr ""
 
 #: db/alert_types.pl:43
 msgid "The latest problems within {{NAME}}'s boundary reported by users"
-msgstr ""
+msgstr "Neueste gemeldete Probleme innerhalb {{NAME]]"
 
 #: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9
 msgid "The link might have expired, or maybe you didn&rsquo;t quite copy and paste it correctly."
-msgstr ""
+msgstr "Die Gültigkeit dieses Links ist abgelaufen."
 
 #: templates/web/base/admin/bodies/form.html:66
 msgid "The list of available areas is being provided by the MapIt service at %s."
-msgstr ""
+msgstr "Liste der vom MapIt Dienst gelieferten Gebiete bei %s."
 
 #: templates/web/base/auth/change_password.html:26
 #: templates/web/base/auth/change_password.html:30
@@ -4600,7 +4683,7 @@ msgstr "Die Passwörter stimmen nicht überein"
 
 #: templates/web/base/errors/page_error_404_not_found.html:9
 msgid "The requested URL '%s' was not found on this server"
-msgstr ""
+msgstr "Die angefragte URL '%s' wurde auf diesem Server nicht gefunden"
 
 #: templates/web/base/admin/roles/form.html:5
 msgid "The role's <strong>name</strong> is used to refer to this group of permissions elsewhere in the admin."
@@ -4616,10 +4699,10 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:627
 msgid "The user has been sent a login email"
-msgstr ""
+msgstr "Benutzer wurde eine E-Mail zum anmelden gesendet"
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4646,13 +4729,13 @@ msgstr "Keine Meldungen zum anzeigen."
 
 #: templates/web/base/report/new/duplicate_suggestions.html:10
 msgid "There are similar problems nearby that we’re already aware of, is one of them yours?"
-msgstr ""
+msgstr "Es gibt in der Nähe ähnliche Probleme, die bereits gemeldet wurden. Ist Ihr Problem möglicherweise bereits erfasst?"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:98
 msgid "There is already a template with that title."
 msgstr "Es existiert bereits eine Vorlage mit diesem Namen."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr "Es existiert bereits eine Automatische Antwortvorlage für diese Kategorie/Status."
 
@@ -4670,22 +4753,22 @@ msgstr "Es ist ein Fehler beim Anzeigen dieser Seite aufgetreten. Bitte versuche
 msgid "There was a problem with your login information."
 msgstr "Es ist ein Fehler bei der Anmeldung aufgetreten."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr "Es ist ein Fehler bei der Anmeldung aufgetreten. Wenn Sie sich nicht mehr an Ihr Passwort erinnern oder keines besitzen, bitte kreuzen Sie das 'Nein' Feld im Formular an."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
-msgstr "Es gab ein Problem mit Ihrer Aktualisierung. Bitte versuchen Sie es erneut."
+msgstr "Es gab ein Problem mit Ihrem Update. Bitte versuchen Sie es erneut."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:174
 msgid "There were problems with your report. Please see below."
 msgstr "Es gab ein Problem mit Ihrem Bericht. Bitte versuchen Sie es erneut."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
-msgstr "Es gab Probleme mit Ihrer Aktualisierung. Bitte versuchen Sie es erneut."
+msgstr "Es gab Probleme mit Ihrem Update. Bitte versuchen Sie es erneut."
 
 #: templates/web/base/admin/category-checkboxes.html:33
 msgid "These categories appear in more than one group:"
@@ -4722,7 +4805,7 @@ msgstr "Ihre Meldung wird online für andere Bürger veröffentlicht. Beachten S
 #: templates/web/base/report/new/councils_text_all.html:6
 #: templates/web/base/report/new/councils_text_all.html:9
 msgid "These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr ""
+msgstr "Diese Meldung wird gesendet an <strong>%s</strong> und online auf der Karte unter Beachtung unserer <a href=\"%s\">Datenschutzrichtlinie</a> eingetragen."
 
 #: templates/web/base/report/new/councils_text_all.html:16
 #: templates/web/base/report/new/councils_text_all.html:6
@@ -4759,10 +4842,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Diese Information wird benötigt"
 
@@ -4779,19 +4862,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr "Mit dieser Seite können in einem Schritt Konten für mehrere Verwaltungsmitarbeiter erstellt werden."
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Dieser Mangel wurde behoben"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Dieser Mangel wurde nicht behoben"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr "Das Problem besteht weiterhin"
 
@@ -4802,44 +4889,47 @@ msgstr "Diese Meldung"
 
 #: templates/web/base/report/duplicate-no-updates.html:5
 msgid "This report is a duplicate. Please leave updates on the original report:"
-msgstr "Diese Meldung ist ein Duplikat. Bitte tragen Sie Aktualisierungen in die erste Meldung ein:"
+msgstr "Diese Meldung ist ein Duplikat. Bitte tragen Sie Updates zum Problem in die erste Meldung ein:"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Dieser Bericht wartet auf Moderation."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Dieser Bericht ist aktuell als geschlossen markiert."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Dieser Bericht ist aktuell als behoben markiert."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Dieser Bericht ist aktuell als offen markiert."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
-msgstr ""
+msgstr "Diese Meldung kann nicht mehr aktualisiert werden"
 
 #: perllib/FixMyStreet/Queue/Item/Report.pm:108
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Diese Seite enthält ein Foto des Problems, hochgeladen vom Benutzer."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Verbrachte Zeit (in Minuten):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4863,6 +4953,10 @@ msgstr "Titel"
 msgid "Title:"
 msgstr "Titel:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4888,7 +4982,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr "Token"
 
@@ -4913,11 +5007,6 @@ msgstr ""
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr "Übersetzung"
@@ -4940,26 +5029,26 @@ msgstr "Versuchen Sie uns direkt per E-Mail zu erreichen:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr "Zwei-Faktor-Authentifizierung"
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
-msgstr ""
+msgstr "Zwei-Faktor-Authentifizierung wurde aktiviert"
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
-msgstr ""
+msgstr "Zwei-Faktor-Authentifizierung wurde deaktiviert"
 
 #: templates/web/base/admin/states/index.html:10
 #: templates/web/base/admin/states/index.html:100
 #: templates/web/base/admin/users/alerts.html:9
 msgid "Type"
-msgstr ""
+msgstr "Art"
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -4989,10 +5078,10 @@ msgstr "Unbekannter Fehler"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "Unbekannte Problemkennung"
 
@@ -5002,38 +5091,38 @@ msgstr "Unbekannte Problemkennung"
 
 #: templates/web/base/reports/_list-filter-status.html:25
 msgid "Unshortlisted"
-msgstr ""
+msgstr "Auf keiner Arbeitsliste"
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
-msgstr "Beschreibung"
+msgstr "Update"
 
 #: templates/web/base/admin/users/log.html:51
 msgid "Update %s created for problem %d"
-msgstr ""
+msgstr "Update %s für Meldung %d"
 
 #: templates/web/base/admin/timeline.html:33
 msgid "Update %s created for problem %d; by %s"
-msgstr ""
+msgstr "Updatea %s für Meldung %d; von %s"
 
 #: templates/web/base/contact/index.html:37
 msgid "Update below added anonymously at %s"
-msgstr ""
+msgstr "Anonymes Update zu %s "
 
 #: templates/web/base/contact/index.html:39
 msgid "Update below added by %s at %s"
-msgstr ""
+msgstr "Update von %s zu %s"
 
 #: templates/web/base/admin/bodies/form.html:139
 #: templates/web/zurich/admin/bodies/form.html:63
 msgid "Update body"
-msgstr ""
+msgstr "Verwaltungsdetails aktualisieren"
 
 #: templates/web/base/admin/stats/state.html:21
 msgid "Update breakdown by state"
@@ -5041,48 +5130,46 @@ msgstr ""
 
 #: db/alert_types.pl:7
 msgid "Update by {{name}}"
-msgstr "Aktualisierung von {{name}}"
+msgstr "Update von {{name}}"
 
 #: templates/web/base/admin/update_edit.html:46
 #: templates/web/zurich/admin/update_edit.html:25
 msgid "Update changed problem state to %s"
-msgstr ""
+msgstr "Update hat Meldungsstatus geändert zu %s"
 
 #: templates/web/base/admin/update_edit.html:48
 msgid "Update marked problem as fixed"
-msgstr ""
+msgstr "Update hat das Problem als gelöst markiert"
 
 #: templates/web/base/admin/update_edit.html:50
 msgid "Update reopened problem"
-msgstr ""
+msgstr "Update hat das Problem auf wieder geöffnet gestellt"
 
 #: templates/web/base/admin/bodies/body.html:130
 msgid "Update statuses"
-msgstr ""
+msgstr "Update Status"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Aktualisiert!"
 
@@ -5091,21 +5178,21 @@ msgstr "Aktualisiert!"
 #: templates/web/base/report/update.html:4
 #: templates/web/zurich/report/updates.html:2
 msgid "Updates"
-msgstr "Aktualisierungen"
+msgstr "Updates"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
-msgstr ""
+msgstr "Updates sind auf %s Zeichen beschränkt."
 
 #: db/alert_types.pl:5 db/alert_types.pl:6
 msgid "Updates on {{title}}"
-msgstr "Aktualisierungen auf {{title}}"
+msgstr "Update zu {{title}}"
 
 #. ("%s is the site name")
 #: templates/web/base/report/display.html:0
 #: templates/web/base/report/display.html:9
 msgid "Updates to this problem, %s"
-msgstr "Aktualisierungen für dieses Problem, %s"
+msgstr "Updates für dieses Problem, %s"
 
 #: templates/web/base/admin/users/import.html:64
 msgid "Usage notes"
@@ -5121,7 +5208,15 @@ msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:53
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
-msgstr "Aktivieren wenn Benutzer Probleme in dieser Kategorie melden können, aber es kein öffentliches Interesse gibt den Bearbeitungszustand einzusehen. Beispielsweise die Anfragen nach einem zusätzlichen Mülleimer an einer speziellen Adresse."
+msgstr "Aktivieren, wenn Benutzer Probleme in dieser Kategorie melden können, aber es kein öffentliches Interesse gibt den Bearbeitungszustand einzusehen. Beispielsweise die Anfragen nach einem zusätzlichen Mülleimer an einer speziellen Adresse."
+
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
@@ -5129,66 +5224,64 @@ msgstr ""
 
 #: templates/web/base/admin/users/import.html:1
 msgid "User Import"
-msgstr ""
+msgstr "Benutzer Import"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:665
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:676
 msgid "User added to abuse list"
-msgstr ""
+msgstr "Benutzer der Spammliste hinzugefügt"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
-msgstr ""
+msgstr "Der Benutzeraccount existiert bereits"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:661
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:672
 msgid "User already in abuse list"
-msgstr ""
+msgstr "Benutzer befindet sich bereits in der Spammliste"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:758
 msgid "User flag removed"
-msgstr ""
+msgstr "Beobachtung des Benutzers aufgehoben"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:728
 msgid "User flagged"
-msgstr ""
+msgstr "Benutzer steht nun unter Beobachtung"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
-msgstr ""
+msgstr "Benutzer in Spammliste"
 
 #: templates/web/base/admin/users/index.html:20
 msgid "User search finds matches in users' names and email addresses."
-msgstr ""
+msgstr "Benutzer können anhand von Namen und E-Mailadressen gefunden werden."
 
 #: templates/web/base/admin/users/alerts.html:2
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
-msgstr ""
+msgstr "Benutzer:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Benutzer"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5196,25 +5289,25 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Werte aktualisiert"
 
 #: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55
 msgid "Verify"
-msgstr ""
+msgstr "Bestätigen"
 
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:5
 msgid "Verify email address"
-msgstr ""
+msgstr "E-Mail Adresse bestätigen"
 
 #: templates/web/base/auth/change_phone.html:2
 #: templates/web/base/auth/change_phone.html:5
 msgid "Verify phone number"
-msgstr ""
+msgstr "Telefonnummer bestätigen"
 
 #: templates/web/base/admin/reports/edit.html:36
 #: templates/web/base/admin/update_edit.html:18
@@ -5224,7 +5317,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Bericht auf Seite ansehen"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5232,7 +5325,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5250,7 +5343,7 @@ msgstr ""
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -5314,19 +5407,19 @@ msgstr "Wann editiert"
 
 #: templates/web/base/admin/problem_row.html:35
 msgid "When sent"
-msgstr "Wann gesendet"
+msgstr "Wenn gesendet"
 
 #: templates/web/base/alert/_list.html:9
 msgid "Which problems do you want alerts about?"
 msgstr "Zu welchen Problemen möchten Sie Benachrichtigungen erhalten?"
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:7
 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free."
-msgstr ""
+msgstr "Sie können sich mit weiteren <a href=\"/alert\">Benachrichtigungen</a> auf dem aktuellen Stand halten lassen."
 
 #: templates/web/base/open311/index.html:84
 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration.  The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
@@ -5340,9 +5433,9 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "Möchten Sie zu FixMyStreet beitragen? FixMyStreet ist freie Software und der Code verfügbar unter <a href=\"https://fixmystreet.org\">fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
-msgstr ""
+msgstr "Möchten Sie in 4 Wochen eine weitere Mail als Erinnerung zum aktuellen Status des Problems erhalten? "
 
 #: templates/web/base/report/new/duplicate_suggestions.html:23
 msgid "Would you like us to notify you when this problem is updated or fixed?"
@@ -5352,7 +5445,6 @@ msgstr "Möchtest du benachrichtigt werden wenn das Problem bearbeitet oder gel
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Meldungen gänzlich in Grossbuchstaben zu schreiben macht diese unleserlich. Ebenso wenn keine Satzzeichen verwendet werden."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5363,12 +5455,12 @@ msgstr "Meldungen gänzlich in Grossbuchstaben zu schreiben macht diese unleserl
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Ja"
 
@@ -5378,34 +5470,34 @@ msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:26
 msgid "You are not sure of the origin or validity of the contact."
-msgstr ""
+msgstr "Die Gültigkeit und Herkunft des Kontaktes sind unsicher."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr "Sie sind offline"
 
 #: templates/web/base/contact/unsuitable-text.html:2
 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
-msgstr ""
+msgstr "Sie markieren die folgende Meldung als missbräuchlich oder persönliche Informationen enthaltend:"
 
 #: templates/web/base/contact/index.html:31
 msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
-msgstr ""
+msgstr "Sie markieren das folgende Update als missbräuchlich oder persönliche Informationen enthaltend:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
-msgstr ""
+msgstr "Sie können <a href=\"%s\">ein neues Problem an der selben Stelle erstellen</a>."
 
 #: templates/web/zurich/tokens/confirm_problem.html:6
 #: templates/web/zurich/tokens/confirm_problem.html:8
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
-msgstr ""
+msgstr "Sie können einen missbräuchlichen Benutzer auf die Spammliste setzen, sodass seine Meldungen automatisch ausgeblendet (und nicht gesendet werden)."
 
 #: templates/web/base/alert/_list.html:18
 msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination."
@@ -5413,7 +5505,7 @@ msgstr ""
 
 #: templates/web/base/contact/index.html:131
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
-msgstr ""
+msgstr "Sie können technischen Support erhalten unter <a href='mailto:%s'>%s</a>"
 
 #: templates/web/base/admin/flagged.html:5
 msgid ""
@@ -5421,6 +5513,8 @@ msgid ""
 "          For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n"
 "          reports in the past."
 msgstr ""
+"Sie können jede Meldung oder Benutzer unter Beobachtung stellen, sodass sie hier gelistet werden.\n"
+"Dies kann nützlich sein, wenn der Benutzer in der Vergangenheit unangebrachte Meldungen erstellt hat."
 
 #: templates/web/base/report/new/top_message_none.html:13
 #: templates/web/base/report/new/top_message_none.html:14
@@ -5433,7 +5527,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Sie können einen Body auf inaktiv stellen, wenn dieser nicht auf der Website erscheinen soll."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr "Kategoriename existiert bereits"
 
@@ -5443,7 +5537,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5451,19 +5545,18 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
-msgstr "Es sind bereits Dateien zu dieser Meldung hochgeladen. Maximale Anzahl ist 3."
+msgstr "Es sind bereits Dateien zu dieser Meldung hochgeladen. Maximal zulässig sind 3."
 
 #: templates/web/base/report/new/form_report.html:50
 #: templates/web/zurich/report/new/fill_in_details_form.html:30
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
-msgstr ""
+msgstr "Beachten Sie, dass maximal 3 Fotos hochgeladen werden können (Werden mehr hochgeladen, so wird das Älteste verworfen)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
-msgstr ""
+msgstr "Beachten Sie, dass maximal 3 Fotos hochgeladen werden können (Werden mehr hochgeladen, so wird das Älteste verworfen)."
 
 #: templates/web/base/auth/sign_out.html:4
 #: templates/web/zurich/auth/sign_out.html:3
@@ -5472,16 +5565,16 @@ msgstr "Sie wurden abgemeldet"
 
 #: templates/web/zurich/report/new/sidebar.html:7
 msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. "
-msgstr "Der grüne Pin auf der Karte repräsentiert ihre Meldung. Falls dieser Ort nicht der Richtige ist, klicken Sie einfach nochmals am richtigen Ort auf die Karte."
+msgstr "Der grüne Pin auf der Karte repräsentiert ihre Meldung. Durch erneutes Klicken auf die Karte können Sie den Ort verschieben."
 
 #: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:143
 msgid "You have successfully added your phone number."
-msgstr ""
+msgstr "Ihre Telefonnummer wurde gespeichert."
 
 #: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:159
 #: templates/web/zurich/tokens/confirm_problem.html:6
 msgid "You have successfully confirmed your email address."
-msgstr "Sie haben Ihre E-Mail-Adresse erfolgreich bestätigt."
+msgstr "Sie haben Ihre E-Mail-Adresse bestätigt."
 
 #: templates/web/base/auth/change_phone.html:15
 msgid "You have successfully confirmed your phone number."
@@ -5489,7 +5582,7 @@ msgstr "Ihre Telefonnummer wurde erfolgreich verifiziert."
 
 #: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:130
 msgid "You have successfully removed your phone number."
-msgstr "Ihre Telefonnummer wurde erfolgreich gelöscht."
+msgstr "Ihre Telefonnummer wurde gelöscht."
 
 #: templates/web/base/report/display.html:25
 #: templates/web/base/report/new/login_success_form.html:3
@@ -5506,11 +5599,11 @@ msgstr "Sie haben noch keine Probleme gemeldet. <a href=\"%s\">Ein Problem melde
 
 #: templates/web/base/my/planned.html:21
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr ""
+msgstr "Noch keine Meldungen auf der Arbeitsliste"
 
 #: templates/web/base/admin/index.html:19
 msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent."
-msgstr ""
+msgstr "Sie müssen eine <a href=\"%s\">Verwaltung hinzufügen</a> (sowie Stellen in der Verwaltung) bevor Meldungen gesendet werden können."
 
 #: templates/web/base/admin/bodies/index.html:11
 msgid ""
@@ -5525,24 +5618,25 @@ msgstr "Ihre Berichte"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Ihr Benutzerkonto"
 
 #: templates/web/base/auth/2fa/intro.html:18
 msgid "Your account requires two-factor authentication to be set up."
-msgstr ""
+msgstr "Ihr Benutzerkonto benötigt eine erfolgreich eingerichtete Zweifaktor-Authentifizierung."
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5569,18 +5663,18 @@ msgstr "Ihr Name"
 
 #: templates/web/base/my/anonymize.html:13
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
-msgstr ""
+msgstr "Ihr Name wurde bereits an %s gesendet, aber er kann auf dieser Seite aufgeblendet werden:"
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr "Ihr Name wurde ausgeblendet."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr "Ihre Offline Meldungen"
 
@@ -5600,8 +5694,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr "Ihr Passwort ist abgelaufen. Klicken Sie auf den Link in Ihrer E-Mail um es zu aktualisieren."
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr "Das Passwort muss mindestens %d Zeichen enthalten."
@@ -5623,28 +5717,28 @@ msgstr "Ihre Meldungen"
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
 msgid "Your shortlist"
-msgstr ""
+msgstr "Ihre Arbeitsliste"
 
 #: templates/web/base/auth/generate_token.html:8
 msgid "Your token has been generated"
-msgstr ""
+msgstr "Ihr Token wurde generiert"
 
 #: templates/web/base/report/update/form_user.html:6
 msgid "Your update"
-msgstr "Ihre Aktualisierung"
+msgstr "Ihr Update"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
-msgstr ""
+msgstr "Ihr Update wurde offline gespeichert sodass es später veröffentlicht werden kann."
 
 #: templates/web/base/my/my.html:103
 msgid "Your updates"
-msgstr "Ihre Aktualisierungen"
+msgstr "Ihre Updates"
 
 #: perllib/FixMyStreet/SMS.pm:46
 msgid "Your verification code is %s"
-msgstr ""
+msgstr "Ihr Verifikationscode ist %s"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_user_loggedin.html:14
@@ -5665,19 +5759,19 @@ msgstr "Administrator"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "alle"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
-msgstr ""
+msgstr "Ein Administrator"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5685,8 +5779,8 @@ msgstr ""
 msgid "by %s"
 msgstr "von %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "Rat"
 
@@ -5717,6 +5811,10 @@ msgstr "Benutzer bearbeiten"
 msgid "from %s different users"
 msgstr "von %s verschiedenen Benutzern"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5734,23 +5832,23 @@ msgstr "n/v"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr "keine"
 
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:80
 msgid "not the council's responsibility"
-msgstr ""
+msgstr "Liegt nicht in der Verantwortung der Verwaltungsstelle"
 
 #: templates/web/base/contact/enquiry/index.html:26
 #: templates/web/base/contact/index.html:99
 msgid "optional"
-msgstr ""
+msgstr "optional"
 
 #: templates/web/base/report/form/user.html:31
 #: templates/web/base/report/form/user.html:41
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #: templates/web/base/auth/general.html:6
 msgid "or <a href=\"%s\">create an account</a>"
@@ -5799,11 +5897,11 @@ msgstr ""
 #: templates/web/base/report/_report_meta_info.html:5
 #: templates/web/zurich/report/_main.html:7
 msgid "there is no pin shown as the user did not use the map"
-msgstr ""
+msgstr "Keine Stelle vorhanden, da der Benutzer keine Karte verwendet hat"
 
 #: templates/web/base/alert/_list.html:1
 msgid "this location"
-msgstr ""
+msgstr "Dieser Ort"
 
 #: perllib/FixMyStreet/Queue/Item/Report.pm:133
 msgid "this type of local problem"
@@ -5814,14 +5912,14 @@ msgid "today"
 msgstr "heute"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr "aktualisieren"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
-msgstr ""
+msgstr "Updates"
 
 #: templates/web/base/admin/reports/edit.html:53
 msgid "used map"
@@ -5837,14 +5935,14 @@ msgstr "Benutzer ist Problemeigentümer"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:700
 msgid "user not in abuse list"
-msgstr ""
+msgstr "Benutzer nicht in der Spamliste"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:698
 msgid "user removed from abuse list"
-msgstr ""
+msgstr "Benutzer aus der Spamliste entfernt"
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr ""
 
@@ -5852,8 +5950,8 @@ msgstr ""
 #, perl-format
 msgid "%d address"
 msgid_plural "%d addresses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Adresse"
+msgstr[1] "%d Adressen"
 
 #: perllib/Utils.pm:249
 #, perl-format
@@ -5901,15 +5999,15 @@ msgstr[1] "%d Wochen"
 #, perl-format
 msgid "%d year"
 msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Jahr"
+msgstr[1] "%d Jahre"
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s Tag"
+msgstr[1] "%s Tage"
 
 #: templates/web/base/reports/index.html:57
 #, perl-format
@@ -5925,19 +6023,19 @@ msgid_plural "%s problems reported"
 msgstr[0] "%s Problem gemeldet"
 msgstr[1] "%s Probleme gemeldet"
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s Meldung"
+msgstr[1] "%s Meldungen"
 
 #: templates/web/base/reports/index.html:51
 #, perl-format
 msgid "%s update on problems"
 msgid_plural "%s updates on problems"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s Update zu dieser Meldung"
+msgstr[1] "%s Updates zu dieser Meldung"
 
 #: templates/web/base/front/stats.html:19
 #, perl-format
@@ -5946,21 +6044,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> im letzten Monat behoben"
 msgstr[1] "<big>%s</big> im letzten Monat gehoben"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> Meldung in der letzten Woche"
 msgstr[1] "<big>%s</big> Meldungen in der letzten Woche"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> Gegenwärtige Meldung"
 msgstr[1] "<big>%s</big> Gegenwärtige Meldungen"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -5978,15 +6076,15 @@ msgstr[1] "Vor %d Tagen gemeldet"
 #, perl-format
 msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Es wurde noch <strong>keine</strong> Kontaktadresse für die andere Stelle eingetragen, die für diesen Bereich zuständig ist."
+msgstr[1] "Es wurden noch <strong>keine</strong> Kontaktadressen für die anderen Stelle eingetragen, die für diesen Bereich zuständig sind ."
 
 #: templates/web/base/report/new/top_message_none.html:3
 #, perl-format
 msgid "We do not yet have details for the council that covers this location."
 msgid_plural "We do not yet have details for the councils that cover this location."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Es wurde noch <strong>keine</strong> andere Stelle eingetragen, die für diesen Bereich zuständig ist."
+msgstr[1] "Es wurden noch <strong>keine</strong> anderen Stellen eingetragen, die für diesen Bereich zuständig sind. "
 
 #: templates/web/base/report/_item_small.html:20
 #, perl-format
@@ -5995,16 +6093,25 @@ msgid_plural "last updated %d days ago"
 msgstr[0] "zuletzt vor %d Tag bearbeitet"
 msgstr[1] "zuletzt vor %d Tagen bearbeitet"
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] "Monat"
 msgstr[1] "Monate"
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] "Meldung"
 msgstr[1] "Meldungen"
+
+#~ msgid "Closed by council"
+#~ msgstr "Geschlossen von der Verwaltung"
+
+#~ msgid "Filter report list"
+#~ msgstr "Berichtliste filtern"
+
+#~ msgid "Traffic management required?"
+#~ msgstr "Eingriff in der Verkehrsstelle erforderlich?"
diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po
index a9ba8d340..17b942259 100644
--- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/mysociety/teams/12067/el_GR/)\n"
@@ -20,8 +20,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "και"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Συνοπτικές αναφορές"
 
@@ -119,7 +119,7 @@ msgstr "στάλθηκαν %s ερωτηματολόγια &ndash; %s απαντ
 msgid "%s ref:&nbsp;%s"
 msgstr "%s αναφ.:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> και συνεργάτες"
 
@@ -165,6 +165,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(δεν αποστάλθηκε σε υπηρεσία)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -183,8 +185,8 @@ msgstr "(στάλθηκε και στις δύο)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Διάλεξε κατηγορία --"
@@ -214,17 +216,18 @@ msgstr ""
 "Μήπως να προσθέσετε μερικά <code>MAPIT_TYPES</code> στο αρχείο ρυθμίσεων;"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr "<h2>Αναφορές, Στατιστικά και Ενέργειες για </h2> <h1>%s</h1>"
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Προβολή</label> %s αναφορές <label for=\"filter_categories\">σχετικές πληροφορίες</label> %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> αποθηκεύτηκε."
 
@@ -254,7 +257,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ναι</strong> έχω κωδικό πρόσβασης"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -271,7 +274,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr "Έλεγχος ταυτότητας δύο παραγόντων"
 
@@ -293,7 +296,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Πρόσθεσε μία επαφή χρησιμοποιώντας την παρακάτω φόρμα."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Προσθήκη νέας κατηγορίας"
@@ -326,7 +329,7 @@ msgstr "Προσθήκη σταθερής κατάστασης"
 msgid "Add new category"
 msgstr "Προσθήκη νέας κατηγορίας"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "Προσθήκη επιλογής"
 
@@ -335,8 +338,8 @@ msgstr "Προσθήκη επιλογής"
 msgid "Add phone number"
 msgstr "Προσθήκη αρ. τηλεφώνου"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -344,21 +347,20 @@ msgid "Add to shortlist"
 msgstr "Προσθήκη στoν κατάλογο"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Προσθήκη χρήστη"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -374,6 +376,12 @@ msgstr ""
 msgid "Admin"
 msgstr "Διαχειριστής"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Ξανά:"
@@ -386,8 +394,8 @@ msgstr "Η ειδοποίηση %d δημιουργήθηκε για το &quot;
 msgid "Alert %d disabled (created %s)"
 msgstr "Η ειδοποίηση %d απενεργοποιήθηκε (δημιουργήθηκε %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Ειδοποίησέ με για μελλοντικές ενημερώσεις"
 
@@ -399,10 +407,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Όλα"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Όλες οι Αναφορές"
@@ -442,6 +452,11 @@ msgstr "Όλες οι αναφορές από %s μέχρι %s"
 msgid "All time"
 msgstr "Όλες τις ώρες"
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Αναφέρθηκε στην κατηγορία %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -478,7 +493,7 @@ msgstr "Ανώνυμος"
 msgid "Anonymous user"
 msgstr "Ανώνυμος χρήστης"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -491,7 +506,7 @@ msgid "Another user"
 msgstr "Άλλος χρήστης"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Είστε σίγουροι πως θέλετε να ακυρώσετε αυτή την μεταφόρτωση;"
 
@@ -500,8 +515,8 @@ msgstr "Είστε σίγουροι πως θέλετε να ακυρώσετε
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Είσαι σίγουρος?"
@@ -512,7 +527,7 @@ msgstr "Είσαι σίγουρος?"
 msgid "Area covered"
 msgstr "Περιοχή αρμοδιότητας"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Περιοχή:"
 
@@ -526,27 +541,32 @@ msgstr "Δεδομένου ότι αυτό είναι ένα δοκιμαστι
 msgid "Assign selected to role:"
 msgstr "Ανατέθηκε στο &quot;%s&quot;"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Ανάθεση στον αρμόδιο τομέα:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Ανάθεση σε διαφορετική κατηγορία:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Ανάθεση σε εξωτερικό τομέα:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Ανάθεση στο τμήμα:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Όλες οι κατηγορίες"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Ανατέθηκε στο &quot;%s&quot;"
@@ -559,7 +579,7 @@ msgstr "Σε κάθε αναζήτηση επιστρέφονται το πολ
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Αυτή τη στιγμή λειτουργούν μόνο η αναζήτηση και η προβολή αναφορών."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -567,11 +587,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -583,12 +603,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Σε αναμονή ελέγχου"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Πίσω"
@@ -609,14 +630,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Τομείς"
 
@@ -629,11 +648,13 @@ msgstr "Τομείς"
 msgid "Body"
 msgstr "Τομέας"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Τομέας:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -645,8 +666,7 @@ msgstr "Δεν μπορείς να βρεις το email μας; Έλεγξε τ
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Δεν μπορείς να δεις τον χάρτη; <em>Παράλειψη βήματος</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -662,15 +682,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -680,7 +698,7 @@ msgstr "Κατηγορία"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -703,6 +721,11 @@ msgstr "Κατηγορία:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Αλλαγή κωδικού πρόσβασης"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -719,7 +742,7 @@ msgstr "Αλλαγή κωδικού πρόσβασης"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 #, fuzzy
 msgid "Change two-factor authentication"
 msgstr "Έλεγχος ταυτότητας δύο παραγόντων"
@@ -730,12 +753,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr "Επίλεξε ένα όνομα <strong>κατηγορίας</strong> που να έχει νόημα για τους πολίτες (π.χ., \"Λακκούβες\", \"Φωτισμός δρόμων\") αλλά είναι χρήσιμο και για τον τομέα. Αυτά θα φαίνονται στο μενού της σελίδας \"Ανάφερε ένα πρόβλημα\"."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -772,8 +795,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -783,11 +806,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Κλειστό"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Κλειστό από την υπηρεσία"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -820,13 +839,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Ρυθμίσεις"
@@ -943,7 +961,7 @@ msgstr "Δημιουργία αναφοράς"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Δημιουργία κατηγορίας"
@@ -953,27 +971,25 @@ msgstr "Δημιουργία κατηγορίας"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Δημιουργία προτύπου"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Δημιουργήθηκε"
@@ -982,6 +998,17 @@ msgstr "Δημιουργήθηκε"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Δημιουργήθηκε"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Δημιουργήθηκε"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -993,10 +1020,6 @@ msgstr "Δημιουργήθηκε:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -1006,19 +1029,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "Δεν έχουν δημιουργηθεί τομείς μέχρι στιγμής."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Δεν υπάρχει τρόπος επικοινωνίας με τον πελάτη"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Πίνακας Ελέγχου"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1030,7 +1055,7 @@ msgstr "Εξετάστηκε από το τμήμα μέσα σε 5 εργάσι
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1040,7 +1065,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Διαγραφή προτύπου"
@@ -1062,9 +1087,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Περιγραφή"
 
@@ -1073,7 +1096,7 @@ msgstr "Περιγραφή"
 msgid "Destination"
 msgstr "Περιγραφή"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1109,7 +1132,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1117,6 +1140,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Αναφέρθηκε στην κατηγορία %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Αναφέρθηκε στην κατηγορία %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1151,25 +1184,25 @@ msgstr "Δεν γνωρίζω"
 msgid "Don't like forms?"
 msgstr "Δεν σου αρέσουν οι φόρμες;"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Σύρε φωτογραφίες εδώ ή <u>κάνε κλικ για ανέβασμα</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1184,7 +1217,7 @@ msgstr ""
 "Διαφορετικές κατηγορίες <strong>μπορούν να ανήκουν στην ίδια επαφή</strong> (διεύθυνση email).\n"
 "Αυτό σημαίνει ότι μπορείς να προσθέσεις πολλές κατηγορίες ακόμη και αν έχεις μία επαφή στον τομέα."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1196,7 +1229,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Επεξεργασία"
@@ -1207,12 +1240,11 @@ msgstr "Επεξεργασία"
 msgid "Edit body details"
 msgstr "Επεξεργασία λεπτομερειών του τομέα"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1220,17 +1252,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1267,8 +1297,9 @@ msgstr "Επεξεργαστής"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1277,15 +1308,14 @@ msgstr "Επεξεργαστής"
 msgid "Email"
 msgstr "Email"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1305,12 +1335,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Email:"
@@ -1380,12 +1411,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Σημείο τερματισμού"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Δώσε μια ονομασία για την οδό"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Γράψε έναν κοντινό ταχυδρομικό κώδικα, οδό ή περιοχή"
 
@@ -1412,10 +1443,10 @@ msgstr "Γράψε λεπτομέρειες σχετικά με το πρόβλ
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Τα πάντα"
 
@@ -1428,7 +1459,7 @@ msgstr "Παράδειγμα ταχυδρομικού κώδικα %s"
 msgid "Examples:"
 msgstr "Παραδείγματα:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1437,7 +1468,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1462,7 +1493,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1474,20 +1505,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Επιπλέον δεδομένα:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1520,20 +1551,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Φίλτρο λίστας αναφοράς"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Πρώτη φορά"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Φωτογραφίες από κοντινές και πρόσφατες αναφορές"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Νέες αναφορές"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Διόρθωσέ το επιλέγοντας μία <strong>περιοχή αρμοδιότητας</strong> στη φόρμα <em>Επεξεργασία λεπτομερειών του σώματος</em> παρακάτω."
@@ -1563,7 +1599,7 @@ msgstr "Σήμανση ως διαγραμμένο"
 msgid "Flag user"
 msgstr "Επισήμανση χρήστη"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Επισημασμένα"
@@ -1572,7 +1608,7 @@ msgstr "Επισημασμένα"
 msgid "Flagged reports and users"
 msgstr "Επισημασμένες αναφορές και χρήστες"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Οι επισημασμένοι χρήστες καταγράφονται στη σελίδα <a href='%s'>επισημασμένων</a>."
 
@@ -1580,8 +1616,8 @@ msgstr "Οι επισημασμένοι χρήστες καταγράφοντα
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Οι επισημασμένοι χρήστες δεν υφίστανται κάποιο είδος περιορισμού. Είναι απλά μία λίστα από χρήστες που έχουν επισημανθεί ώστε να ξεχωρίζουν."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Επισημασμένοι:"
 
@@ -1607,11 +1643,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Ξέχασες τον κωδικό πρόσβασής σου;"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Προωθήθηκε στον εξωτερικό τομέα"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Η επιθυμία προωθήθηκε στον εξωτερικό τομέα"
 
@@ -1621,12 +1657,20 @@ msgstr "Η επιθυμία προωθήθηκε στον εξωτερικό τ
 msgid "Frequently Asked Questions"
 msgstr "Συχνές Ερωτήσεις"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1648,7 +1692,7 @@ msgstr "Λήψη ενημερώσεων για προβλήματα %s"
 msgid "Get updates of problems in this %s"
 msgstr "Λήψη ενημερώσεων για προβλήματα σε αυτό το &quot;%s&quot;"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Λήψη μίας ροής RSS "
 
@@ -1664,15 +1708,15 @@ msgstr "Χαιρόμαστε που φτιάχτηκε!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1682,7 +1726,7 @@ msgstr "Εμπρός"
 msgid "Going to send questionnaire?"
 msgstr "Σκοπεύεις να στείλεις ερωτηματολόγιο;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1708,6 +1752,7 @@ msgstr "Έχεις αναφέρει ποτέ ξανά ένα πρόβλημα σ
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1742,7 +1787,8 @@ msgstr "Κρυμμένα"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1770,7 +1816,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Απόκρυψη καρφιτσών"
 
@@ -1824,11 +1870,9 @@ msgstr "Δεν μπορέσαμε να εντοπίσουμε το πρόβλη
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "Ταυτότητα"
 
@@ -1849,15 +1893,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1871,7 +1915,7 @@ msgstr "Αν δύο ή περισσότεροι τομείς υπηρετούν
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1895,7 +1939,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1932,7 +1976,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1956,6 +2000,17 @@ msgstr "Βρίσκεται στον πίνακα καταχρήσεων;"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "Επιπλέον, θα επιστραφούν οι παρακάτω ιδιότητες που δεν περιλαμβάνονται στις προδιαγραφές του Open311 v2: agency_sent_datetime, title (επιστρέφεται επίσης ως μέρος της περιγραφής), interface_used, comment_count, requestor_name (υπάρχει μόνο εφόσον ο αιτών επιτρέψει την εμφάνιση του ονόματός του στην ιστοσελίδα)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "πτέρυγα"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1965,20 +2020,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr "Δεν έχετε νέα μηνύματα!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Να περιλαμβάνονται οι προσωπικές πληροφορίες του υποβολέα"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Εσφαλμένη τιμή has_photo \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1995,16 +2050,12 @@ msgstr "Εσωτερικές οδηγίες"
 msgid "Internal notes"
 msgstr "Εσωτερικές οδηγίες"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Εσφαλμένη τιμή agency_responsible %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Λανθασμένη μορφοποίηση %s."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2056,13 +2107,13 @@ msgstr "Τελευταία ενημέρωση"
 msgid "Last&nbsp;update:"
 msgstr "Τελευταία&nbsp;ενημέρωση:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2079,7 +2130,7 @@ msgstr "Λίστα όλων των αναφερθέντων προβλημάτω
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Φορτώνει..."
@@ -2117,17 +2168,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2145,19 +2197,20 @@ msgstr ""
 msgid "MAP"
 msgstr "ΧΑΡΤΗΣ"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2171,24 +2224,24 @@ msgstr "Χάρτης"
 msgid "Mark as sent"
 msgstr "Σημείωση ως απεσταλμένο"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Να επισημάνεις ως <strong>επισημασμένους</strong> τους χρήστες των οποίων τη συμπεριφορά θα ήθελες να παρακολουθείς."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Μήνυμα προς τον αρμόδιο τομέα:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Μήνυμα προς τον εξωτερικό τομέα:"
 
@@ -2201,7 +2254,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Λείπει το jurisdiction_id"
 
@@ -2209,8 +2262,7 @@ msgstr "Λείπει το jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2233,7 +2285,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "Ελέγχθηκε από το τμήμα μέσα σε μία εργάσιμη ημέρα"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2243,14 +2295,14 @@ msgstr ""
 msgid "Month"
 msgstr "Μήνας"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2278,9 +2330,10 @@ msgstr ""
 msgid "Name"
 msgstr "Όνομα"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Όνομα:"
@@ -2298,7 +2351,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Η οδός που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα από το OpenStreetMap): %s%s"
 
@@ -2306,12 +2359,12 @@ msgstr "Η οδός που βρίσκεται πλησιέστερα στην κ
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Ο ταχυδρομικός κώδικας που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα): %s (%sm μακριά)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Η οδός που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα από το Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2336,7 +2389,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Προστέθηκε νέος τομέας"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Προστέθηκε νέα επαφή κατηγορίας"
 
@@ -2350,8 +2403,8 @@ msgstr ""
 msgid "New field"
 msgstr "Προσθήκη πεδίου"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Νέα εσωτερική σημείωση:"
 
@@ -2359,13 +2412,13 @@ msgstr "Νέα εσωτερική σημείωση:"
 msgid "New local problems on FixMyStreet"
 msgstr "Νέα τοπικά προβλήματα στο FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Νέα σημείωση προς τον Διαχειριστή Παροχών Υπηρεσίας:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2442,7 +2495,7 @@ msgstr "Νέο πρότυπο"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2455,7 +2508,6 @@ msgstr "Επόμενο"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2464,11 +2516,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Όχι"
 
@@ -2480,11 +2532,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Κανένας τομέας"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Δεν επιλέχθηκε κάποια υπηρεσία"
 
@@ -2500,8 +2553,8 @@ msgstr "Δε βρέθηκαν επισημασμένα προβλήματα."
 msgid "No flagged users found."
 msgstr "Δε βρέθηκαν επισημασμένοι χρήστες."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Καμία περαιτέρω ενημέρωση"
 
@@ -2537,15 +2590,15 @@ msgstr "Δεν υπάρχουν υποστηρικτές"
 msgid "None"
 msgstr "Κανένα"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2556,10 +2609,14 @@ msgstr ""
 "Χρήστες εξουσιοδοτημένου προσωπικού μπορούν να συσχετιστούν με τον τομέα που αντιπροσωπεύουν.<br>\n"
 "Ανάλογα με την υλοποίηση, οι χρήστες προσωπικού ίσως έχουν πρόσβαση στον πίνακα εργαλείων (περίληψη της δραστηριότητάς τους μέσα στον τομέα), τη δυνατότητα να κρύβουν αναφορές ή να ορίζουν ειδικές αναφορές κατάστασης."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Δεν αφορά το τμήμα μου"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Δεν αναφέρθηκε στο παρελθόν"
@@ -2607,12 +2664,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2620,12 +2677,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Παλιά κατάσταση"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2634,7 +2691,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2665,7 +2722,7 @@ msgstr "Αρχική σελίδα του Open311"
 msgid "Open311 specification"
 msgstr "Προδιαγραφές Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2677,7 +2734,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2685,16 +2742,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2726,7 +2783,7 @@ msgstr "Η σελίδα δεν βρέθηκε"
 msgid "Parent"
 msgstr "Πηγή"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Όλες οι κατηγορίες"
@@ -2735,13 +2792,13 @@ msgstr "Όλες οι κατηγορίες"
 msgid "Partial"
 msgstr "Εν μέρει"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Κωδικός πρόσβασης (προαιρετικό)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Ο κωδικός σου έχει αλλάξει"
@@ -2756,7 +2813,7 @@ msgstr "Κωδικός πρόσβασης (προαιρετικό)"
 msgid "Permissions"
 msgstr "Σύνδεσμος"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2764,19 +2821,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Τηλέφωνο:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Αριθμός τηλεφώνου"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Αριθμός τηλεφώνου (προαιρετικό)"
 
@@ -2784,30 +2846,26 @@ msgstr "Αριθμός τηλεφώνου (προαιρετικό)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Τηλέφωνο:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2827,9 +2885,8 @@ msgstr "Απαιτείται φωτογραφία"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2838,7 +2895,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr "Φωτογραφίες από κοντινές και πρόσφατες αναφορές"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2852,6 +2909,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Θέση της περιοχής στο χάρτη"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2879,27 +2941,26 @@ msgid "Please check your email address is correct"
 msgstr "Παρακαλούμε έλεγξε αν η διεύθυνση email είναι σωστή"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Παρακαλούμε επίλεξε μια κατηγορία"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2921,27 +2982,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Παρακαλούμε να μην κάνεις κατάχρηση&nbsp;&mdash; η κατάχρηση της υπηρεσίας υποβαθμίζει την αξία της για όλους τους χρήστες."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Παρακαλούμε γράψε ένα μήνυμα"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Παρακαλώ γράψτε ένα όνομα"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2954,16 +3015,16 @@ msgstr "Παρακαλούμε γράψε έναν κωδικό πρόσβαση
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Παρακαλούμε γράψε ένα θέμα"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2974,20 +3035,20 @@ msgstr "Παρακαλούμε γράψε ένα έγκυρο email"
 msgid "Please enter a valid email address"
 msgstr "Παρακαλούμε γράψε μία έγκυρη διεύθυνση email"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Παρακαλούμε γράψε μερικές λεπτομέρειες"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -3003,7 +3064,7 @@ msgid "Please enter your first name"
 msgstr "Παρακαλούμε γράψε το όνομά σου"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Παρακαλούμε γράψε το ονοματεπώνυμό σου, οι υπηρεσίες χρειάζονται αυτή την πληροφορία – αν δεν επιθυμείς να εμφανίζεται το όνομά σου στην ιστοσελίδα, ξετσέκαρε το πεδίο παρακάτω"
@@ -3015,9 +3076,9 @@ msgstr "Παρακαλούμε γράψε το όνομά σου"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Παρακαλούμε γράψε το όνομά σου"
@@ -3058,19 +3119,19 @@ msgstr "Παρακαλούμε συμπλήρωσε την παρακάτω φό
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Παρακαλούμε σήμανε αν θα ήθελες να λάβεις άλλο ερωτηματολόγιο"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Παρακαλούμε γράψε μία έγκυρη διεύθυνση email"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3097,24 +3158,28 @@ msgstr "Παρακαλούμε σημείωσε ότι η ενημέρωσή σ
 msgid "Please note:"
 msgstr "Παρακαλούμε σημείωσε ότι:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Παρακαλούμε δώσε μερικές εξηγήσεις για τους λόγους που ξανανοίγεις αυτή την αναφορά"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Παρακαλούμε γράψε κείμενο καθώς και δώσε μία φωτογραφία"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Παρακαλούμε πες αν έχεις ξαναναφέρει ένα πρόβλημα στην υπηρεσία στο παρελθόν"
 
@@ -3122,7 +3187,7 @@ msgstr "Παρακαλούμε πες αν έχεις ξαναναφέρει έ
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Επιλέξτε ένα σώμα"
 
@@ -3134,7 +3199,7 @@ msgstr "Παρακαλούμε επίλεξε τη ροή που επιθυμε
 msgid "Please select the type of alert you want"
 msgstr "Παρακαλούμε επίλεξε το είδος της ειδοποίησης που επιθυμείς"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Παρακαλούμε δήλωσε αν το πρόβλημα έχει διορθωθεί ή όχι"
 
@@ -3142,12 +3207,12 @@ msgstr "Παρακαλούμε δήλωσε αν το πρόβλημα έχει
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Παρακαλούμε ανέβασε μία εικόνα μόνο"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3155,27 +3220,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Παρακαλούμε γράψε ένα μήνυμα"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Δημοσίευση"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Δημοσιεύθηκε ανώνυμα στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Δημοσιεύθηκε από %s στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Δημοσιεύθηκε από <strong>%s</strong> (%s) στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Δημοσιεύθηκε από <strong>%s</strong> στις %s"
 
@@ -3191,7 +3252,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3199,11 +3260,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Προηγούμενα"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3219,9 +3280,9 @@ msgid "Privacy and cookies"
 msgstr "Ιδιωτικότητα και cookies"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Ιδιωτικό"
 
@@ -3270,7 +3331,7 @@ msgstr "Το πρόβλημα %s στάλθηκε στην υπηρεσία %s"
 msgid "Problem breakdown by state"
 msgstr "Ανάλυση προβλήματος ανά κατάσταση"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Το πρόβλημα επισημάνθηκε ως ανοιχτό."
 
@@ -3278,8 +3339,7 @@ msgstr "Το πρόβλημα επισημάνθηκε ως ανοιχτό."
 msgid "Problem state change based on survey results"
 msgstr "Αλλαγή κατάστασης προβλήματος βάσει αποτελεσμάτων από έρευνες"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Προβλήματα"
@@ -3304,18 +3364,18 @@ msgstr "Προσφάτως αναφερθέντα προβλήματα διορ
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Προβλήματα στο &quot;%s&quot;"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Προβλήματα στην περιοχή &quot;%s&quot;"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3323,7 +3383,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Προβλήματα σε ακτίνα %s, %s"
 
@@ -3331,11 +3391,15 @@ msgstr "Προβλήματα σε ακτίνα %s, %s"
 msgid "Property address:"
 msgstr "Διεύθυνση ακινήτου:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3349,11 +3413,11 @@ msgstr "Δώσε μια ενημέρωση"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Η εισαγωγή κωδικού πρόσβασης είναι προαιρετική, αλλά έτσι θα σου είναι ευκολότερο να αναφέρεις προβλήματα, να αφήνεις ενημερώσεις και να διαχειρίζεσαι τις αναφορές σου."
 
@@ -3361,12 +3425,12 @@ msgstr "Η εισαγωγή κωδικού πρόσβασης είναι προ
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Δημόσια απάντηση:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3409,11 +3473,11 @@ msgstr "Το ερωτηματολόγιο συμπληρώθηκε από τον
 msgid "RSS feed"
 msgstr "Ροή RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "Ροή RSS για &quot;%s&quot;"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "Ροή RSS για την περιοχή %s, %s"
 
@@ -3421,11 +3485,11 @@ msgstr "Ροή RSS για την περιοχή %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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "Ροή RSS από %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "Ροή RSS από %s, στην περιοχή &quot;%s&quot;"
 
@@ -3433,13 +3497,13 @@ msgstr "Ροή RSS από %s, στην περιοχή &quot;%s&quot;"
 msgid "RSS feed of nearby problems"
 msgstr "Ροή RSS για κοντινά προβλήματα"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "Ροή RSS για προβλήματα στο &quot;%s&quot;"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "Ροή RSS για προβλήματα στην περιοχή &quot;%s&quot;"
 
@@ -3453,11 +3517,11 @@ msgstr "Ροή RSS για πρόσφατα τοπικά προβλήματα"
 msgid "RSS feed of updates to this problem"
 msgstr "Ροή RSS για ενημερώσεις σε αυτό το πρόβλημα"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3470,7 +3534,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Λήψη email όταν γίνονται ενημερώσεις για αυτό το πρόβλημα"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3484,7 +3548,7 @@ msgstr "Πρόσφατα τοπικά προβλήματα, %s"
 msgid "Recently reported problems"
 msgstr "Πρόσφατες αναφορές προβλημάτων"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3497,7 +3561,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Θυμήσου ότι το FixMyStreet έχει ως πρωταρχικό σκοπό την αναφορά φυσικών προβλημάτων που μπορούν να διορθωθούν. Αν το πρόβλημα δεν είναι κατάλληλο για υποβολή μέσω αυτής της ιστοσελίδας μπορείς να επικοινωνήσεις με την υπηρεσία απευθείας μέσω της ιστοσελίδας της."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3509,8 +3574,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Αφαίρεση σήμανσης"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3526,17 +3591,21 @@ msgstr ""
 msgid "Remove option"
 msgstr "Προσθήκη επιλογής"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Αφαίρεση φωτογραφίας (δεν αναιρείται!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Απάντηση στον χρήστη:"
 
@@ -3544,14 +3613,14 @@ msgstr "Απάντηση στον χρήστη:"
 msgid "Report"
 msgstr "Αναφορά"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3560,7 +3629,7 @@ msgid "Report a problem"
 msgstr "Αναφορά προβλήματος"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3576,7 +3645,7 @@ msgid "Report anonymously"
 msgstr "Αναφέρθηκε ανώνυμα στις %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3612,7 +3681,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Ανάφερε, δες ή συζήτησε τα τοπικά προβλήματα"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Αναφέρθηκε ανώνυμα στις %s"
@@ -3623,7 +3692,7 @@ msgstr "Αναφέρθηκε ανώνυμα στις %s"
 msgid "Reported before"
 msgstr "Αναφέρθηκε προηγουμένως"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Αναφέρθηκε από %s στις %s"
@@ -3637,27 +3706,27 @@ msgstr "Αναφέρθηκε από:"
 msgid "Reported in the %s category"
 msgstr "Αναφέρθηκε στην κατηγορία %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Αναφέρθηκε στην κατηγορία %s, ανώνυμα στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Αναφέρθηκε στην κατηγορία %s από τον %s στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Αναφέρθηκε μέσω %s ανώνυμα στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Αναφέρθηκε μέσω %s από τον %s στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s ανώνυμα στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s από τον %s στις %s"
 
@@ -3676,17 +3745,15 @@ msgstr "Αναφέρθηκε:"
 msgid "Reporting a problem"
 msgstr "Αναφορά προβλήματος"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Αναφορές"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3714,15 +3781,15 @@ msgid "Reports published"
 msgstr "Αναφορές που δημοσιεύθηκαν"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3735,7 +3802,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3788,39 +3855,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "Σωστή τοποθεσία;"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Χειριστής δρόμου για την ονομασμένη οδό (που πρόερχεται από τον αριθμό και το είδος αναφοράς οδού): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Χειριστής δρόμου για την ονομασμένη οδο (από το OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Περιστροφή αριστερά"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3836,20 +3909,20 @@ msgstr "Αν περιστρέψετε την φωτογραφία θα χαθο
 msgid "Satellite"
 msgstr "Δορυφόρος"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3866,13 +3939,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Αναζήτηση Αναφορών"
 
@@ -3885,7 +3957,7 @@ msgstr "Αναζήτηση Χρηστών"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Αναζήτηση αναφορών"
 
@@ -3900,12 +3972,12 @@ msgstr "Αναζήτηση:"
 msgid "Searching found no reports."
 msgstr "Η αναζήτηση δε βρήκε καμία αναφορά."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Η αναζήτηση δε βρήκε κανένα χρήστη."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3915,8 +3987,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3926,7 +3997,7 @@ msgid "Select a body"
 msgstr "Επίλεξε ένα σώμα"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Διάλεξε μια περιοχή"
@@ -3947,7 +4018,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3960,7 +4031,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3969,11 +4040,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "Επιστροφή αναφοράς"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Στάλθηκε στο %s %s αργότερα"
 
@@ -4011,7 +4082,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4022,7 +4093,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4047,8 +4118,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4059,7 +4130,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Προβολή καρφιτσών"
 
@@ -4119,7 +4190,7 @@ msgid "Some photos of recent reports"
 msgstr "Μερικές φωτογραφίες από πρόσφατες αναφορές"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Κείμενο για εντοπισμό"
 
@@ -4128,12 +4199,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Συγνώμη, φαίνεται πως αυτός ο ταχυδρομικός κώδικας είναι  Crown dependency postcode, δεν καλύπτουμε τέτοιους ΤΚ,"
 
@@ -4151,9 +4221,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Συγνώμη, υπήρξε βλάβη στην επιβεβαίωση του προβλήματός σου."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Συγνώμη, δεν μπορέσαμε να βρούμε αυτήν την τοποθεσία."
 
@@ -4163,13 +4233,13 @@ msgstr "Συγνώμη, δεν μπορέσαμε να βρούμε αυτήν 
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr "Λυπούμαστε, δεν μπορούμε να σας συνδέσουμε. Παρακαλούμε συμπληρώστε την παρακάτω φόρμα."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Συγνώμη, δεν μπορέσαμε να αναλύσουμε αυτήν την τοποθεσία. Παρακαλούμε προσπάθησε ξανά."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4184,11 +4254,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4197,11 +4267,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4225,18 +4295,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Κατάσταση"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4245,31 +4315,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Κατάσταση:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Στατιστικά"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Κατάσταση"
 
@@ -4287,7 +4354,7 @@ msgstr "Street View"
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Τμήμα/Σώμα"
 
@@ -4306,50 +4373,48 @@ msgstr "Θέμα:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Υποβολή"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Υποβολή αλλαγών"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Υποβολή ερωτηματολογίου"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Υποβλήθηκε"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Γίνε συνδρομητής"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4362,7 +4427,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Οι ενημερώσεις έχουν όριο χαρακτήρων %s. Παρακαλούμε συντόμευσε την ενημέρωσή σου"
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4376,20 +4441,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Περίληψη"
 
@@ -4400,14 +4464,19 @@ msgstr "Περιληπτικές αναφορές"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4425,13 +4494,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr "Πρότυπο &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Πρότυπα"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Κείμενο"
@@ -4453,6 +4526,11 @@ msgstr "Έκδοση απλού κειμένου"
 msgid "Text:"
 msgstr "Κείμενο:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Κείμενο"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Ευχαριστούμε που ανέφερες αυτό το ζήτημα!"
@@ -4482,7 +4560,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Ευχαριστούμε, χαιρόμαστε που διορθώθηκε! Μπορούμε απλά να σε ρωτήσουμε αν έχεις αναφέρει ξανά κάποιο πρόβλημα στην υπηρεσία στο παρελθόν;"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4494,27 +4572,29 @@ msgstr "Η εικόνα δεν φαίνεται να έχει μεταφορτω
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Η τοποθεσία δεν φαίνεται να βρίσκεται στην αρμοδιότητα κάποιου συμβουλίου. Ίσως είναι εκτός ακτής ή εκτός της χώρας. Παρακαλούμε προσπάθησε ξανά."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Η τοποθεσία δεν φαίνεται να βρίσκεται στην Ελλάδα. Παρακαλούμε προσπάθησε ξανά."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Ο ταχυδρομικός κώδικας δεν αναγνωρίστηκε, λυπούμαστε."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Αυτό το πρόβλημα έχει σημειωθεί ως απεσταλμένο."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Το πρόβλημα τώρα θα αποσταλθεί ξανά."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Η αναφορά αφαιρέθηκε από το FixMyStreet."
 
@@ -4560,8 +4640,8 @@ msgstr "Η <strong>αρμοδιότητα</strong> χρειάζεται μόνο
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4620,7 +4700,7 @@ msgstr "Το σφάλμα ήταν: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "Οι παρακάτω ιδιότητες του Open311 v2 επιστρέφονται για κάθε αίτημα: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code και service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "Οι ακόλουθες πληροφορίες σχετικά με την πλησιέστερη οδό ίσως είναι ανακριβείς ή άσχετες, αν το πρόβλημα βρίσκεται κοντά σε πολλές οδούς ή κοντά σε μια οδό χωρίς καταχωρημένο όνομα στο OpenStreetMap."
 
@@ -4682,8 +4762,8 @@ msgstr "Ο χρήστης δεν μπορέσε να εντοπίσει το π
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4718,7 +4798,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4736,12 +4816,12 @@ msgstr "Υπήρξε πρόβλημα στην προβολή αυτής της
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Υπήρξε πρόβλημα με την ενημέρωσή σου. Παρακαλούμε προσπάθησε ξανά."
 
@@ -4749,7 +4829,7 @@ msgstr "Υπήρξε πρόβλημα με την ενημέρωσή σου. Π
 msgid "There were problems with your report. Please see below."
 msgstr "Υπήρξαν προβλήματα με την αναφορά σου. Παρακαλούμε δες παρακάτω."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Υπήρξαν προβλήματα με την ενημέρωσή σου. Παρακαλούμε δες παρακάτω."
 
@@ -4833,10 +4913,10 @@ msgstr "Αυτό το email στάλθηκε και στις δύο υπηρεσ
 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 "Αυτό το email στάλθηκε σε πολλές υπηρεσίες που είναι αρμόδιες για την τοποθεσία του προβλήματος, αφού η επιλεγμένη κατηγορία συμπεριλαμβάνεται σε κάθε μια από αυτές. Παρακαλούμε αγνόησέ το αν η υπηρεσία σου δεν είναι αρμόδια για την αντιμετώπιση του ζητήματος."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Αυτή η πληροφορία απαιτείται"
 
@@ -4853,19 +4933,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Αυτό το πρόβλημα έχει διορθωθεί"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Αυτό το πρόβλημα δεν έχει διορθωθεί"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4878,26 +4962,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Αυτή η αναφορά αναμένει έγκριση."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Αυτή η αναφορά είναι προς το παρόν καταχωρημένη ως κλειστή."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Αυτή η αναφορά είναι προς το παρόν καταχωρημένη ως διορθωμένη."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Αυτή η αναφορά είναι προς το παρόν καταχωρημένη ως ανοιχτή."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4905,15 +4989,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Αυτή η ιστοσελίδα περιέχει επίσης μία φωτογραφία του προβλήματος, που παρέχεται από το χρήστη."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Χρόνος που αφιερώθηκε (λεπτά):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4937,6 +5024,10 @@ msgstr "Τίτλος"
 msgid "Title:"
 msgstr "Τίτλος:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "Για να βρεις τις τοπικές ειδοποιήσεις που υπάρχουν για σένα, παρακαλούμε γράψε τον %s ταχυδρομικό σου κώδικα, την οδό ή την περιοχή σου."
@@ -4962,7 +5053,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "Για την προβολή ενός χάρτη με την ακριβή τοποθεσία του ζητήματος"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4987,11 +5078,6 @@ msgstr ""
 msgid "Total"
 msgstr "Σύνολο"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -5014,17 +5100,17 @@ msgstr "Στείλε μας ένα email:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 #, fuzzy
 msgid "Two-factor authentication"
 msgstr "Έλεγχος ταυτότητας δύο παραγόντων"
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5034,7 +5120,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5064,10 +5150,10 @@ msgstr "Άγνωστο σφάλμα"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "Άγνωστη ταυτότητα προβλήματος"
 
@@ -5079,13 +5165,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Ενημέρωση"
 
@@ -5136,29 +5222,27 @@ msgstr "Η ενημέρωση άνοιξε ξανά το πρόβλημα"
 msgid "Update statuses"
 msgstr "Καταστάσεις ενημέρωσης"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Ενημερώθηκε"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Ενημερώθηκε!"
 
@@ -5169,7 +5253,7 @@ msgstr "Ενημερώθηκε!"
 msgid "Updates"
 msgstr "Ενημερώσεις"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Οι ενημερώσεις έχουν όριο χαρακτήρων %s. Παρακαλούμε συντόμευσε την ενημέρωσή σου"
 
@@ -5199,6 +5283,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5212,8 +5304,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5231,7 +5323,7 @@ msgid "User flagged"
 msgstr "Ο χρήστης επισημάνθηκε"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5244,27 +5336,25 @@ msgstr "Η αναζήτηση χρηστών βρίσκει αποτελέσμα
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Χρήστες"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5272,9 +5362,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Οι τιμές ενημερώθηκαν"
 
@@ -5300,7 +5390,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Προβολή αναφοράς στην ιστοσελίδα"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Προβολή αναφορών ανά πτέρυγα"
 
@@ -5308,7 +5398,7 @@ msgstr "Προβολή αναφορών ανά πτέρυγα"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5326,7 +5416,7 @@ msgstr "Προβάλλεται ένα πρόβλημα"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Πτέρυγες του συμβουλίου"
 
@@ -5396,7 +5486,7 @@ msgstr "Όταν αποστάλθηκε "
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5416,7 +5506,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "Θα ήθελες να συνεισφέρεις στο FixMyStreet; Ο κώδικας μας είναι ανοιχτής πηγής και <a href=\"https://fixmystreet.org\">διαθέσιμος στο fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Θα ήθελες να λάβεις και άλλο ερωτηματολόγιο σε 4 εβδομάδες, για να σου υπενθυμίσει να ελέγξεις την τρέχουσα κατάσταση;"
 
@@ -5428,7 +5518,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Να χρησιμοποιείς τα κατάλληλα σημεία στίξης και να αποφεύγεις να γράφεις μόνο με κεφαλαία γράμματα, ώστε το μήνυμά σου να είναι εύκολο στην ανάγνωση."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5439,12 +5528,12 @@ msgstr "Να χρησιμοποιείς τα κατάλληλα σημεία σ
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Ναι"
 
@@ -5457,7 +5546,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5470,7 +5559,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Με το παρόν, δηλώνεις ότι η παρακάτω ενημέρωση είναι καταχρηστική, περιέχει προσωπικές πληροφορίες ή κάτι παρόμοιο: "
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5479,7 +5568,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Μπορείς να <a href=\"%s%s\">δεις το πρόβλημα σε αυτόν τον ιστότοπο</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Μπορείς να προσθέσεις την ηλεκτρονική διεύθυνση ενός καταχρηστικού χρήστη στην λίστα καταχρήσεων, κάτι που αυτόματα θα αποκρύπτει (και δεν θα αποστέλλει) αναφορές που αυτός δημιουργεί."
 
@@ -5512,7 +5601,7 @@ msgstr "Μπορείς να μας βοηθήσεις με το να βρεις
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Μπορείς να επισημάνεις έναν τομέα ως διαγεγραμμένο αν δεν θέλεις να είναι ενεργός σε αυτόν τον ιστότοπο."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5522,7 +5611,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Έχεις υποχωρήσει - παρακαλούμε συμπλήρωσε το κουτί που υπάρχει παραπάνω."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5530,7 +5619,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Έχεις ήδη απαντήσεις σε αυτό το ερωτηματολόγιο. Αν έχεις κάποιος απορία, παρακαλούμε <a href='%s'>επικοινώνησε</a>, ή <a href='%s'>δες το πρόβλημά σου</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 #, fuzzy
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Έχεις ήδη επισυνάψει φωτογραφίες σε αυτήν την αναφορά. Μπορείς να επισυνάψεις μέχρι 3 (αν προσπαθήσεις να μεταφορτώσεις περισσότερες, θα αφαιρεθούν οι παλιότερες)."
@@ -5540,8 +5629,7 @@ msgstr "Έχεις ήδη επισυνάψει φωτογραφίες σε αυ
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Έχεις ήδη επισυνάψει φωτογραφίες σε αυτήν την αναφορά. Μπορείς να επισυνάψεις μέχρι 3 (αν προσπαθήσεις να μεταφορτώσεις περισσότερες, θα αφαιρεθούν οι παλιότερες)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr "Έχεις ήδη επισυνάψει φωτογραφίες σε αυτήν την ενημέρωση. Μπορείς να επισυνάψεις μέχρι 3 (αν προσπαθήσεις να μεταφορτώσεις περισσότερες, θα αφαιρεθούν οι παλιότερες)."
 
@@ -5608,9 +5696,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5620,13 +5708,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr "Έλεγχος ταυτότητας δύο παραγόντων"
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5655,16 +5744,16 @@ msgstr "Το όνομά σου"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5684,8 +5773,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5718,7 +5807,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5749,19 +5838,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5769,8 +5858,8 @@ msgstr ""
 msgid "by %s"
 msgstr "από %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "υπηρεσία"
 
@@ -5801,6 +5890,10 @@ msgstr "επεξεργασία χρήστη"
 msgid "from %s different users"
 msgstr "από %s διαφορετικούς χρήστες"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5818,7 +5911,7 @@ msgstr "μη διαθέσιμο"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5901,12 +5994,12 @@ msgid "today"
 msgstr "σήμερα"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5931,7 +6024,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "πτέρυγα"
 
@@ -5991,7 +6084,7 @@ msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6012,7 +6105,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6033,21 +6126,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> διορθώθηκε μέσα στον προηγούμενο μήνα"
 msgstr[1] "<big>%s</big> διορθώθηκαν μέσα στον προηγούμενο μήνα"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> αναφορά μέσα στην προηγούμενη εβδομάδα"
 msgstr[1] "<big>%s</big> αναφορές μέσα στην προηγούμενη εβδομάδα"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> πρόσφατη αναφορά"
 msgstr[1] "<big>%s</big> πρόσφατες αναφορές"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6082,20 +6175,32 @@ msgid_plural "last updated %d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Κλειστό από την υπηρεσία"
+
+#~ msgid "Filter report list"
+#~ msgstr "Φίλτρο λίστας αναφοράς"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Εσφαλμένη τιμή agency_responsible %s"
+
+#~ msgid "Post"
+#~ msgstr "Δημοσίευση"
+
 #~ msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 #~ msgstr "<strong>Σημείωση:</strong> Η αναφορά έχει δρομολογηθεί προς ενέργεια. Για οποιαδήποτε μεταβολή συμβεί δεν θα ενημερωθεί αυτόματα."
 
diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
index 8fe49cfbb..bf13b3555 100644
--- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -4,15 +4,17 @@
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
 # Translators:
-# mySociety <transifex@mysociety.org>, 2019
+# mySociety <transifex@mysociety.org>, 2020
+# Paulina Rodriguez <pauli.rodriguez.c@gmail.com>, 2020
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
-"PO-Revision-Date: 2019-04-29 18:03+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
+"PO-Revision-Date: 2020-03-05 09:59+0000\n"
+"Last-Translator: Paulina Rodriguez <pauli.rodriguez.c@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/mysociety/teams/12067/es/)\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +22,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " y "
@@ -56,7 +58,7 @@ msgstr "%d usuarios ya existen"
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Informes de notificación"
 
@@ -111,7 +113,7 @@ msgstr "%s cuestionarios enviados &ndash; %s respondidos (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; colaboradores <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>"
 
@@ -157,6 +159,8 @@ msgstr "(ya no existe)"
 msgid "(not sent to council)"
 msgstr "(no enviadas al ayuntamiento)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +179,8 @@ msgstr "(enviado a ambos)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr "(también tenemos feeds RSS para problemas en %s)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Escoja una categoría --"
@@ -186,9 +190,8 @@ msgid "-- Pick an option --"
 msgstr "-- Escoja una opción --"
 
 #: templates/web/base/contact/enquiry/index.html:35
-#, fuzzy
 msgid "-- Please select --"
-msgstr "Por favor seleccione un órgano."
+msgstr "-- Por favor seleccione --"
 
 #: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
@@ -206,17 +209,18 @@ msgstr ""
 "Por favor añada <code>MAPIT_TYPES</code> en su archivo de configuración."
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr "<h2> Informes, estadísticas y acciones para </h2> <h1>%s </h1>"
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Mostrar</label> %s informes<label for=\"filter_categories\">sobre</label> %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> guardado"
 
@@ -246,7 +250,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Sí</strong>- tengo una contraseña"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -256,14 +260,14 @@ msgstr ""
 
 #: templates/web/base/report/new/form_user.html:8
 msgid "About the problem"
-msgstr ""
+msgstr "Sobre el problema"
 
 #: perllib/FixMyStreet/App/Controller/Root.pm:128
 msgid "Access denied"
-msgstr ""
+msgstr "Acceso denegado"
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr "Activar autenticación doble"
 
@@ -286,10 +290,9 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Añada un contacto usando el siguiente formulario."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
-#, fuzzy
+#: templates/web/base/admin/bodies/contact-form.html:140
 msgid "Add another parent category"
-msgstr "Agregar nueva categoría"
+msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:139
 #: templates/web/base/admin/bodies/index.html:78
@@ -319,7 +322,7 @@ msgstr "Añadir estado de reparación"
 msgid "Add new category"
 msgstr "Agregar nueva categoría"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "Añadir opción"
 
@@ -328,8 +331,8 @@ msgstr "Añadir opción"
 msgid "Add phone number"
 msgstr "Agregar número de teléfono"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -337,21 +340,20 @@ msgid "Add to shortlist"
 msgstr "Añadir a favoritos"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Añadir un usuario"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Añadir/editar categoría de problemas"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Añadir / editar prioridades de respuesta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Añadir / editar plantillas de respuesta"
 
@@ -367,6 +369,12 @@ msgstr "Añadir este informe a tu lista de favoritos lo eliminará de la lista d
 msgid "Admin"
 msgstr "Administrador"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Otra vez:"
@@ -379,8 +387,8 @@ msgstr "Alerta %d creada por %s, tipo %s, parámetros %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Alerta %d desactivada (creada %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Notificadme actualizaciones futuras"
 
@@ -392,10 +400,12 @@ msgstr "Alertas:"
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Todos"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Todas las notificaciones"
@@ -435,6 +445,10 @@ msgstr "Todas las notificaciones entre %s y %s"
 msgid "All time"
 msgstr "Todo el tiempo"
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+msgid "Allow anonymous reports on this category"
+msgstr ""
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -453,9 +467,8 @@ msgid "An email address or service ID (Open311 or similar)."
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:14
-#, fuzzy
 msgid "An email address."
-msgstr "Agregar dirección de email"
+msgstr "Un correo electrónico."
 
 #: templates/web/base/questionnaire/index.html:33
 msgid "An update marked this problem as fixed."
@@ -471,7 +484,7 @@ msgstr "Anónimo"
 msgid "Anonymous user"
 msgstr "Usuario anónimo"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -484,7 +497,7 @@ msgid "Another user"
 msgstr "Otro usuario"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "¿Estás seguro que quieres cancelar esta carga?"
 
@@ -493,8 +506,8 @@ msgstr "¿Estás seguro que quieres cancelar esta carga?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "¿Estás seguro?"
@@ -505,7 +518,7 @@ msgstr "¿Estás seguro?"
 msgid "Area covered"
 msgstr "Área cubierta"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Área:"
 
@@ -515,31 +528,35 @@ msgid "As this is a staging site and %s is false, reports made on this site will
 msgstr "Puesto que éste es un servidor de integración y %s es falsa, las notificaciones serán enviados al email del propio informante, no al contacto establecido para la categoría de problema."
 
 #: templates/web/base/admin/users/index.html:73
-#, fuzzy
 msgid "Assign selected to role:"
-msgstr "Asignar usuarios a áreas"
+msgstr "Asignar seleccionado al rol:"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Asignar al organismo competente\\:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Asigne a otra categoria:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Asignar a un órgano externo:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Asigne a la subdivisión:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "Asignar usuarios a áreas"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Todas las categorías"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Asignado a %s"
@@ -552,7 +569,7 @@ msgstr "Se devuelven hasta %d solicitudes en cada consulta. Dichas solicitudes s
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Por el momento sólo funcionan la búsqueda y consulta de notificaciones."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr "Los usuarios del personal autorizado pueden asociarse con las categorías en las que operan."
 
@@ -560,11 +577,11 @@ msgstr "Los usuarios del personal autorizado pueden asociarse con las categoría
 msgid "Auto Response"
 msgstr "Auto Respuesta"
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Auto-respuesta \\:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -576,12 +593,13 @@ msgstr "Promedio de tiempo entre el informe de un problema y su arreglo, último
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Evite la información personal y las matrículas de vehículos"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "En espera de revisión"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Atras"
@@ -592,7 +610,7 @@ msgstr "Volver a todos los informes"
 
 #: templates/web/base/admin/manifesttheme/index.html:9
 msgid "Background Colour"
-msgstr ""
+msgstr "Color de fondo"
 
 #: templates/web/base/admin/report_blocks.html:18
 msgid "Ban user"
@@ -600,16 +618,14 @@ msgstr "Bloquear usuario"
 
 #: templates/web/base/admin/extra-metadata-item.html:35
 msgid "Behaviour"
-msgstr ""
+msgstr "Comportamiento"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Órganos administrativos"
 
@@ -622,11 +638,13 @@ msgstr "Órganos administrativos"
 msgid "Body"
 msgstr "Órgano administrativo"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Órgano administrativo:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr "Archivo CSV"
 
@@ -638,8 +656,7 @@ msgstr "¿No puede encontrar nuestro correo electrónico? Revise su carpeta de s
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "¿No puedes ver el mapa? <em>Salte este paso</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -655,15 +672,13 @@ msgstr "Categorías:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -673,7 +688,7 @@ msgstr "Categoría"
 msgid "Category and State"
 msgstr "Categoría y Estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Categoría cambiada de '%s' a '%s'"
 
@@ -696,6 +711,11 @@ msgstr "Categoría:"
 msgid "Change"
 msgstr "Cambiar"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Cambiar contraseña"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -712,10 +732,9 @@ msgstr "Cambiar contraseña"
 msgid "Change phone number"
 msgstr "Cambiar número de teléfono"
 
-#: templates/web/base/auth/generate_token.html:56
-#, fuzzy
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
-msgstr "Activar autenticación doble"
+msgstr "Cambiar autenticación doble"
 
 #: templates/web/base/admin/bodies/_category_field.html:3
 msgid ""
@@ -725,12 +744,12 @@ msgstr ""
 "Elegir un nombre de <strong>categoria</strong> que tenga sentido para el público (por ejemplo, \"baches\", \"alumbrado público\") y que sea también útil\n"
 "para el organismo administrativo. Las categorías aparecerán en un menú desplegable al notificar un problema."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr "Elija otro"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr "Borrar datos sin conexión"
 
@@ -760,15 +779,15 @@ msgstr "Haz clic en el enlace de ese correo electrónico para iniciar sesión."
 
 #: templates/web/base/report/new/fill_in_details_form.html:7
 msgid "Click the map or drag the pin to adjust the location"
-msgstr ""
+msgstr "Haga clic en el mapa o arrastre el pin para ajustar la ubicación"
 
 #: templates/web/base/report/new/duplicate_suggestions.html:6
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -778,11 +797,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Cerrada"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Cerrada por el Ayuntamiento"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr "No se permiten actualizaciones"
 
@@ -815,13 +830,12 @@ msgid "Code"
 msgstr "Código"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr "Cerrar mapa"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Configuración"
@@ -879,11 +893,11 @@ msgstr "Contactar con el equipo"
 #: templates/web/base/js/translation_strings.html:62
 #: templates/web/base/report/form/user.html:8
 msgid "Continue"
-msgstr ""
+msgstr "Continuar"
 
 #: templates/web/base/report/new/duplicate_suggestions.html:17
 msgid "Continue – report a new problem"
-msgstr ""
+msgstr "Continuar – reportar un nuevo problema"
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:151
 msgid "Convert location from Easting/Northing"
@@ -936,9 +950,9 @@ msgstr "Crear una notificación"
 
 #: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:7
 msgid "Create an account"
-msgstr ""
+msgstr "Crear una cuenta"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Crear una categoría"
@@ -948,27 +962,25 @@ msgstr "Crear una categoría"
 msgid "Create priority"
 msgstr "Crear una prioridad"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr "Crear reportes/actualizaciones como usuario anónimo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "Crear reportes/actualizaciones como el Ayuntamiento"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "Crear reportes/actualizaciones a nombre de un usuario"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Crear plantilla"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Creado"
@@ -977,6 +989,17 @@ msgstr "Creado"
 msgid "Created %d new users"
 msgstr "Creados %d nuevos usuarios"
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Creado"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Creado"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -988,10 +1011,6 @@ msgstr "Creado:"
 msgid "Current password:"
 msgstr "Contraseña actual:"
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr "Token actual:"
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr "Actualmente agrupados por %s"
@@ -1001,19 +1020,21 @@ msgstr "Actualmente agrupados por %s"
 msgid "Currently no bodies have been created."
 msgstr "No se han creado organismos aún."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Cliente no localizable"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Cuadro de mando"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr "Desactivar autenticación doble"
 
@@ -1025,7 +1046,7 @@ msgstr "Tratado por el departamento dentro de los 5 días hábiles"
 msgid "Default"
 msgstr "Por defecto"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1035,15 +1056,14 @@ msgid "Delete"
 msgstr "Eliminar"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Eliminar plantilla"
 
 #: templates/web/base/admin/manifesttheme/form.html:62
-#, fuzzy
 msgid "Delete theme"
-msgstr "Eliminar plantilla"
+msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:40
 #: templates/web/base/admin/bodies/index.html:31
@@ -1057,18 +1077,15 @@ msgid "Describe why you are moderating this"
 msgstr "Describa por qué está moderando esto"
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Descripción"
 
 #: templates/web/base/admin/bodies/contact-form.html:7
-#, fuzzy
 msgid "Destination"
-msgstr "Descripción"
+msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr "La información detallada está limitada a %d caracteres."
 
@@ -1104,7 +1121,7 @@ msgid "Disable"
 msgstr "Desactivar"
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1112,6 +1129,15 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+msgid "Disable reopening of reports in this category"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Recibe actualizaciones de los problemas en este %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr "Desactivados:"
@@ -1123,7 +1149,7 @@ msgstr "Descartar cambios"
 
 #: templates/web/base/admin/extra-metadata-item.html:67
 msgid "Display as"
-msgstr ""
+msgstr "Mostrar como"
 
 #: templates/web/base/admin/extra-metadata-option.html:10
 msgid "Displayed label"
@@ -1146,25 +1172,24 @@ msgstr "No lo sé"
 msgid "Don't like forms?"
 msgstr "¿No te gustan los formularios?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
-#, fuzzy
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Arrastre aquí su(s) foto(s) o <u>haga clic para subirla(s)</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr "Duplicado de"
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr "Duplicados"
 
@@ -1179,7 +1204,7 @@ msgstr ""
 "Diferentes categorías <strong>pueden tener el mismo contacto</strong>.\n"
 "Esto significa que puede agregar muchas categorías incluso si tiene un solo contacto para el órgano."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1191,7 +1216,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Editar"
@@ -1202,36 +1227,33 @@ msgstr "Editar"
 msgid "Edit body details"
 msgstr "Editar los detalles del órgano administrativo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "Editar los permisos de otros usuarios"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Editar la categoría del reporte"
 
 #: templates/web/base/report/new/form_user.html:13
 msgid "Edit report details"
-msgstr ""
+msgstr "Editar detalles del reporte"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Editar la prioridad del reporte"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Editar reportes"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr "Editar detalles de usuarios/buscar sus reportes"
 
 #: templates/web/base/report/update/form_user.html:8
 msgid "Edit your update"
-msgstr ""
+msgstr "Editar tu actualización"
 
 #: templates/web/base/admin/reports/edit.html:0
 #: templates/web/base/admin/reports/edit.html:15
@@ -1262,8 +1284,9 @@ msgstr "Editor"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1272,15 +1295,14 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Email:"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Dirección de email"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr "Dirección de email (opcional)"
 
@@ -1294,18 +1316,19 @@ msgstr "Borrada alerta de email"
 
 #: templates/web/base/auth/general.html:106
 msgid "Email me a link or text me a code to sign in"
-msgstr ""
+msgstr "Envíame un correo electrónico con un enlace o envía un mensaje de texto con un código para iniciar sesió"
 
 #: templates/web/base/auth/general.html:108
 msgid "Email me a link to sign in"
-msgstr ""
+msgstr "Envíame un correo electrónico con un enlace para iniciar sesión"
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "Email verificado:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Email:"
@@ -1375,12 +1398,11 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Punto final"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
-#, fuzzy
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
-msgstr "Introduzca un nombre de calle de Z&uuml;rich"
+msgstr "Introduzca un nombre de calle de Zürich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área"
 
@@ -1407,10 +1429,10 @@ msgstr "Introduzca detalles del problema"
 msgid "Error"
 msgstr "Error"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Todo"
 
@@ -1423,7 +1445,7 @@ msgstr "Ejemplo de código postal %s"
 msgid "Examples:"
 msgstr "Ejemplos:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Categoría existente"
 
@@ -1432,7 +1454,7 @@ msgid "Existing users won't be modified."
 msgstr "Los usuarios existentes no serán modificados."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr "Expandir mapa"
 
@@ -1457,7 +1479,7 @@ msgid "External body"
 msgstr "Órgano externo"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1469,20 +1491,20 @@ msgstr ""
 msgid "External team"
 msgstr "Equipo externo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "Campos adicionales"
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Datos adicionales:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1494,7 +1516,7 @@ msgstr "Campos adicionales:"
 
 #: templates/web/base/admin/extra-metadata-item.html:38
 msgid "Extra question shown to user"
-msgstr ""
+msgstr "Preguntas adicionales mostradas al usuario"
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1512,23 +1534,28 @@ msgstr ""
 #: templates/web/base/report/form/user_loggedout_password.html:21
 #: templates/web/base/report/form/user_loggedout_password.html:8
 msgid "Fill in your details manually."
-msgstr ""
+msgstr "Rellena tus detalles manualmente."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
-msgstr ""
-
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filtrar lista de informes"
+msgstr "Filtro"
 
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Primera vez"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Fotos de notificaciones cercanas recientes"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nuevos informes"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Arreglar esto eligiendo un <strong>área cubierta</ strong> en el formulario <em>Editar detalles del organismo</ em> a continuación."
@@ -1558,7 +1585,7 @@ msgstr "Marcar como borrado"
 msgid "Flag user"
 msgstr "Marca usuario"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Marcado"
@@ -1567,7 +1594,7 @@ msgstr "Marcado"
 msgid "Flagged reports and users"
 msgstr "Señalizar informes y usuarios"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Los usuarios marcados se listan en página de<a href='%s'>marcados</a>"
 
@@ -1575,8 +1602,8 @@ msgstr "Los usuarios marcados se listan en página de<a href='%s'>marcados</a>"
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Las capacidades de los  \"usuarios marcados\" no se limitan de ninguna manera. Es solo una lista de usuarios que han sido marcado para observación."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Marcado:"
 
@@ -1594,7 +1621,7 @@ msgstr "Para más información, vea <a href='https://fixmystreet.org/customising
 
 #: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:3
 msgid "Forgot password"
-msgstr ""
+msgstr "Olvidé contraseña"
 
 #: templates/web/base/auth/general.html:98
 #: templates/web/base/report/form/user_loggedout_password.html:20
@@ -1602,11 +1629,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Enviado al órgano externo"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1616,12 +1643,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Listado de Preguntas Frecuentes"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
-msgstr ""
+msgstr "Consulta General"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr "Generar Token"
 
@@ -1643,7 +1678,7 @@ msgstr "Recibe actualizaciones de los problemas %s"
 msgid "Get updates of problems in this %s"
 msgstr "Recibe actualizaciones de los problemas en este %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Proporcióname un listado RSS"
 
@@ -1659,15 +1694,15 @@ msgstr "¡Nos alegra saber que ha sido arreglado!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1677,7 +1712,7 @@ msgstr "Ir"
 msgid "Going to send questionnaire?"
 msgstr "¿Va a enviar cuestionario?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1703,6 +1738,7 @@ msgstr "¿Alguna vez informó de un problema a un Ayuntamiento antes, o es su pr
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1737,7 +1773,8 @@ msgstr "Oculto"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr "Ocultar todos los reportes y actualizaciones"
 
@@ -1765,14 +1802,13 @@ msgstr "Ocultar mi nombre en este reporte"
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Ocultar marcadores"
 
 #: templates/web/base/admin/bodies/contact-form.html:52
-#, fuzzy
 msgid "Hide reports made in this category"
-msgstr "Notificado en la categoría %s"
+msgstr ""
 
 #: templates/web/base/report/update.html:18
 msgid "Hide update completely?"
@@ -1819,11 +1855,9 @@ msgstr "No se ha podido localizar su problema en la base de datos.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1844,15 +1878,15 @@ msgstr "Si existe un usuario asociado a la dirección ingresada, se le ha enviad
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1868,7 +1902,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr "Si nos está contactando acerca de un reporte o actualización específicas, por favor incluya un link al reporte en su mensaje."
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr "Si genera un token nuevo, el token existente dejará de funcionar."
 
@@ -1892,7 +1926,7 @@ msgstr "Si desea que esta plantilla esté disponible sólo para categorías espe
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "Si envías un problema desde aquí, <strong>no</strong> será reportado al ayuntamiento."
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1931,7 +1965,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1955,6 +1989,17 @@ msgstr "¿En tabla de abusones?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "Los siguientes atributos, que no forman parte de la especificación Open311 v2, son adicionalmente devueltos: agency_sent_datetime, title (también se devuelve como parte de la descripción), interface_used, comment_count, requestor_name (solo si el solicitante permitió que el nombre que se mostrará en el sitio)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "barrio"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1964,20 +2009,20 @@ msgstr "Inactivo"
 msgid "Inbox zero, here we come!"
 msgstr "Bandeja de entrada vacía"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Incluir datos del notificador"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Valor incorrecto para has_photo \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr "Inspeccionar reporte"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "Instruir a contratistas que resuelvan los problemas"
 
@@ -1986,24 +2031,19 @@ msgid "Internal data set by Open311"
 msgstr ""
 
 #: templates/web/base/admin/extra-metadata-option.html:6
-#, fuzzy
 msgid "Internal key"
-msgstr "Notas internas"
+msgstr ""
 
 #: templates/web/zurich/admin/list_updates.html:35
 msgid "Internal notes"
 msgstr "Notas internas"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Valor inválido para agency_responsible %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Especificado un formato no válido %s."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Ubicación inválida. La nueva ubicación debe estar cubierta por el mismo ayuntamiento."
 
@@ -2039,9 +2079,8 @@ msgid "Last editor"
 msgstr "Último editor"
 
 #: templates/web/base/admin/reports/edit.html:92
-#, fuzzy
 msgid "Last failure:"
-msgstr "Última actualización:"
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:55
 msgid "Last update"
@@ -2055,13 +2094,13 @@ msgstr "Última actualización:"
 msgid "Last&nbsp;update:"
 msgstr "Última&nbsp;actualización:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Latitud/Longitud:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Menos recientemente actualizado"
@@ -2078,7 +2117,7 @@ msgstr "Listar todos los problemas notificados"
 msgid "Loading reports…"
 msgstr "Cargando reportes..."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Cargando..."
@@ -2116,25 +2155,25 @@ msgid "Log in with Twitter"
 msgstr "Iniciar sesión con Twitter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "Iniciar sesión con email"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr "Iniciar sesión con email/mensaje de texto"
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr "Cerrar todas las sesiones"
 
 #: templates/web/base/auth/general.html:36
 #: templates/web/base/report/form/user.html:18
-#, fuzzy
 msgid "Login with %s"
-msgstr "Iniciar sesión con email"
+msgstr ""
 
 #: templates/web/base/dashboard/index.html:83
 msgid "Look up"
@@ -2145,19 +2184,20 @@ msgstr "Buscar"
 msgid "MAP"
 msgstr "MAPA"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr "Volver anónimo en todos los reportes y actualizaciones"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr "Orden manual"
@@ -2171,24 +2211,24 @@ msgstr " Mapa"
 msgid "Mark as sent"
 msgstr "Marcado como enviado"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Señalar como <strong>marcados</strong> aquellos usuarios cuyo comportamiento desea observar."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Mensaje:"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Mensaje al órgano competente:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Mensaje al órgano externo:"
 
@@ -2201,7 +2241,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr "Órganos faltantes:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Falta jurisdiction_id"
 
@@ -2209,8 +2249,7 @@ msgstr "Falta jurisdiction_id"
 msgid "Moderate"
 msgstr "Moderar"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Moderar detalles del reporte"
 
@@ -2233,7 +2272,7 @@ msgstr "Moderado por %s el %s"
 msgid "Moderated by division within one working day"
 msgstr "Moderado por el organismo durante el siguiente día laborable"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2243,14 +2282,14 @@ msgstr ""
 msgid "Month"
 msgstr "Mes"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Más comentado"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2278,9 +2317,10 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Nombre:"
@@ -2298,7 +2338,7 @@ msgstr "Navegar a éste problema"
 msgid "Nearest calculated address:"
 msgstr "Dirección más cercana calculada:"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Nombre de la calle más cercana al marcador colocado en el mapa (se genera automáticamente utilizando OpenStreetMap): %s%s"
 
@@ -2306,12 +2346,12 @@ msgstr "Nombre de la calle más cercana al marcador colocado en el mapa (se gene
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Código Postal más cercano al marcador colocado en el mapa (generado automáticamente): %s (%sm de distancia)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Camino más cercano al marcador colocado en el mapa (generado automáticamente por Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2336,7 +2376,7 @@ msgstr "¡Casi listo! Por favor revise su teléfono."
 msgid "New body added"
 msgstr "Nuevo organismo añadido"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Añadida nueva categoría de contactos"
 
@@ -2346,12 +2386,11 @@ msgstr "Nueva dirección de email:"
 
 #: templates/web/base/admin/extra-metadata-item.html:14
 #: templates/web/base/admin/extra-metadata-item.html:20
-#, fuzzy
 msgid "New field"
-msgstr "Guardar nuevos campos"
+msgstr "Nuevo campo"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nueva nota interna:"
 
@@ -2359,13 +2398,13 @@ msgstr "Nueva nota interna:"
 msgid "New local problems on FixMyStreet"
 msgstr "Nuevos problemas locales en FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
-msgstr ""
+msgstr "Nueva nota a DM:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Nueva contraseña:"
 
@@ -2442,7 +2481,7 @@ msgstr "Nueva plantilla"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr "Nuevas actualizaciones al reporte <a href=\"%s\">%s</a>"
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2455,7 +2494,6 @@ msgstr "Siguiente"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2464,28 +2502,28 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "No"
 
 #: templates/web/base/admin/category-checkboxes.html:31
-#, fuzzy
 msgid "No Group"
-msgstr "Grupo"
+msgstr "Sin Grupo"
 
 #: templates/web/base/report/form/user_loggedout_password.html:7
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Sin órgano administrativo"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Ningún ayuntamiento seleccionado"
 
@@ -2501,8 +2539,8 @@ msgstr "No se encuentran problemas marcados."
 msgid "No flagged users found."
 msgstr "No se encuentran usuarios marcados"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "No hay más actualizaciones"
 
@@ -2540,15 +2578,15 @@ msgstr "No hay seguidores"
 msgid "None"
 msgstr "Nada"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2560,10 +2598,14 @@ msgstr ""
 "Dependiendo de la implementación, el personal pueden tener acceso al tablero (resumen de\n"
 "la actividad a través de su departamento), la capacidad de ocultar notificaciones, o establecer estados especiales para las notificaciones."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "No para mi subdivisión"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "No notificado anteriormente"
@@ -2611,12 +2653,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2624,12 +2666,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Estado antiguo"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
-msgstr ""
+msgstr "Más antiguo"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr "A nombre de %s"
 
@@ -2638,7 +2680,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2669,7 +2711,7 @@ msgstr "Página web de la iniciativa Open311"
 msgid "Open311 specification"
 msgstr "Especificación Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr "Opciones"
 
@@ -2681,7 +2723,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr "O suscríbase por RSS"
 
@@ -2689,16 +2731,16 @@ msgstr "O suscríbase por RSS"
 msgid "Order"
 msgstr "Orden"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2730,37 +2772,33 @@ msgstr "Página no encontrada"
 msgid "Parent"
 msgstr "Padre"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
-#, fuzzy
+#: templates/web/base/admin/bodies/contact-form.html:130
 msgid "Parent categories"
-msgstr "Otras categorías"
+msgstr ""
 
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:66
 msgid "Partial"
 msgstr "Parcial"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Contraseña (opcional)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
-#, fuzzy
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
-msgstr "Su contraseña ha cambiado"
+msgstr "Cambio de contraseña cancelado."
 
 #: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:5
-#, fuzzy
 msgid "Password expired"
-msgstr "Contraseña (opcional)"
+msgstr ""
 
 #: templates/web/base/admin/roles/index.html:6
-#, fuzzy
 msgid "Permissions"
-msgstr "Permisos:"
+msgstr "Permisos"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Permisos:"
 
@@ -2768,19 +2806,24 @@ msgstr "Permisos:"
 msgid "Permit blank updates"
 msgstr "Permitir actualizaciones en blanco"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Teléfono:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Número de teléfono (opcional)"
 
@@ -2788,30 +2831,26 @@ msgstr "Número de teléfono (opcional)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr "Teléfono verificado:"
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Teléfono:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2831,9 +2870,8 @@ msgstr "Foto obligatoria"
 msgid "Photo upload failed."
 msgstr "No se pudo cargar la foto."
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Fotos"
@@ -2842,9 +2880,9 @@ msgstr "Fotos"
 msgid "Photos of recent nearby reports"
 msgstr "Fotos de notificaciones cercanas recientes"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
-msgstr ""
+msgstr "Fotos/Documentos"
 
 #: templates/web/base/reports/index.html:76
 #: templates/web/base/reports/index.html:79
@@ -2856,6 +2894,11 @@ msgstr "Elija su ayuntamiento"
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Coloque el marcador en el mapa"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2883,27 +2926,26 @@ msgid "Please check your email address is correct"
 msgstr "Por favor, compruebe que su dirección de email es correcta"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr "Por favor verifique que su número de teléfono es correcto"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Por favor, elija una categoría"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr "Por favor elija una contraseña menos habitual"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2925,27 +2967,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Por favor notifique incidencias relevantes y no abuse; abusando de su ayuntamiento degrada su capacidad de servicio a toda la ciudadanía."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Por favor escriba su mensaje."
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr "Por favor ingrese un número de celular o móvil"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Por favor ingrese un nombre"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "Por favor ingrese un nombre para éste órgano"
 
@@ -2958,16 +3000,16 @@ msgstr "Por favor, introduzca una contraseña"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Por favor, introduzca un título"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2978,20 +3020,20 @@ msgstr "Por favor, introduce una dirección de email válida"
 msgid "Please enter a valid email address"
 msgstr "Por favor, introduce una dirección de email válida"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr "Por favor ingrese un email o número de teléfono válidos"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Por favor, describa los detalles más relevantes"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -3007,21 +3049,20 @@ msgid "Please enter your first name"
 msgstr "Por favor, indique su nombre"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Por favor escriba su nombre completo, ya que los ayuntamientos necesitan esta información. Si usted NO desea que su nombre aparecerá en la página, desactive la casilla de abajo"
 
 #: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:35
-#, fuzzy
 msgid "Please enter your full name."
-msgstr "Por favor, introduzca su nombre"
+msgstr "Por favor introduzca su nombre completo."
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Por favor, introduzca su nombre"
@@ -3062,19 +3103,18 @@ msgstr "Por favor, complete el siguiente formulario con los detalles del problem
 msgid "Please generate a two-factor code and enter it below:"
 msgstr "Por favor genere un código de dos factores e ingréselo a continuación:"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Por favor, indique si le gustaría recibir algún otro cuestionario"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
-#, fuzzy
 msgid "Please make sure you are not including an email address"
-msgstr "Por favor, introduce una dirección de email válida"
+msgstr "Por favor asegúrese de que no está incluyendo un correo electrónico"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr "Por favor asegúrese de que su contraseña tenga al menos %d caracteres"
@@ -3101,32 +3141,36 @@ msgstr "Tome en cuenta que su actualización <strong>aún no ha sido publicada</
 msgid "Please note:"
 msgstr "Por favor, tenga en cuenta:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr "Por favor provea un ID de duplicado o una actualización pública para este reporte."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr "Por favor agregue una actualización pública para este reporte."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Por favor, explique por qué está reabriendo esta notificación."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Proporcione un texto y una foto"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Por favor, indique si ha notificado un problema al ayuntamiento alguna vez."
 
 #: templates/web/base/auth/2fa/form-add.html:1
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
-msgstr ""
+msgstr "Por favor escanee esta imagen con su aplicación, o introduzca el código en su aplicación, luego genere un nuevo código de un solo uso e introdúzcalo aquí:"
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Por favor seleccione un órgano."
 
@@ -3138,7 +3182,7 @@ msgstr "Por favor, seleccione el tipo de listado que desea"
 msgid "Please select the type of alert you want"
 msgstr "Por favor, seleccione el tipo de alerta que desea"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Por favor, indique si el problema se ha solucionado"
 
@@ -3146,12 +3190,12 @@ msgstr "Por favor, indique si el problema se ha solucionado"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Por favor suba sólo imágenes"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr "Por favor verifique el email y/o el número de teléfono"
 
@@ -3159,27 +3203,23 @@ msgstr "Por favor verifique el email y/o el número de teléfono"
 msgid "Please write a message"
 msgstr "Por favor, escriba un mensaje"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Publicar"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr "Código postal o nombre de calle y área"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Publicado de forma anónima - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Publicado por %s - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Publicado por <strong>%s</strong> (%s) - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Publicado por <strong>%s</strong> - %s"
 
@@ -3195,7 +3235,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3203,11 +3243,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Previo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Prioridades"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Prioridad"
@@ -3223,9 +3263,9 @@ msgid "Privacy and cookies"
 msgstr "Privacidad y cookies"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privado"
 
@@ -3242,28 +3282,24 @@ msgid "Problem %d created"
 msgstr "Problema %d creado"
 
 #: templates/web/base/admin/users/log.html:54
-#, fuzzy
 msgid "Problem %s added to shortlist"
-msgstr "Añadir a favoritos"
+msgstr ""
 
 #: templates/web/base/admin/timeline.html:24
 msgid "Problem %s confirmed"
 msgstr "Problema %s confirmado"
 
 #: templates/web/base/admin/users/log.html:47
-#, fuzzy
 msgid "Problem %s created"
-msgstr "Problema %d creado"
+msgstr ""
 
 #: templates/web/base/admin/users/log.html:49
-#, fuzzy
 msgid "Problem %s created on behalf of %s"
-msgstr "Problema %d creado"
+msgstr ""
 
 #: templates/web/base/admin/users/log.html:56
-#, fuzzy
 msgid "Problem %s removed from shortlist"
-msgstr "usuario eliminado de la lista de abusos"
+msgstr ""
 
 #: templates/web/base/admin/timeline.html:26
 msgid "Problem %s sent to council %s"
@@ -3275,7 +3311,7 @@ msgstr "Problema %s enviado al Ayuntamiento %s"
 msgid "Problem breakdown by state"
 msgstr "Desglose de problemas según estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problema marcado como abierto."
 
@@ -3283,8 +3319,7 @@ msgstr "Problema marcado como abierto."
 msgid "Problem state change based on survey results"
 msgstr "El estado del problema cambió debido a los resultados de la encuesta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemas"
@@ -3309,18 +3344,18 @@ msgstr "Problemas recientemente notificados como arreglados en FixMyStreet"
 msgid "Problems within %.1fkm of %s"
 msgstr "Problemas en un radio de %.1fkm de %s"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemas en %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemas en el barrio %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3328,7 +3363,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3336,11 +3371,15 @@ msgstr ""
 msgid "Property address:"
 msgstr "Dirección de la propiedad:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3354,11 +3393,11 @@ msgstr "Proporcionar una actualización"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Proporcionar una contraseña es opcional, pero hacerlo le permitirá notificar y actualizar los problemas más fácilmente, así como administrar sus informes."
 
@@ -3366,12 +3405,12 @@ msgstr "Proporcionar una contraseña es opcional, pero hacerlo le permitirá not
 msgid "Public details"
 msgstr "Detalles públicos"
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Respuesta del público:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Actualización pública:"
 
@@ -3381,9 +3420,8 @@ msgid "Publish photo"
 msgstr "Publicar foto"
 
 #: templates/web/base/admin/extra-metadata-item.html:60
-#, fuzzy
 msgid "Question text"
-msgstr "Cuestionario"
+msgstr ""
 
 #: templates/web/base/questionnaire/completed.html:1
 #: templates/web/base/questionnaire/index.html:0
@@ -3414,11 +3452,11 @@ msgstr "Cuestionario cumplimentado por el notificador problema"
 msgid "RSS feed"
 msgstr "Listado RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "Listado RSS para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "Listado RSS para %s del barrio, %s"
 
@@ -3426,11 +3464,11 @@ msgstr "Listado RSS para %s del barrio, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "Listado RSS para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "Listado RSS para %s, en el barrio %s"
 
@@ -3438,13 +3476,13 @@ msgstr "Listado RSS para %s, en el barrio %s"
 msgid "RSS feed of nearby problems"
 msgstr "Listado RSS de los problemas cercanos"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "Listado RSS de los problemas dentro de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "Listado RSS de los problemas dentro del barrio %s"
 
@@ -3458,13 +3496,13 @@ msgstr "Listado RSS de los problemas locales más recientes"
 msgid "RSS feed of updates to this problem"
 msgstr "Listado RSS de actualizaciones sobre este problema"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
-msgstr ""
+msgstr "Leer menos"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
-msgstr ""
+msgstr "Leer más"
 
 #: templates/web/base/admin/reports/edit.html:93
 msgid "Reason:"
@@ -3475,7 +3513,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Reciba un correo cuando se dejen actualizaciones sobre este problema."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3489,7 +3527,7 @@ msgstr "Problemas locales recientes, %s"
 msgid "Recently reported problems"
 msgstr "Problemas recientemente notificados"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Actualizado recientemente"
@@ -3502,7 +3540,8 @@ msgstr "Rechazar reporte"
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Recuerde que FixMyStreet es principalmente para informar sobre problemas físicos que pueden ser arreglados. Si su problema no es apropiado para ser presentado a través de este sitio recuerde que puede ponerse en contacto con su Ayuntamiento directamente mediante su página web."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr "Eliminar detalles de la cuenta"
 
@@ -3514,8 +3553,8 @@ msgstr "Eliminar campo"
 msgid "Remove flag"
 msgstr "Eliminar marca"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3527,21 +3566,25 @@ msgid "Remove from site"
 msgstr "Eliminar del sitio"
 
 #: templates/web/base/admin/extra-metadata-option.html:26
-#, fuzzy
 msgid "Remove option"
-msgstr "Eliminar campo"
+msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Quitar foto (¡no se puede deshacer!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Editar los permisos de otros usuarios"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr "Reemplazar token"
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Responder al usuario:"
 
@@ -3549,14 +3592,14 @@ msgstr "Responder al usuario:"
 msgid "Report"
 msgstr "Notificar"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "ID del reporte:"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3565,7 +3608,7 @@ msgid "Report a problem"
 msgstr "Notificar un problema"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr "Reportar un problema aquí"
@@ -3576,12 +3619,11 @@ msgstr "Denunciar abuso"
 
 #: templates/web/base/report/form/user.html:32
 #: templates/web/base/report/form/user.html:39
-#, fuzzy
 msgid "Report anonymously"
-msgstr "Notificado anónimamente en %s"
+msgstr "Reportar anónimamente"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3592,9 +3634,8 @@ msgid "Report as"
 msgstr "Reportar como"
 
 #: templates/web/base/report/new/form_public_councils_text.html:3
-#, fuzzy
 msgid "Report details"
-msgstr "Reportar como"
+msgstr "Reportar detalles"
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:306
 msgid "Report on %s"
@@ -3617,7 +3658,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Notifique, consulte o discuta problemas locales"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Notificado anónimamente en %s"
@@ -3628,7 +3669,7 @@ msgstr "Notificado anónimamente en %s"
 msgid "Reported before"
 msgstr "Notificado con anterioridad"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Notificado por %s en %s"
@@ -3642,27 +3683,27 @@ msgstr "Reportado por:"
 msgid "Reported in the %s category"
 msgstr "Notificado en la categoría %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Notificado anónimamente en la categoría %s en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Notificado en la categoría %s por %s en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Notificado anónimamente vía %s  en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Notificado vía %s por %s en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Notificado anónimamente vía %s en la categoría %s en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Notificado vía %s en la categoría %s por %s en %s"
 
@@ -3681,17 +3722,15 @@ msgstr "Reportado:"
 msgid "Reporting a problem"
 msgstr "Notificando un problema"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Notificaciones"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3719,15 +3758,15 @@ msgid "Reports published"
 msgstr "Notificaciones publicadas"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr "Reportes enviados a %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3740,7 +3779,7 @@ msgstr "Reportes esperando ser enviados"
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr "Obligatorio"
 
@@ -3793,39 +3832,45 @@ msgstr "Revertir al título original"
 msgid "Right place?"
 msgstr "¿Es correcto el lugar?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Operador responsable de este camino (derivado del número de referencia y tipo del camino): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operador responsable de este camino (de OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Rotar a la izquierda"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3841,20 +3886,20 @@ msgstr "Rotar esta foto descartará los cambios del reporte que no hayan sido gu
 msgid "Satellite"
 msgstr "Satélite"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr "Guardar como duplicado y cerrar "
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3871,13 +3916,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Buscar Notificaciones"
 
@@ -3890,7 +3934,7 @@ msgstr "Buscar Usuarios"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Buscar informes"
 
@@ -3905,12 +3949,12 @@ msgstr "Buscar:"
 msgid "Searching found no reports."
 msgstr "La búsqueda no encontró notificaciones."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "La búsqueda no encontró usuarios."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr "Seguridad"
@@ -3920,8 +3964,7 @@ msgstr "Seguridad"
 msgid "See our privacy policy"
 msgstr "Vea nuestra política de privacidad"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3931,7 +3974,7 @@ msgid "Select a body"
 msgstr "Selecciona un órgano administrativo"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Seleccione un área"
@@ -3952,7 +3995,7 @@ msgstr ""
 msgid "Select:"
 msgstr "Seleccionar:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr "Enviar"
@@ -3965,7 +4008,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr "Enviar email de inicio de sesión"
 
@@ -3974,11 +4017,11 @@ msgstr "Enviar email de inicio de sesión"
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr "El envío del texto de confirmación falló: \"%s\""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Enviado a %s %s después"
 
@@ -4016,7 +4059,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4027,7 +4070,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4052,8 +4095,8 @@ msgstr "¿Mostrar nombre publicamente?"
 msgid "Show older"
 msgstr "Mostrar los más antiguos"
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr "Mostrar los reportes más antiguos"
 
@@ -4064,7 +4107,7 @@ msgstr "Mostrar foto"
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Mostrar marcadores"
 
@@ -4126,7 +4169,7 @@ msgid "Some photos of recent reports"
 msgstr "Algunas fotos de notificaciones recientes"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Algún texto para localizar"
 
@@ -4135,12 +4178,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Lo sentimos, ése parece ser un código postal dependiente de La Corona, que no soportamos."
 
@@ -4158,9 +4200,9 @@ msgstr "Lo sentimos, el código es incorrecto"
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Lo sentimos, hubo un error confirmando su notificación."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Lo sentimos, no hemos podido encontrar ese lugar."
 
@@ -4170,50 +4212,44 @@ msgstr "Lo sentimos, no hemos podido encontrar ese lugar."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr "Lo sentimos, no fue posible iniciar su sesión. Por favor complete el formulario a continuación."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo de nuevo."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
-#, fuzzy
 msgid "Sorry, we couldn't save your file(s), please try again."
-msgstr "Perdón, no pudimos guardar la(s) imágenes, por favor intente nuevamente."
+msgstr ""
 
 #: templates/web/base/offline/fallback.html:6
-#, fuzzy
 msgid "Sorry, we don’t have a good enough connection to fetch that page."
 msgstr ""
-"Lo sentimos, la conexión no permitió cargar la página,\n"
-"o la página no existe, \n"
-"o hubo un error de servidor. Por favor intente de nuevo más tarde."
 
 #: perllib/FixMyStreet/App/Controller/Root.pm:129
 msgid "Sorry, you don't have permission to do that."
 msgstr "Perdón, usted no tiene permiso para hacer eso."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Ordenados por"
 
 #: templates/web/base/admin/bodies/contact-form.html:45
-#, fuzzy
 msgid "Staff only"
-msgstr "Staff:"
+msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr "Los miembros del staff tienen permiso para acceder a la sección admin."
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr "Staff:"
 
@@ -4237,18 +4273,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4257,31 +4293,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Estado/Prov.:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Estadísticas"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Estado"
 
@@ -4299,7 +4332,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr "Subcategoría"
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Subdivisión/Órgano"
 
@@ -4318,50 +4351,48 @@ msgstr "Título:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Enviar cambios"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Enviar cuestionario"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Enviado"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Suscribirse"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr "Suscribirse por email"
 
@@ -4370,11 +4401,10 @@ msgid "Subscribed:"
 msgstr "Suscrito:"
 
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:34
-#, fuzzy
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
-msgstr "Las actualizaciones están limitadas a %s caracteres. Por favor acorte su actualización."
+msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4388,20 +4418,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr "Resuma el problema"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Resuma sus cambios"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Resumen"
 
@@ -4412,14 +4441,19 @@ msgstr "Resumen de notificaciones"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4437,21 +4471,25 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr "Plantilla &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Plantillas"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Menos recientemente actualizado"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Texto"
 
 #: templates/web/base/admin/extra-metadata-item.html:69
-#, fuzzy
 msgid "Text field"
-msgstr "Campos adicionales:"
+msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:33
 msgid "Text only version"
@@ -4465,6 +4503,11 @@ msgstr "Versión solo texto"
 msgid "Text:"
 msgstr "Texto:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Texto"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "¡Gracias por notificar esta incidencia!"
@@ -4494,7 +4537,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "¡Gracias, nos alegra saber que fue arreglado! ¿Podría decirnos si había notificado un problema a un ayuntamiento con anterioridad?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4506,27 +4549,29 @@ msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuev
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Esa localización no parece estar cubierta por un ayuntamiento, tal vez esté en alta mar o fuera del país. Por favor, inténtelo de nuevo."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Ese código postal no fue reconocido, lo siento."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "El problema se ha marcado como enviado."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "El problema ahora será reenviado."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Esa notificación ha sido eliminada de FixMyStreet."
 
@@ -4574,8 +4619,8 @@ msgstr "La <strong>jurisdicción</strong> solo es necesaria si los límites incl
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4611,9 +4656,8 @@ msgid "The code used to store this field value in the database."
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:31
-#, fuzzy
 msgid "The contact has been confirmed as correct."
-msgstr "El problema se ha marcado como enviado."
+msgstr ""
 
 #: templates/web/base/report/new/fill_in_details_text.html:2
 #: templates/web/base/report/new/fill_in_details_text.html:3
@@ -4634,7 +4678,7 @@ msgstr "El error fue: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "Los siguientes atributos Open311 v2 son devueltos para cada petición: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code y service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "La información siguiente sobre la carretera más cercana podría ser incorrecta o irrelevante si el problema se encuentra cerca de varias carreteras o cerca de una carretera sin nombre registrado en OpenStreetMap."
 
@@ -4685,9 +4729,8 @@ msgid "The role's <strong>name</strong> is used to refer to this group of permis
 msgstr ""
 
 #: templates/web/base/admin/users/import.html:68
-#, fuzzy
 msgid "The uploaded CSV file must contain a header row, and records can have the following fields:"
-msgstr "El archivo CSV debe contener una fila de encabezado, y los registros deben tener los siguientes campos (en el mismo orden):"
+msgstr ""
 
 #: 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"
@@ -4697,8 +4740,8 @@ msgstr "El usuario no pudo situar el problema en el mapa, salvo para ver el áre
 msgid "The user has been sent a login email"
 msgstr "Se ha enviado un email de inicio de sesión al usuario"
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4730,11 +4773,10 @@ msgid "There are similar problems nearby that we’re already aware of, is one o
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:98
-#, fuzzy
 msgid "There is already a template with that title."
-msgstr "Ya existe una plantilla de respuesta automática para esta categoría/estado."
+msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr "Ya existe una plantilla de respuesta automática para esta categoría/estado."
 
@@ -4752,13 +4794,12 @@ msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
-#, fuzzy
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
-msgstr "Hubo un problema con su información de inicio de sesión. Si olvidó su contraseña, o no tiene una, por favor complete la sección &lsquo;No&rsquo; del formulario."
+msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo."
 
@@ -4766,7 +4807,7 @@ msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo."
 msgid "There were problems with your report. Please see below."
 msgstr "Hubo problemas con su notificación. Por favor, vea más abajo."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Hubo problemas con su actualización. Por favor, vea más abajo."
 
@@ -4851,10 +4892,10 @@ msgstr "Este correo electrónico ha sido enviado a los dos ayuntamientos que cub
 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 "Este correo electrónico ha sido enviado a varios consejos que cubren la ubicación del problema, pues la categoría de problema seleccionada por el usuario se proporciona para todos ellos. Por favor, si usted no pertenece al órgano administrativo responsable de resolver esta incidencia haga caso omiso de este mensaje."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Esta información es necesaria"
 
@@ -4871,19 +4912,23 @@ msgstr "Texto <strong>público</strong> que se mostrará en el sitio."
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr "Esta página es una manera rápida de crear varios usuarios del staff en un solo paso."
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Este problema se ha arreglado"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Este problema no se ha arreglado"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr "Este problema todavía persiste."
 
@@ -4896,26 +4941,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr "Este reporte es un duplicado. Por favor contribuya actualizando el reporte original:"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Esta notificación está pendiente de moderación."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Esta notificación está marcada como cerrada."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Esta notificación está marcada como arreglada."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Esta notificación está marcada como abierta."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr "Este reporte ya no admite actualizaciones."
 
@@ -4923,15 +4968,18 @@ msgstr "Este reporte ya no admite actualizaciones."
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Esta página web también contiene una foto del problema, proporcionada por el usuario."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Tiempo utilizado (en minutos):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4955,6 +5003,10 @@ msgstr "Título"
 msgid "Title:"
 msgstr "Título:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "Para descubrir las alertas locales que tenemos para usted, por favor ingrese su %s código postal, o nombre de calle y área:"
@@ -4972,19 +5024,17 @@ msgid "To limit this collection of fields to a single language, select it here."
 msgstr "Para limitar esta colección de campos a un solo idioma, selecciónelo aquí."
 
 #: templates/web/base/report/update-form-wrapper.html:4
-#, fuzzy
 msgid "To provide an update, please <a href=\"%s\">sign in</a>."
-msgstr "Nuevas actualizaciones al reporte <a href=\"%s\">%s</a>"
+msgstr ""
 
 #: perllib/FixMyStreet/Queue/Item/Report.pm:116
 msgid "To view a map of the precise location of this issue"
 msgstr "Para ver un mapa de la ubicación precisa de este problema"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
-#, fuzzy
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
-msgstr "Token:"
+msgstr ""
 
 #: templates/web/base/reports/index.html:126
 msgid "Top 5 most used categories"
@@ -5007,11 +5057,6 @@ msgstr ""
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr "Traducción"
@@ -5034,17 +5079,16 @@ msgstr "Pruebe enviándonos un correo directamente:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
-#, fuzzy
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
-msgstr "Activar autenticación doble"
+msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5054,7 +5098,7 @@ msgstr ""
 msgid "Type"
 msgstr "Tipo"
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr "Desbloquear"
 
@@ -5084,10 +5128,10 @@ msgstr "Error desconocido"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "ID de problema desconocido"
 
@@ -5099,20 +5143,19 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Actualizar"
 
 #: templates/web/base/admin/users/log.html:51
-#, fuzzy
 msgid "Update %s created for problem %d"
-msgstr "Actualización %s creada para el problema %d; por %s"
+msgstr ""
 
 #: templates/web/base/admin/timeline.html:33
 msgid "Update %s created for problem %d; by %s"
@@ -5156,29 +5199,27 @@ msgstr "La actualización reabrió el problema"
 msgid "Update statuses"
 msgstr "Actualización de estados"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Actualizado"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr "Actualizado por <strong>%s</strong> (%s) el %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr "Actualizado por <strong>%s</strong> el %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "¡Actualizado!"
 
@@ -5189,7 +5230,7 @@ msgstr "¡Actualizado!"
 msgid "Updates"
 msgstr "Actualizaciones"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Las actualizaciones están limitadas a %s caracteres. Por favor acorte su actualización."
 
@@ -5219,6 +5260,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5232,8 +5281,8 @@ msgstr "Importación de Usuarios"
 msgid "User added to abuse list"
 msgstr "Usuarios añadidos a la lista de abusos"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr "El usuario ya existe"
 
@@ -5251,7 +5300,7 @@ msgid "User flagged"
 msgstr "Usuario marcado"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5264,27 +5313,25 @@ msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcc
 msgid "User's alerts"
 msgstr "Alertas del usuario"
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr "Usuario:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Usuarios"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5292,9 +5339,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Valores actualizados"
 
@@ -5320,7 +5367,7 @@ msgstr "Verificar número de teléfono"
 msgid "View report on site"
 msgstr "Ver notificaciones en el site"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Ver notificaciones por barrio"
 
@@ -5328,7 +5375,7 @@ msgstr "Ver notificaciones por barrio"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5346,7 +5393,7 @@ msgstr "Visualizando un problema"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Barrios de este ayuntamiento"
 
@@ -5416,7 +5463,7 @@ msgstr "Una vez enviada"
 msgid "Which problems do you want alerts about?"
 msgstr "¿Sobre cuales problemas quiere recibir alertas?"
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr "¿De cual reporte es un duplicado?"
 
@@ -5436,7 +5483,7 @@ msgstr "Dentro del período de tiempo especificado:"
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y está <a href=\"https://fixmystreet.org\">disponible en fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "¿Quieres recibir otro cuestionario en 4 semanas, recordándote que debes comprobar el estado?"
 
@@ -5448,7 +5495,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuación hace que sea difícil de leer."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5459,12 +5505,12 @@ msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuac
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "SÍ"
 
@@ -5477,7 +5523,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr "Ud. está desconectado"
 
@@ -5490,7 +5536,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Estás denunciando la siguiente actualización por ser abusiva, contener información personal, o similar:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr "Puede <a href=\"%s\">crear un nuevo reporte en la misma ubicación</a>."
 
@@ -5499,7 +5545,7 @@ msgstr "Puede <a href=\"%s\">crear un nuevo reporte en la misma ubicación</a>."
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Usted puede <a href=\"%s%s\">ver el problema en este sitio</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Puede agregar email del usuario abusivo a la lista de abusones, que oculta de forma automática (y nunca envía) los informes que crean."
 
@@ -5532,7 +5578,7 @@ msgstr "Puede ayudarnos a encontrar una dirección de email de contacto para los
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Puede marcar un organismo como eliminado si no quiere que aparezca activo en este sitio."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5542,7 +5588,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Usted rechazó finalmente; por favor, rellene el formulario de arriba"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5550,18 +5596,16 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Ya respondió a esta encuesta. Si tiene alguna pregunta, por favor, <a href='%s'>póngase en contacto con nosotros</a>, o <a href ='%s'>vea su problema</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
-#, fuzzy
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
-msgstr "Ya ha adjuntado fotos a este reporte. Tome en cuenta que el máximo que puede adjuntar a este reporte son 3 fotos (si intenta cargar más, se eliminará la foto más antigua)."
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:50
 #: templates/web/zurich/report/new/fill_in_details_form.html:30
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Ya ha adjuntado fotos a este reporte. Tome en cuenta que el máximo que puede adjuntar a este reporte son 3 fotos (si intenta cargar más, se eliminará la foto más antigua)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr "Ya ha adjuntado fotos a esta actualización. Tome en cuenta que el máximo que puede adjuntar a esta actualización son 3 fotos (si intenta cargar más, se eliminará la foto más antigua)."
 
@@ -5628,25 +5672,25 @@ msgstr "Sus notificaciones"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Su cuenta"
 
 #: templates/web/base/auth/2fa/intro.html:18
-#, fuzzy
 msgid "Your account requires two-factor authentication to be set up."
-msgstr "Desactivar autenticación doble"
+msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5675,16 +5719,16 @@ msgstr "Su nombre"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr "Su nombre ya fue remitido a %s, pero podemos ocultarlo en esta página:"
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr "Su nombre está ahora oculto en todos sus reportes y actualizaciones."
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr "Su nombre ha sido ocultado."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5700,13 +5744,12 @@ msgid "Your password has been changed"
 msgstr "Su contraseña ha cambiado"
 
 #: templates/web/base/auth/create.html:34
-#, fuzzy
 msgid "Your password has expired, please create a new one below. When you click the link in your email, your password will be updated."
-msgstr "Iniciar sesión por email, proveyendo una nueva contraseña. Al seguir el enlace incluido en el email, su contraseña será actualizada."
+msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr "Su contraseña debería incluir %d o más caracteres."
@@ -5739,7 +5782,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr "Su actualización ha sido guardada para ser enviada cuando esté conectado nuevamente. "
 
@@ -5770,19 +5813,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "todas"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr "un administrador"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5790,8 +5833,8 @@ msgstr ""
 msgid "by %s"
 msgstr "por %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "ayuntamiento"
 
@@ -5822,6 +5865,10 @@ msgstr "editar usuario"
 msgid "from %s different users"
 msgstr "de %s usuarios diferentes"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5839,7 +5886,7 @@ msgstr "n/a"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr "ninguna"
 
@@ -5849,15 +5896,13 @@ msgstr "no es responsabilidad del ayuntamiento"
 
 #: templates/web/base/contact/enquiry/index.html:26
 #: templates/web/base/contact/index.html:99
-#, fuzzy
 msgid "optional"
-msgstr "(opcional)"
+msgstr ""
 
 #: templates/web/base/report/form/user.html:31
 #: templates/web/base/report/form/user.html:41
-#, fuzzy
 msgid "or"
-msgstr " o "
+msgstr ""
 
 #: templates/web/base/auth/general.html:6
 msgid "or <a href=\"%s\">create an account</a>"
@@ -5869,9 +5914,8 @@ msgstr ""
 
 #: templates/web/base/alert/index.html:18
 #: templates/web/base/around/postcode_form.html:36
-#, fuzzy
 msgid "or use my location"
-msgstr "esta ubicación"
+msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:50
 #: templates/web/base/admin/reports/edit.html:51
@@ -5922,12 +5966,12 @@ msgid "today"
 msgstr "hoy"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5952,7 +5996,7 @@ msgid "user removed from abuse list"
 msgstr "usuario eliminado de la lista de abusos"
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "barrio"
 
@@ -6012,7 +6056,7 @@ msgid_plural "%d years"
 msgstr[0] "%d año"
 msgstr[1] "%d años"
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6033,7 +6077,7 @@ msgid_plural "%s problems reported"
 msgstr[0] "%s problema reportado"
 msgstr[1] "%s problemas reportados"
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6054,21 +6098,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> arregladas la semana pasada"
 msgstr[1] "<big>%s</big> arregladas el mes pasado"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> notificadas la semana pasada"
 msgstr[1] "<big>%s</big> notificaciones la semana pasada"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> notificadas recientemente"
 msgstr[1] "<big>%s</big> notificadas recientemente"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6103,175 +6147,31 @@ msgid_plural "last updated %d days ago"
 msgstr[0] "última actualización hace %d día"
 msgstr[1] "última actualización hace %d días"
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mes"
 msgstr[1] "meses"
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] "reporte"
 msgstr[1] "reportes"
 
-#~ msgid "(ignored if type is \"String\")"
-#~ msgstr "(ignorado si el tipo es \"String\")"
-
-#~ msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
-#~ msgstr "<strong>Nota\\: </strong> Este informe se ha enviado para la acción. Los cambios realizados no se transmitirán."
-
-#~ msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
-#~ msgstr "<strong>Nota\\: </strong> Este informe aún no ha sido enviado para la acción. Cualquier cambio hecho no puede ser enviado."
-
-#~ msgid "Automated"
-#~ msgstr "Automático"
-
-#~ msgid "Available categories"
-#~ msgstr "Categorías disponibles"
-
-#~ msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (<code>meta.datatype_description</code>), you must add it in <code>category_extras_fields.html</code>"
-#~ msgstr "Puede utilizarse para mostrar texto adicional al usuario junto al campo. La plantilla predeterminada no muestra esto (<code> meta.datatype_description </code>), debe agregarla en <code> category_extras_fields.html </code>"
-
-#~ msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent."
-#~ msgstr "Haga la <strong> comprobación necesaria </strong> si los informes de esta categoría <strong> deben ser inspeccionados </strong> antes de enviarlos."
-
-#~ msgid ""
-#~ "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
-#~ "                <br>\n"
-#~ "                Normally, categories are not private.\n"
-#~ "                <br>\n"
-#~ "                This is suitable for issues that you want to allow users to report to the body, but for which there is no public\n"
-#~ "                interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n"
-#~ "                at a specific address."
-#~ msgstr ""
-#~ "Marcar <strong>privado</strong> si los reportes en esta categoría <strong>no deben ser desplegados en el sitio</strong>.\n"
-#~ "\n"
-#~ "Normalmente, las categorías no son privadas.\n"
-#~ "\n"
-#~ "Esto resulta útil para los problemas que se pueden ser reportados por un usuario a un órgano, pero para los cuales\n"
-#~ "no hay mayor interés en ser desplegados. En el Reino Unido, hemos utilizado esto para servicios como requerir un\n"
-#~ "basurero extra en una dirección específica"
-
-#~ msgid "Coordinates:"
-#~ msgstr "Coordenadas:"
-
-#~ msgid "Default priority"
-#~ msgstr "Prioridad por defecto"
-
-#~ msgid "Defect type"
-#~ msgstr "Tipo por defecto"
-
-#~ msgid "Description:"
-#~ msgstr "Descripción:"
-
-#~ msgid "Didn't use map"
-#~ msgstr "No usó mapa"
-
-#~ msgid "For each option, <strong>Key</strong> is the value which is stored in the database for that option and <strong>Name</strong> is the value displayed to the user."
-#~ msgstr "Para cada opción, <strong>Key</strong> es el valor almacenado en la base de datos para esa opción y <strong>Name</strong> es el valor que se muestra al usuario."
-
-#~ msgid "Hidden Field"
-#~ msgstr "Campo oculto"
-
-#~ msgid "Hint"
-#~ msgstr "Ayuda"
-
-#~ msgid "If ticked the user won’t see an input field, just the ‘Description’ text."
-#~ msgstr "Si se tiquea, el usuario no verá un campo para ingresar el dato, sino sólo el texto de ‘Descripción’."
-
-#~ msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here."
-#~ msgstr "Si utiliza <strong> un método de envío distinto del email</ strong>, introduzca el ID de servicio (Open311) o identificador equivalente aquí."
-
-#~ msgid "Inspection required"
-#~ msgstr "Inspección requerida"
-
-#~ msgid "Internet glitch"
-#~ msgstr "Falla de internet"
-
-#~ msgid "List"
-#~ msgstr "Lista"
-
-#~ msgid "No inspections by that inspector in the selected date range."
-#~ msgstr "No hubieron inspecciones a cargo de ese inspector en el rango de fechas seleccionado."
-
-#~ msgid "No inspections in the selected date range."
-#~ msgstr "No hubieron inspecciones en el rango de fechas seleccionado."
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Permalink"
-#~ msgstr "Enlace permanente"
-
-#~ msgid "Remove"
-#~ msgstr "Eliminar"
-
-#~ msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
-#~ msgstr "Los reportes generados por usuarios confiables serán remitidos al órgano competente sin inspección previa."
-
-#~ msgid "Reports will automatically be sent without needing to be inspected if the user's <strong>reputation</strong> is at or above this value. Set to <strong>0</strong> if all reports must be inspected regardless."
-#~ msgstr "Los reportes se remitirán automáticamente si la <strong>reputación</strong> del usuario es igual o mayor a este valor. Ingrese <strong>0</strong> si todos los reportes deben ser inspeccionados."
-
-#~ msgid "Reputation threshold"
-#~ msgstr "Umbral de reputación"
-
-#~ msgid "That report cannot be viewed on %s."
-#~ msgstr "Esa notificación no se puede ver en %s."
-
-#~ msgid ""
-#~ "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n"
-#~ "        Other categories for this body may have the same email address."
-#~ msgstr ""
-#~ "El <strong>email</strong> indica dónde serán enviadas las notificaciones de esta categoría.\n"
-#~ "Otras categorías de este mismo órgano administrativo podrían usar el mismo email."
-
-#~ msgid ""
-#~ "The <strong>group</strong> is used for the top-level category field when\n"
-#~ "          subcategory grouping is enabled."
-#~ msgstr ""
-#~ "Si la opción de agrupar subcategorías está habilitada, \n"
-#~ "el <strong>grupo</strong> se usa para el campo de la categoría de nivel superior."
-
-#~ msgid "The field name as shown to the user on the report form."
-#~ msgstr "El nombre del campo tal como se muestra al usuario en el formulario de reporte."
-
-#~ msgid "The ordering of this field on the report page. Fields are shown in ascending order according to this value."
-#~ msgstr "La posición ordenada de este campo en la página de reportes. Los campos se muestran en orden ascendente según este valor."
-
-#~ msgid "The type of input field to show to the user. <strong>Text</strong> is a simple text field, <strong>List</strong> is a drop-down selection."
-#~ msgstr "El tipo de campo que se muestra al usuario. <strong>Texto</strong> es un campo de texto simple, <strong>Lista</strong> es un menú desplegable."
-
-#~ msgid "There was a problem with your email/password combination. Please try again."
-#~ msgstr "Hubo un problema con su email/contraseña. Por favor, inténtelo de nuevo."
-
-#~ msgid "This is a developer site; things might break at any time, and the database will be periodically deleted."
-#~ msgstr "Este es un sitio para desarrolladores, las cosas podrían romperse en cualquier momento, y la base de datos se eliminará periódicamente."
-
-#~ msgid ""
-#~ "Use <strong>confirmed</strong> to indicate that this contact has been\n"
-#~ "confirmed as correct. If you are not sure of the origin or validity of the\n"
-#~ "contact, use <strong>unconfirmed</strong>. <strong>inactive</strong> will\n"
-#~ "remove the category from use when reporting problems, but keep it available in\n"
-#~ "map filters, and <strong>deleted</strong> will remove the category from there\n"
-#~ "as well."
-#~ msgstr ""
-#~ "Use <strong>confirmado</strong> para indicar que este contacto\n"
-#~ "ha sido confirmado como correcto. Si no está seguro sobre el\n"
-#~ " origen o validez del contacto, use <strong>no confirmado</strong>.\n"
-#~ "<strong>Inactiva</strong> omitirá la categoría al reportar problemas\n"
-#~ "pero la mantendrá para los filtros en el mapa, y <strong>eliminada</strong> quitará la categoría también de ahí."
+#~ msgid "Closed by council"
+#~ msgstr "Cerrada por el Ayuntamiento"
 
-#~ msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body."
-#~ msgstr "Use este campo para registrar detalles que sólo se muestran en la sección admin. Lo ingresado no se mostrará al público ni se enviará al órgano."
+#~ msgid "Current token:"
+#~ msgstr "Token actual:"
 
-#~ msgid "Used map"
-#~ msgstr "Mapa utilizado"
+#~ msgid "Filter report list"
+#~ msgstr "Filtrar lista de informes"
 
-#~ msgid "Whether the user is required to provide a value for this field."
-#~ msgstr "Si el usuario debe completar este campo."
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Valor inválido para agency_responsible %s"
 
-#~ msgid "or locate me automatically"
-#~ msgstr "o localízame automáticamente"
+#~ msgid "Post"
+#~ msgstr "Publicar"
diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 127be6737..18d519388 100644
--- a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/mysociety/teams/12067/es_DO/)\n"
@@ -20,8 +20,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " y "
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Informes de notificación"
 
@@ -114,7 +114,7 @@ msgstr "%s cuestionarios enviados &ndash; %s respondidos (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> colaboradores"
 
@@ -160,6 +160,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(no enviadas al ayuntamiento)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -178,8 +180,8 @@ msgstr "(enviado a ambos)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Escoja una categoría --"
@@ -209,17 +211,18 @@ msgstr ""
 "Por favor añada <code>MAPIT_TYPES</code> en su archivo de configuración."
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -249,7 +252,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Sí</strong>- tengo una contraseña"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -266,7 +269,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -289,7 +292,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Añada un contacto usando el siguiente formulario."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Agregar nueva categoría"
@@ -322,7 +325,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Agregar nueva categoría"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -331,8 +334,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -340,21 +343,20 @@ msgid "Add to shortlist"
 msgstr "Añadir a la lista de pre-seleccionados"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Añadir un usuario"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Añadir/editar las categorias del problema"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Añadir/Editar las prioridades de respuesta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Añadir/Editar las plantillas de respuesta"
 
@@ -370,6 +372,12 @@ msgstr "Añadir este reporte a tu lista de pre-seleccionados lo sacará de %s's
 msgid "Admin"
 msgstr "Administración"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Otra vez:"
@@ -382,8 +390,8 @@ msgstr "Alerta %d creada por %s, tipo %s, parámetros %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Alerta %d desactivada (creada %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Notificadme actualizaciones futuras"
 
@@ -395,10 +403,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Todas las notificaciones"
@@ -438,6 +448,11 @@ msgstr "Todas las notificaciones entre %s y %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Notificado en la categoría %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -474,7 +489,7 @@ msgstr "Anónimo"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -487,7 +502,7 @@ msgid "Another user"
 msgstr "Otro usuario"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "¿Está seguro(a) que quiere cancelar esta carga?"
 
@@ -496,8 +511,8 @@ msgstr "¿Está seguro(a) que quiere cancelar esta carga?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "¿Está seguro(a)?"
@@ -508,7 +523,7 @@ msgstr "¿Está seguro(a)?"
 msgid "Area covered"
 msgstr "Área cubierta"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Área:"
 
@@ -522,27 +537,32 @@ msgstr "Puesto que éste es un servidor de integración y %s es falsa, las notif
 msgid "Assign selected to role:"
 msgstr "Asignar usuarios a las áreas"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Asignar al organismo administrativo competente:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Asignar a otra categoria:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Asignar a un órgano externo:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Asigne a la subdivisión:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "Asignar usuarios a las áreas"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Categorías disponibles"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Asignado a %s"
@@ -555,7 +575,7 @@ msgstr "Se devuelven hasta %d solicitudes en cada consulta. Dichas solicitudes s
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Por el momento sólo funcionan la búsqueda y consulta de notificaciones."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr "Usuarios del personal autorizado pueden estar asociados a las categorías en las cuales ellos operan."
 
@@ -563,11 +583,11 @@ msgstr "Usuarios del personal autorizado pueden estar asociados a las categoría
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Respuesta automática:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -579,12 +599,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Evitar información personal y las placas de matrícula de los carros"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "En espera de revisión"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Atras"
@@ -605,14 +626,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Órganos administrativos"
 
@@ -625,11 +644,13 @@ msgstr "Órganos administrativos"
 msgid "Body"
 msgstr "Órgano administrativo"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Órgano administrativo:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -641,8 +662,7 @@ msgstr "¿No puedes encontrar nuestro email? Busque en su folder de email basura
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "¿No puedes ver el mapa? <em>Salte este paso</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -658,15 +678,13 @@ msgstr "Categorías:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -676,7 +694,7 @@ msgstr "Categoría"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Categoría cambiada de ‘%s’ a ‘%s’"
 
@@ -699,6 +717,11 @@ msgstr "Categoría:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Cambiar contraseña"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -715,7 +738,7 @@ msgstr "Cambiar contraseña"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -727,12 +750,12 @@ msgstr ""
 "Elegir un nombre de <strong>categoria</strong> que tenga sentido para el público (por ejemplo, \"baches\", \"alumbrado público\") y que sea también útil\n"
 "para el organismo administrativo. Las categorías aparecerán en un menú desplegable al notificar un problema."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr "Elija otro"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr "Eliminar datos sin conexión"
 
@@ -769,8 +792,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -780,11 +803,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Cerrada"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Cerrada por el Ayuntamiento"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -817,13 +836,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Configuración"
@@ -940,7 +958,7 @@ msgstr "Crear una notificación"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Crear una categoría"
@@ -950,27 +968,25 @@ msgstr "Crear una categoría"
 msgid "Create priority"
 msgstr "Crear prioridad"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "Crear informes/actualizaciones como ayuntamiento"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "Crear informes/actualizaciones en nombre del usuario"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Crear plantillas"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Creado"
@@ -979,6 +995,17 @@ msgstr "Creado"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Creado"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Creado"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -990,10 +1017,6 @@ msgstr "Creado:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -1003,19 +1026,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "No se han creado organismos aún."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Cliente imposible de contactar"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Tablero de control"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1027,7 +1052,7 @@ msgstr "Tratado por el departamento dentro de los 5 días hábiles"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1037,7 +1062,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Eliminar plantilla"
@@ -1059,9 +1084,7 @@ msgid "Describe why you are moderating this"
 msgstr "Describe el motivo de la moderación"
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Descripción"
 
@@ -1070,7 +1093,7 @@ msgstr "Descripción"
 msgid "Destination"
 msgstr "Descripción"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1106,7 +1129,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1114,6 +1137,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Notificado en la categoría %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Notificado en la categoría %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1148,25 +1181,25 @@ msgstr "No lo sé"
 msgid "Don't like forms?"
 msgstr "¿No te gustan los formularios?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Deslice y deje las fotos aquí o <u>haga clic para subir</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1181,7 +1214,7 @@ msgstr ""
 "Diferentes categorías <strong>pueden tener el mismo contacto</strong>.\n"
 "Esto significa que puede agregar muchas categorías incluso si tiene un solo contacto para el órgano."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr "Falso este/Falso norte:"
@@ -1193,7 +1226,7 @@ msgstr "Falso este/Falso norte:"
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Editar"
@@ -1204,12 +1237,11 @@ msgstr "Editar"
 msgid "Edit body details"
 msgstr "Editar los detalles del órgano administrativo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "Editar los permisos de otros usuarios"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Editar la categoría del informe"
 
@@ -1217,17 +1249,15 @@ msgstr "Editar la categoría del informe"
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Editar la prioridad del informe"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Editar los informes"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1264,8 +1294,9 @@ msgstr "Editor"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1274,15 +1305,14 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Email:"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Dirección de email"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1302,12 +1332,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Email:"
@@ -1377,12 +1408,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Punto final"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Introduzca un nombre de calle de Z&uuml;rich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área"
 
@@ -1409,10 +1440,10 @@ msgstr "Introduzca detalles del problema"
 msgid "Error"
 msgstr "Error"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Todo"
 
@@ -1425,7 +1456,7 @@ msgstr "Ejemplo de código postal %s"
 msgid "Examples:"
 msgstr "Ejemplos:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Categoría existente"
 
@@ -1434,7 +1465,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1459,7 +1490,7 @@ msgid "External body"
 msgstr "Organismo administrativo externo"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1471,20 +1502,20 @@ msgstr ""
 msgid "External team"
 msgstr "Equipo externo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Datos adicionales:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1517,20 +1548,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filtrar lista de informes"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Primera vez"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Fotos de notificaciones cercanas recientes"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nuevos informes"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Arreglar esto eligiendo un <strong>área cubierta</strong> en el formulario <em>Editar detalles del organismo</em> a continuación."
@@ -1560,7 +1596,7 @@ msgstr "Marcar como borrado"
 msgid "Flag user"
 msgstr "Marca usuario"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Marcado"
@@ -1569,7 +1605,7 @@ msgstr "Marcado"
 msgid "Flagged reports and users"
 msgstr "Señalizar informes y usuarios"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Los usuarios marcados se listan en página de<a href='%s'>marcados</a>"
 
@@ -1577,8 +1613,8 @@ msgstr "Los usuarios marcados se listan en página de<a href='%s'>marcados</a>"
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Las capacidades de los  \"usuarios marcados\" no se limitan de ninguna manera. Es solo una lista de usuarios que han sido marcado para observación."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Marcado:"
 
@@ -1604,11 +1640,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Reenviado al organismo administrativo externo"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Deseo reenviado al organismo administrativo externo"
 
@@ -1618,12 +1654,20 @@ msgstr "Deseo reenviado al organismo administrativo externo"
 msgid "Frequently Asked Questions"
 msgstr "Listado de Preguntas Frecuentes"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1645,7 +1689,7 @@ msgstr "Recibe actualizaciones de los problemas %s"
 msgid "Get updates of problems in this %s"
 msgstr "Recibe actualizaciones de los problemas en este %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Proporcióname un listado RSS"
 
@@ -1661,15 +1705,15 @@ msgstr "¡Nos alegra saber que ha sido arreglado!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1679,7 +1723,7 @@ msgstr "Ir"
 msgid "Going to send questionnaire?"
 msgstr "¿Va a enviar cuestionario?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr "Permitir el acceso al administrador"
 
@@ -1705,6 +1749,7 @@ msgstr "¿Alguna vez informó de un problema a un Ayuntamiento antes, o es su pr
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1739,7 +1784,8 @@ msgstr "Oculto"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1767,7 +1813,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Ocultar marcadores"
 
@@ -1821,11 +1867,9 @@ msgstr "No se ha podido localizar su problema en la base de datos.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1846,15 +1890,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1870,7 +1914,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1894,7 +1938,7 @@ msgstr "Si quiere que esta plantilla sea una opción para categorías específic
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "Si envía un problema aquí, éste será <strong>no</strong> reportado al ayuntamiento."
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1933,7 +1977,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1957,6 +2001,17 @@ msgstr "¿En tabla de abusones?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "Los siguientes atributos, que no forman parte de la especificación Open311 v2, son adicionalmente devueltos: agency_sent_datetime, title (también se devuelve como parte de la descripción), interface_used, comment_count, requestor_name (solo si el solicitante permitió que el nombre que se mostrará en el sitio)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "barrio"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1966,20 +2021,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr "Bandeja de entrada vacía"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Incluir datos del notificador"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Valor incorrecto para has_photo \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "Dar instrucciones a los contratistas para que solucionen los problemas"
 
@@ -1996,16 +2051,12 @@ msgstr "Notas internas"
 msgid "Internal notes"
 msgstr "Notas internas"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Valor inválido para agency_responsible %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Especificado un formato no válido %s."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Ubicación equivocada.  Una nueva ubicación debe estar bajo la protección del mismo ayuntamiento."
 
@@ -2057,13 +2108,13 @@ msgstr "Última actualización:"
 msgid "Last&nbsp;update:"
 msgstr "Última&nbsp;actualización:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Latitud/Longitud:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Menos recientemente actualizado"
@@ -2080,7 +2131,7 @@ msgstr "Listar todos los problemas notificados"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Cargando..."
@@ -2118,17 +2169,18 @@ msgid "Log in with Twitter"
 msgstr "Iniciar sesión con Twitter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "Iniciar sesión con email"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2147,19 +2199,20 @@ msgstr "Buscar"
 msgid "MAP"
 msgstr "MAPA"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr "Administrar los pre-seleccionados"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2173,24 +2226,24 @@ msgstr " Mapa"
 msgid "Mark as sent"
 msgstr "Marcado como enviado"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Señalar como <strong>marcados</strong> aquellos usuarios cuyo comportamiento desea observar."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr "Marcar los detalles del problema"
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Mensaje:"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Mensaje al organismo administrativo competente:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Mensaje al organismo administrativo externo:"
 
@@ -2203,7 +2256,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr "Organismos administrativos perdidos:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Falta jurisdiction_id"
 
@@ -2211,8 +2264,7 @@ msgstr "Falta jurisdiction_id"
 msgid "Moderate"
 msgstr "Moderar"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Moderar los detalles del informe"
 
@@ -2235,7 +2287,7 @@ msgstr "Moderado por %s a %s"
 msgid "Moderated by division within one working day"
 msgstr "Moderado por el organismo durante el siguiente día laborable"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2245,14 +2297,14 @@ msgstr ""
 msgid "Month"
 msgstr "Mes"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Lo más comentado"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2280,9 +2332,10 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Nombre:"
@@ -2300,7 +2353,7 @@ msgstr "Navegue a este problema"
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Nombre de la calle más cercana al marcador colocado en el mapa (se genera automáticamente utilizando OpenStreetMap): %s%s"
 
@@ -2308,12 +2361,12 @@ msgstr "Nombre de la calle más cercana al marcador colocado en el mapa (se gene
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Código Postal más cercano al marcador colocado en el mapa (generado automáticamente): %s (%sm de distancia)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Camino más cercano al marcador colocado en el mapa (generado automáticamente por Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2338,7 +2391,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Nuevo organismo añadido"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Añadida nueva categoría de contactos"
 
@@ -2351,8 +2404,8 @@ msgstr "Nueva dirección de email:"
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nueva nota interna:"
 
@@ -2360,13 +2413,13 @@ msgstr "Nueva nota interna:"
 msgid "New local problems on FixMyStreet"
 msgstr "Nuevos reportes locales en CuidoMiCiudad"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Nota nueva al DM:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Contraseña nueva:"
 
@@ -2443,7 +2496,7 @@ msgstr "Plantilla nueva"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Lo más reciente"
@@ -2456,7 +2509,6 @@ msgstr "Siguiente"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2465,11 +2517,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "No"
 
@@ -2481,11 +2533,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Sin órgano administrativo"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Ningún ayuntamiento seleccionado"
 
@@ -2501,8 +2554,8 @@ msgstr "No se encuentran problemas marcados."
 msgid "No flagged users found."
 msgstr "No se encuentran usuarios marcados"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "No hay más actualizaciones"
 
@@ -2540,8 +2593,8 @@ msgstr "No hay seguidores"
 msgid "None"
 msgstr "Nada"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
@@ -2549,8 +2602,8 @@ msgstr ""
 "Usuarios normales (públicos) no deberán ser asociados con cualquier <strong>área</strong>.<br>\n"
 "Usuarios del personal autorizado pueden ser asociados con el área en la cual operan."
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2562,10 +2615,14 @@ msgstr ""
 "Dependiendo de la implementación, el personal pueden tener acceso al tablero (resumen de\n"
 "la actividad a través de su departamento), la capacidad de ocultar notificaciones, o establecer estados especiales para las notificaciones."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "No para mi subdivisión"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "No notificado anteriormente"
@@ -2613,12 +2670,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr "Datos sin conexión eliminados"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2626,12 +2683,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Estado antiguo"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Lo más antiguo"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2640,7 +2697,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2671,7 +2728,7 @@ msgstr "Página web de la iniciativa Open311"
 msgid "Open311 specification"
 msgstr "Especificación Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2683,7 +2740,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2691,16 +2748,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2732,7 +2789,7 @@ msgstr "Página no encontrada"
 msgid "Parent"
 msgstr "Padre"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Todas las categorías"
@@ -2741,13 +2798,13 @@ msgstr "Todas las categorías"
 msgid "Partial"
 msgstr "Parcial"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Contraseña (opcional)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Su contraseña ha cambiado"
@@ -2762,7 +2819,7 @@ msgstr "Contraseña (opcional)"
 msgid "Permissions"
 msgstr "Licencias:"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Licencias:"
 
@@ -2770,19 +2827,24 @@ msgstr "Licencias:"
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Teléfono:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Número de teléfono (opcional)"
 
@@ -2790,30 +2852,26 @@ msgstr "Número de teléfono (opcional)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Teléfono:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2833,9 +2891,8 @@ msgstr "Foto es obligatoria"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Fotos"
@@ -2844,7 +2901,7 @@ msgstr "Fotos"
 msgid "Photos of recent nearby reports"
 msgstr "Fotos de notificaciones cercanas recientes"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2858,6 +2915,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Coloque el marcador en el mapa"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2885,27 +2947,26 @@ msgid "Please check your email address is correct"
 msgstr "Por favor, compruebe que su dirección de email es correcta"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Por favor, elija una categoría"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2924,27 +2985,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Por favor notifique incidencias relevantes y no abuse; abusando de su ayuntamiento degrada su capacidad de servicio a toda la ciudadanía."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Por favor escriba su mensaje."
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Por favor, indique un nombre"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "Por favor, indique un nombre para este organismo"
 
@@ -2957,16 +3018,16 @@ msgstr "Por favor, introduzca una contraseña"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Por favor, introduzca un título"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2977,20 +3038,20 @@ msgstr "Por favor, introduce una dirección de email válida"
 msgid "Please enter a valid email address"
 msgstr "Por favor, introduce una dirección de email válida"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Por favor, describa los detalles más relevantes"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -3006,7 +3067,7 @@ msgid "Please enter your first name"
 msgstr "Por favor, indique su nombre"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Por favor escriba su nombre completo, ya que los ayuntamientos necesitan esta información. Si usted NO desea que su nombre aparecerá en la página, desactive la casilla de abajo"
@@ -3018,9 +3079,9 @@ msgstr "Por favor, introduzca su nombre"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Por favor, introduzca su nombre"
@@ -3061,19 +3122,19 @@ msgstr "Por favor, complete el siguiente formulario con los detalles del problem
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Por favor, indique si le gustaría recibir algún otro cuestionario"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Por favor, introduce una dirección de email válida"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3100,24 +3161,28 @@ msgstr "Por favor, tenga en cuenta que su actualización no ha <strong>sido aún
 msgid "Please note:"
 msgstr "Por favor, tenga en cuenta:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr "Por favor, proveer una actualización pública para este reporte."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Por favor, explique por qué está reabriendo esta notificación."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Proporcione un texto y una foto"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Por favor, indique si ha notificado un problema al ayuntamiento alguna vez."
 
@@ -3125,7 +3190,7 @@ msgstr "Por favor, indique si ha notificado un problema al ayuntamiento alguna v
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Por favor, seleccione un organismo administrativo"
 
@@ -3137,7 +3202,7 @@ msgstr "Por favor, seleccione el tipo de listado que desea"
 msgid "Please select the type of alert you want"
 msgstr "Por favor, seleccione el tipo de alerta que desea"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Por favor, indique si el problema se ha solucionado"
 
@@ -3145,12 +3210,12 @@ msgstr "Por favor, indique si el problema se ha solucionado"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Por favor, suba solo una imagen"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3158,27 +3223,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Por favor, escriba un mensaje"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Publicar"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Publicado de forma anónima - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Publicado por %s - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Publicado por <strong>%s</strong> (%s) - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Publicado por <strong>%s</strong> - %s"
 
@@ -3194,7 +3255,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3202,11 +3263,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Previo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Prioridades"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Prioridad"
@@ -3222,9 +3283,9 @@ msgid "Privacy and cookies"
 msgstr "Privacidad y cookies"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privado"
 
@@ -3274,7 +3335,7 @@ msgstr "Problema %s enviado al Ayuntamiento %s"
 msgid "Problem breakdown by state"
 msgstr "Desglose de problemas según estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problema marcado como abierto."
 
@@ -3282,8 +3343,7 @@ msgstr "Problema marcado como abierto."
 msgid "Problem state change based on survey results"
 msgstr "El estado del problema cambió debido a los resultados de la encuesta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemas"
@@ -3308,18 +3368,18 @@ msgstr "Problemas recientemente notificados como arreglados en CuidoMiCiudad"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemas en %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemas en el barrio %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3327,7 +3387,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Problemas dentro %s, %s"
 
@@ -3335,11 +3395,15 @@ msgstr "Problemas dentro %s, %s"
 msgid "Property address:"
 msgstr "Dirección de la propiedad:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3353,11 +3417,11 @@ msgstr "Proporcionar una actualización"
 msgid "Provide update as"
 msgstr "Proporcionar la actualización como"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Proporcionar una contraseña es opcional, pero hacerlo le permitirá notificar y actualizar los problemas más fácilmente, así como administrar sus informes."
 
@@ -3365,12 +3429,12 @@ msgstr "Proporcionar una contraseña es opcional, pero hacerlo le permitirá not
 msgid "Public details"
 msgstr "Detalles públicos"
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Respuesta del público:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Actualización pública:"
 
@@ -3413,11 +3477,11 @@ msgstr "Cuestionario cumplimentado por el notificador problema"
 msgid "RSS feed"
 msgstr "Listado RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "Listado RSS para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "Listado RSS para %s del barrio, %s"
 
@@ -3425,11 +3489,11 @@ msgstr "Listado RSS para %s del barrio, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "Listado RSS para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "Listado RSS para %s, en el barrio %s"
 
@@ -3437,13 +3501,13 @@ msgstr "Listado RSS para %s, en el barrio %s"
 msgid "RSS feed of nearby problems"
 msgstr "Listado RSS de los problemas cercanos"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "Listado RSS de los problemas dentro de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "Listado RSS de los problemas dentro del barrio %s"
 
@@ -3457,11 +3521,11 @@ msgstr "Listado RSS de los problemas locales más recientes"
 msgid "RSS feed of updates to this problem"
 msgstr "Listado RSS de actualizaciones sobre este problema"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3474,7 +3538,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Reciba un correo cuando se dejen actualizaciones sobre este problema."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr "Recibido por unos %s momentos tarde"
 
@@ -3488,7 +3552,7 @@ msgstr "Problemas locales recientes, %s"
 msgid "Recently reported problems"
 msgstr "Problemas recientemente notificados"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Recientemente actualizado"
@@ -3501,7 +3565,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Recuerde que CuidoMiCiudad es principalmente para informar sobre problemas físicos que pueden ser arreglados. Si su problema no es apropiado para ser presentado a través de este sitio recuerde que puede ponerse en contacto con su Ayuntamiento directamente mediante su página web."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3513,8 +3578,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Eliminar marca"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3530,17 +3595,22 @@ msgstr "Eliminar de la site"
 msgid "Remove option"
 msgstr "Eliminar de la site"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Quitar foto (¡no se puede deshacer!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Editar los permisos de otros usuarios"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Responder al usuario:"
 
@@ -3548,14 +3618,14 @@ msgstr "Responder al usuario:"
 msgid "Report"
 msgstr "Notificar"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "ID del informe:"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3564,7 +3634,7 @@ msgid "Report a problem"
 msgstr "Notificar un problema"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3580,7 +3650,7 @@ msgid "Report anonymously"
 msgstr "Notificado anónimamente en %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3616,7 +3686,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Notifique, consulte o discuta problemas locales"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Notificado anónimamente en %s"
@@ -3627,7 +3697,7 @@ msgstr "Notificado anónimamente en %s"
 msgid "Reported before"
 msgstr "Notificado con anterioridad"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Notificado por %s en %s"
@@ -3641,27 +3711,27 @@ msgstr "Notificado por:"
 msgid "Reported in the %s category"
 msgstr "Notificado en la categoría %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Notificado anónimamente en la categoría %s en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Notificado en la categoría %s por %s en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Notificado anónimamente vía %s  en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Notificado vía %s por %s en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Notificado anónimamente vía %s en la categoría %s en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Notificado vía %s en la categoría %s por %s en %s"
 
@@ -3680,17 +3750,15 @@ msgstr "Notificado:"
 msgid "Reporting a problem"
 msgstr "Notificando un problema"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Informes"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3718,15 +3786,15 @@ msgid "Reports published"
 msgstr "Notificaciones publicadas"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3739,7 +3807,7 @@ msgstr "Informes esperando a ser enviados"
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3792,39 +3860,45 @@ msgstr "Volver al titulo original"
 msgid "Right place?"
 msgstr "¿Es correcto el lugar?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Operador responsable de este camino (derivado del número de referencia y tipo del camino): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operador responsable de este camino (de OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Rotar a la izquierda"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3840,20 +3914,20 @@ msgstr "Rotar esta foto eliminará los cambios no guardados al informe."
 msgid "Satellite"
 msgstr "Satélite"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3870,13 +3944,12 @@ msgid "Save with a public update"
 msgstr "Guardar con una actualización pública"
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr "Guardando reportes sin conexión"
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Buscar Notificaciones"
 
@@ -3889,7 +3962,7 @@ msgstr "Buscar Usuarios"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Buscar informes"
 
@@ -3904,12 +3977,12 @@ msgstr "Buscar:"
 msgid "Searching found no reports."
 msgstr "La búsqueda no encontró notificaciones."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "La búsqueda no encontró usuarios."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3919,8 +3992,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr "Ver nuestra política de privacidad"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3930,7 +4002,7 @@ msgid "Select a body"
 msgstr "Selecciona un órgano administrativo"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Seleccione un área"
@@ -3951,7 +4023,7 @@ msgstr ""
 msgid "Select:"
 msgstr "Seleccionar:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3964,7 +4036,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr "Enviar estados Open311 extendidos con actualizaciones de pedidos de servicio"
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3973,11 +4045,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "Devolver el informe"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Enviado a %s %s después"
 
@@ -4015,7 +4087,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr "Pre-seleccionados"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4026,7 +4098,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr "Entre los pre-seleccionados"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr "Pre-seleecionados por %s"
@@ -4051,8 +4123,8 @@ msgstr "Mostrar el nombre públicamente"
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4063,7 +4135,7 @@ msgstr "Mostrar foto"
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Mostrar marcadores"
 
@@ -4125,7 +4197,7 @@ msgid "Some photos of recent reports"
 msgstr "Algunas fotos de notificaciones recientes"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Algún texto para localizar"
 
@@ -4134,12 +4206,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Lo sentimos, ése parece ser un código postal dependiente de La Corona, que no soportamos."
 
@@ -4157,9 +4228,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Lo sentimos, hubo un error confirmando su notificación."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Lo sentimos, no hemos podido encontrar ese lugar."
 
@@ -4169,13 +4240,13 @@ msgstr "Lo sentimos, no hemos podido encontrar ese lugar."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr "Lo sentimos, pero pudimos iniciar la sesión.  Por favor, llena el siguiente formulario."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo de nuevo."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4191,11 +4262,11 @@ msgstr "Disculpa, no tenemos una buena conexión de internet para grabar este p
 msgid "Sorry, you don't have permission to do that."
 msgstr "Lo sentimos, no tiene permiso para hacer eso."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Seleccionado por"
@@ -4205,11 +4276,11 @@ msgstr "Seleccionado por"
 msgid "Staff only"
 msgstr "Personal:"
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr "Usuarios del personal tienen permiso para iniciar sesión al administrador."
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr "Personal:"
 
@@ -4233,18 +4304,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4253,31 +4324,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Estado/Prov.:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Estadísticas"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Estado"
 
@@ -4295,7 +4363,7 @@ msgstr "Vista de calle"
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Subdivisión/Órgano"
 
@@ -4314,50 +4382,48 @@ msgstr "Título:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Enviar cambios"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Enviar cuestionario"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Enviado"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Suscribirse"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4370,7 +4436,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Las actualizaciones están limitadas a %s caracteres. Por favor acorte su actualización."
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4384,20 +4450,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr "Resuma el problema"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Resuma sus cambios"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Resumen"
 
@@ -4408,14 +4473,20 @@ msgstr "Resumen de notificaciones"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Superuser"
+msgstr "Súperusuario:"
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr "Súperusuario:"
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "Los súperusuarios tienen el permiso de realizar <strong>todas las acciones</strong> dentro del administrador."
 
@@ -4433,13 +4504,18 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr "Plantilla &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Plantillas"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Menos recientemente actualizado"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Texto"
@@ -4460,6 +4536,11 @@ msgstr "Versión solo texto"
 msgid "Text:"
 msgstr "Texto:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Texto"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "¡Gracias por notificar esta incidencia!"
@@ -4489,7 +4570,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "¡Gracias, nos alegra saber que fue arreglado! ¿Podría decirnos si había notificado un problema a un ayuntamiento con anterioridad?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4501,27 +4582,29 @@ msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuev
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Esa localización no parece estar cubierta por un ayuntamiento, tal vez esté en alta mar o fuera del país. Por favor, inténtelo de nuevo."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Ese código postal no fue reconocido, lo siento."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "El problema se ha marcado como enviado."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "El problema ahora será reenviado."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Esa notificación ha sido eliminada de CuidoMiCiudad."
 
@@ -4569,8 +4652,8 @@ msgstr "La <strong>jurisdicción</strong> solo es necesaria si los límites incl
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4629,7 +4712,7 @@ msgstr "El error fue: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "Los siguientes atributos Open311 v2 son devueltos para cada petición: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code y service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "La información siguiente sobre la carretera más cercana podría ser incorrecta o irrelevante si el problema se encuentra cerca de varias carreteras o cerca de una carretera sin nombre registrado en OpenStreetMap."
 
@@ -4691,8 +4774,8 @@ msgstr "El usuario no pudo situar el problema en el mapa, salvo para ver el áre
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4727,7 +4810,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4745,12 +4828,12 @@ msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo."
 
@@ -4758,7 +4841,7 @@ msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo."
 msgid "There were problems with your report. Please see below."
 msgstr "Hubo problemas con su notificación. Por favor, vea más abajo."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Hubo problemas con su actualización. Por favor, vea más abajo."
 
@@ -4843,10 +4926,10 @@ msgstr "Este correo electrónico ha sido enviado a los dos ayuntamientos que cub
 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 "Este correo electrónico ha sido enviado a varios consejos que cubren la ubicación del problema, pues la categoría de problema seleccionada por el usuario se proporciona para todos ellos. Por favor, si usted no pertenece al órgano administrativo responsable de resolver esta incidencia haga caso omiso de este mensaje."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Esta información es necesaria"
 
@@ -4863,19 +4946,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Este problema se ha arreglado"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Este problema no se ha arreglado"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4888,26 +4975,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr "Ese reporte es duplicado. Por favor, actualizar el reporte original:"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Esta notificación está pendiente de moderación."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Esta notificación está marcada como cerrada."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Esta notificación está marcada como arreglada."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Esta notificación está marcada como abierta."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4915,15 +5002,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Esta página web también contiene una foto del problema, proporcionada por el usuario."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Tiempo invertido (en minutos):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4947,6 +5037,10 @@ msgstr "Título"
 msgid "Title:"
 msgstr "Título:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "Para averiguar cuáles alertas locales tenemos para usted, por favor escriba su %s de código postal o el nombre de la calle y área:"
@@ -4972,7 +5066,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "Para ver un mapa de la ubicación precisa de este problema"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4997,11 +5091,6 @@ msgstr ""
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr "¿Se necesita administración del tráfico?"
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -5024,16 +5113,16 @@ msgstr "Pruebe enviándonos un correo directamente:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5043,7 +5132,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5073,10 +5162,10 @@ msgstr "Error desconocido"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "ID de problema desconocido"
 
@@ -5088,13 +5177,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Actualizar"
 
@@ -5145,29 +5234,27 @@ msgstr "La actualización reabrió el problema"
 msgid "Update statuses"
 msgstr "Actualización de estados"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Actualizado"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "¡Actualizado!"
 
@@ -5178,7 +5265,7 @@ msgstr "¡Actualizado!"
 msgid "Updates"
 msgstr "Actualizaciones"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Las actualizaciones están limitadas a %s caracteres. Por favor acorte su actualización."
 
@@ -5208,6 +5295,14 @@ msgstr "Abrir la extension Open311 de envío de actualización"
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr "ID de usuario a quien atribuir los comentarios obtenidos"
@@ -5221,8 +5316,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5240,7 +5335,7 @@ msgid "User flagged"
 msgstr "Usuario marcado"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5253,27 +5348,25 @@ msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcc
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Usuarios"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr "Los usuarios pueden realizar las siguientes acciones dentro de sus organismos administrativos o áreas asignadas. "
 
@@ -5282,9 +5375,9 @@ msgstr "Los usuarios pueden realizar las siguientes acciones dentro de sus organ
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr "Los usuarios pueden realizar las siguientes acciones dentro de sus organismos administrativos o áreas asignadas. "
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Valores actualizados"
 
@@ -5310,7 +5403,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Ver notificaciones en el site"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Ver notificaciones por barrio"
 
@@ -5318,7 +5411,7 @@ msgstr "Ver notificaciones por barrio"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5336,7 +5429,7 @@ msgstr "Visualizando un problema"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Barrios de este ayuntamiento"
 
@@ -5406,7 +5499,7 @@ msgstr "Una vez enviada"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr "¿Ese reporte es un reporte duplicado de qué reporte?"
 
@@ -5426,7 +5519,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y está <a href=\"https://fixmystreet.org\">disponible en fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "¿Quieres recibir otro cuestionario en 4 semanas, recordándote que debes comprobar el estado?"
 
@@ -5438,7 +5531,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuación hace que sea difícil de leer."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5449,12 +5541,12 @@ msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuac
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "SÍ"
 
@@ -5467,7 +5559,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr "Está sin conexion"
 
@@ -5480,7 +5572,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Estás denunciando la siguiente actualización por ser abusiva, contener información personal, o similar:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5489,7 +5581,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Usted puede <a href=\"%s%s\">ver el problema en este sitio</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Puede agregar email del usuario abusivo a la lista de abusones, que oculta de forma automática (y nunca envía) los informes que crean."
 
@@ -5522,7 +5614,7 @@ msgstr "Puede ayudarnos a encontrar una dirección de email de contacto para los
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Puede marcar un organismo como eliminado si no quiere que aparezca activo en este sitio."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5532,7 +5624,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Usted rechazó finalmente; por favor, rellene el formulario de arriba"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5540,7 +5632,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Ya respondió a esta encuesta. Si tiene alguna pregunta, por favor, <a href='%s'>póngase en contacto con nosotros</a>, o <a href ='%s'>vea su problema</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 #, fuzzy
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Ya ha adjuntado fotos a este informe.  Tenga en cuenta que solo puede adjuntar un máximo de 3 a este informe (si intenta subir más, las más antiguas serán desechadas)."
@@ -5550,8 +5642,7 @@ msgstr "Ya ha adjuntado fotos a este informe.  Tenga en cuenta que solo puede ad
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Ya ha adjuntado fotos a este informe.  Tenga en cuenta que solo puede adjuntar un máximo de 3 a este informe (si intenta subir más, las más antiguas serán desechadas)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr "Ya ha adjuntado fotos a esta actualización.  Tenga en cuenta que puede adjuntar un máximo de 3 a esta actualización (si intenta subir más, las más antiguas serán desechadas)."
 
@@ -5618,9 +5709,9 @@ msgstr "Sus notificaciones"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Su cuenta"
@@ -5629,13 +5720,14 @@ msgstr "Su cuenta"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5664,16 +5756,16 @@ msgstr "Su nombre"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5694,8 +5786,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr "Inicie sesión con su dirección de email, proporcionando una nueva contraseña.  Cuando haga click en el enlace en su correo electrónico su clave será actualizada."
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5728,7 +5820,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr "Su reporte está guardado para subir cuando tenga una conexión internet."
 
@@ -5759,19 +5851,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "todo"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5779,8 +5871,8 @@ msgstr ""
 msgid "by %s"
 msgstr "por %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "ayuntamiento"
 
@@ -5811,6 +5903,10 @@ msgstr "editar usuario"
 msgid "from %s different users"
 msgstr "de %s usuarios diferentes"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5828,7 +5924,7 @@ msgstr "n/a"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr "nada"
 
@@ -5911,12 +6007,12 @@ msgid "today"
 msgstr "hoy"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5941,7 +6037,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "barrio"
 
@@ -6001,7 +6097,7 @@ msgid_plural "%d years"
 msgstr[0] "%d año"
 msgstr[1] "%d años"
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6022,7 +6118,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6043,21 +6139,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> arregladas la semana pasada"
 msgstr[1] "<big>%s</big> arregladas el mes pasado"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> notificadas la semana pasada"
 msgstr[1] "<big>%s</big> notificaciones la semana pasada"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> notificadas recientemente"
 msgstr[1] "<big>%s</big> notificadas recientemente"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6092,29 +6188,41 @@ msgid_plural "last updated %d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Cerrada por el Ayuntamiento"
+
+#~ msgid "Filter report list"
+#~ msgstr "Filtrar lista de informes"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Valor inválido para agency_responsible %s"
+
+#~ msgid "Post"
+#~ msgstr "Publicar"
+
+#~ msgid "Traffic management required?"
+#~ msgstr "¿Se necesita administración del tráfico?"
+
 #~ msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 #~ msgstr "<strong>Nota:</strong> Este informe ha sido enviado y espera una acción.  Cualquier cambio realizado no será pasado."
 
 #~ msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 #~ msgstr "<strong>Nota:</strong> Este informe aún no se ha sido enviado por una acción. Cualquier cambio realizado podría no pasar."
 
-#~ msgid "Available categories"
-#~ msgstr "Categorías disponibles"
-
 #~ msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent."
 #~ msgstr "Marcar <strong>la inspección requerida</strong> si se reporta en esta categoría<strong>debe ser inspeccionada</strong> antes de ser enviada."
 
diff --git a/locale/fa_IR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fa_IR.UTF-8/LC_MESSAGES/FixMyStreet.po
new file mode 100644
index 000000000..6c122c3b8
--- /dev/null
+++ b/locale/fa_IR.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -0,0 +1,6116 @@
+# FixMyStreet original .po file, autogenerated by gettext-extract.
+# Copyright (C) 2011 UK Citizens Online Democracy
+# This file is distributed under the same license as the main FixMyStreet code.
+# Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
+#
+# Translators:
+# amir rezaei <amir@united4iran.org>, 2020
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.0\n"
+"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
+"PO-Revision-Date: 2020-03-05 09:59+0000\n"
+"Last-Translator: amir rezaei <amir@united4iran.org>, 2020\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/mysociety/teams/12067/fa_IR/)\n"
+"Language: fa_IR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
+#: perllib/FixMyStreet/Queue/Item/Report.pm:194
+msgid " and "
+msgstr "و"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/report/new/category_extras.html:17
+#: templates/web/base/report/new/councils_text_all.html:6
+#: templates/web/base/report/new/top_message_none.html:13
+#: templates/web/base/report/new/top_message_none.html:15
+#: templates/web/base/report/new/top_message_some.html:10
+#: templates/web/base/report/new/top_message_some.html:12
+msgid " or "
+msgstr "یا"
+
+#: templates/web/base/report/inspect/_extra_details_field.html:5
+msgid "%d characters maximum"
+msgstr ""
+
+#: templates/web/base/admin/bodies/edit-league.html:12
+msgid "%d edits by %s"
+msgstr "%dویرایش توسط%s"
+
+#: templates/web/base/pagination.html:7
+msgid "%d to %d of %d"
+msgstr ""
+
+#: templates/web/base/admin/users/import.html:42
+msgid "%d users already existed"
+msgstr "%dکاربران از پیش وجود داشتند"
+
+#: templates/web/base/dashboard/heatmap.html:0
+#: templates/web/base/dashboard/heatmap.html:9
+#: templates/web/base/reports/body.html:0
+#: templates/web/base/reports/body.html:26
+msgid "%s - Summary reports"
+msgstr " %s - خلاصه گزارش‌ها"
+
+#. ("%s here is the site name")
+#: templates/web/base/admin/navigation.html:3
+msgid "%s admin:"
+msgstr "%s مدیر:"
+
+#: templates/web/base/status/stats.html:26
+msgid "%s bodies"
+msgstr ""
+
+#: templates/web/base/status/stats.html:24
+msgid "%s confirmed alerts, %s unconfirmed"
+msgstr "%sهشدارهای تایید شده، %s تایید نشده"
+
+#: templates/web/base/status/stats.html:27
+#: templates/web/zurich/admin/index.html:6
+msgid "%s council contacts &ndash; %s confirmed, %s unconfirmed"
+msgstr ""
+
+#. ("%s is the site name")
+#: templates/web/base/alert/_index_text.html:3
+msgid ""
+"%s has a variety of RSS feeds and email alerts for local\n"
+"problems, including alerts for all problems within a particular ward, or all\n"
+"problems within a certain distance of a particular location."
+msgstr ""
+"%sدارای انواع مختلفی از فیدهای RSS و ایمیل‌های هشدار برای\n"
+" مشکلات محلی، از جمله هشدارهایی برای همه مشکلات در یک بخش خاص یا همه\n"
+" مشکلات در مسافتی مشخص از یک مکان خاص."
+
+#. ("%s is the site name")
+#: templates/web/base/alert/_index_text.html:7
+msgid ""
+"%s has a variety of RSS feeds and email alerts for local problems, including\n"
+"alerts for all problems within a particular ward or council, or all problems\n"
+"within a certain distance of a particular location."
+msgstr ""
+"%sدارای انواع مختلفی از فیدهای RSS و ایمیل‌های هشدار برای مشکلات محلی، از جمله\n"
+" هشدارهایی برای همه مشکلات در یک بخش یا انجمن خاص یا همه مشکلات\n"
+"در مسافتی مشخص از یک مکان خاص."
+
+#: templates/web/base/status/stats.html:23
+msgid "%s live updates"
+msgstr "%sبروزرسانی‌های زنده"
+
+#: templates/web/base/dashboard/index.html:166
+#: templates/web/base/dashboard/index.html:169
+msgid "%s opened, %s closed, %s fixed"
+msgstr "%s باز شد، %s بسته شد، %sدرست شد"
+
+#: templates/web/base/status/stats.html:25
+msgid "%s questionnaires sent &ndash; %s answered (%s%%)"
+msgstr "%sپرسشنامه‌ها ارسال شدند &ndash؛ %s جواب داده شد (%s%%)"
+
+#: templates/web/base/report/_council_sent_info.html:8
+msgid "%s ref:&nbsp;%s"
+msgstr ""
+
+#: perllib/FixMyStreet/Map/OSM.pm:47
+msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
+msgstr ""
+
+#: templates/web/zurich/report/new/fill_in_details_form.html:21
+msgid "(Defect &amp; location of defect)"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:50
+#: templates/web/zurich/admin/reports/edit.html:78
+msgid "(No name)"
+msgstr "(بی‌نام)"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:57
+#: templates/web/zurich/admin/reports/edit.html:85
+msgid "(No phone number)"
+msgstr "(بدون شماره تلفن)"
+
+#: templates/web/base/admin/states/index.html:95
+msgid "(a-z and space only)"
+msgstr "(فقط a-z و فاصله)"
+
+#: templates/web/zurich/report/_item.html:21
+msgid "(closed)"
+msgstr "(بسته شد)"
+
+#: templates/web/base/alert/_list_rss_local.html:8
+msgid "(covers roughly 200,000 people)"
+msgstr "(تقریباً 200.000 نفر را پوشش می‌دهد)"
+
+#: templates/web/zurich/report/_item.html:19
+msgid "(fixed)"
+msgstr "(درست شد)"
+
+#: templates/web/base/around/intro.html:2
+msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
+msgstr "(مانند نقاشی‌های دیواری، دفع غیرقانونی زباله، سنگ فرش شکسته یا روشنایی خیابان)"
+
+#: templates/web/base/reports/index.html:82
+msgid "(no longer exists)"
+msgstr "(دیگر موجود نیست)"
+
+#: templates/web/base/report/_item_small.html:30
+msgid "(not sent to council)"
+msgstr "(به شورا ارسال نشده)"
+
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
+#: templates/web/base/report/new/form_user_loggedin.html:39
+#: templates/web/zurich/report/new/fill_in_details_form.html:59
+msgid "(optional)"
+msgstr "(اختیاری)"
+
+#: templates/web/base/report/_item_small.html:28
+msgid "(sent to all)"
+msgstr "(ارسال به همه)"
+
+#: templates/web/base/report/_item_small.html:29
+msgid "(sent to both)"
+msgstr "(ارسال به هردو)"
+
+#. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]")
+#: templates/web/base/alert/_list.html:29
+msgid "(we also have RSS feeds for problems within %s)"
+msgstr "(ما همچنین فیدهای RSS موجود داریم، برای مشکلات‌هایی در بازه %s )"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
+#: templates/web/zurich/admin/bodies/form.html:27
+msgid "-- Pick a category --"
+msgstr "-- انتخاب دسته‌بندی --"
+
+#: templates/web/base/report/new/category_extras_fields.html:19
+msgid "-- Pick an option --"
+msgstr "-- انتخاب یک گزینه --"
+
+#: templates/web/base/contact/enquiry/index.html:35
+msgid "-- Please select --"
+msgstr "-- لطفا انتخاب کنید --"
+
+#: templates/web/base/admin/response_templates_select.html:3
+msgid "--Choose a template--"
+msgstr "-- انتخاب یک قالب --"
+
+#: templates/web/base/admin/bodies/form.html:50
+#: templates/web/base/admin/bodies/form.html:51
+msgid ""
+"<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n"
+"              This is probably why \"area covered\" is empty (below).<br>\n"
+"              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
+msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
+msgstr "<h2>گزارش‌ها ، آمارها و اقدامات برای</h2><h1>%s</h1>"
+
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
+msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
+msgstr "<label for=\"statuses\">نمایش</label>%sگزارش‌ها<label for=\"filter_categories\">درباره</label>%s"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:106
+msgid "<span>%s</span> saved."
+msgstr "<span>%s</span>ذخیره شد."
+
+#: templates/web/base/status/stats.html:17
+#: templates/web/zurich/admin/index.html:4
+msgid "<strong>%s</strong> live problems"
+msgstr ""
+
+#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11
+msgid "<strong>No</strong> Let me confirm my report by email"
+msgstr "<strong>نه</strong>اجازه دهید گزارشم را از طریق ایمیل تایید کنم"
+
+#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5
+msgid "<strong>No</strong> Let me confirm my report by email/text"
+msgstr "<strong>نه</strong>اجازه دهید گزارشم را از طریق ایمیل/پیام تایید کنم"
+
+#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9
+msgid "<strong>No</strong> Let me confirm my update by email"
+msgstr "<strong>نه</strong>اجازه دهید بروزرسانی‌ام را از طریق ایمیل تایید کنم"
+
+#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3
+msgid "<strong>No</strong> Let me confirm my update by email/text"
+msgstr "<strong>نه</strong>اجازه دهید بروزرسانی‌ام را از طریق ایمیل/پیام تایید کنم"
+
+#: templates/web/base/report/form/user_loggedout_password.html:4
+msgid "<strong>Yes</strong> I have a password"
+msgstr "<strong>بله</strong>دارای رمز عبور هستم"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:80
+msgid "<u>Take or choose existing photo</u>"
+msgstr "<u>عکس بگیر یا یک عکس موجود را انتخاب کنید</u>"
+
+#: templates/web/base/admin/bodies/contact-form.html:12
+msgid "A service ID (Open311 or similar)."
+msgstr ""
+
+#: templates/web/base/report/new/form_user.html:8
+msgid "About the problem"
+msgstr "درباره مشکل"
+
+#: perllib/FixMyStreet/App/Controller/Root.pm:128
+msgid "Access denied"
+msgstr "دسترسی رد شد"
+
+#: templates/web/base/auth/2fa/intro.html:20
+#: templates/web/base/auth/generate_token.html:65
+msgid "Activate two-factor authentication"
+msgstr "تایید هویت دو مرحله‌ای را فعال کنید"
+
+#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50
+msgid "Add"
+msgstr "افزودن"
+
+#: templates/web/base/admin/bodies/form.html:3
+#: templates/web/base/admin/bodies/form.html:4
+msgid ""
+"Add a <strong>body</strong> for each administrative body, such as a council or department\n"
+"          to which problem reports can be sent. You can add one or more contacts (for different\n"
+"          categories of problem) to each body."
+msgstr ""
+
+#: templates/web/base/admin/bodies/body.html:61
+msgid "Add a contact using the form below."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:140
+msgid "Add another parent category"
+msgstr "دسته‌بندی اصلی دیگری را اضافه کنید"
+
+#: templates/web/base/admin/bodies/form.html:139
+#: templates/web/base/admin/bodies/index.html:78
+#: templates/web/zurich/admin/bodies/form.html:63
+msgid "Add body"
+msgstr ""
+
+#: templates/web/base/auth/change_email.html:2
+#: templates/web/base/auth/change_email.html:7
+msgid "Add email address"
+msgstr "آدرس ایمیل وارد کنید"
+
+#: templates/web/base/admin/reportextrafields/index.html:24
+msgid "Add extra fields"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-form.html:11
+msgid "Add field"
+msgstr ""
+
+#: templates/web/base/admin/states/index.html:85
+msgid "Add fixed state"
+msgstr "افزودن وضعیت درست شد"
+
+#: templates/web/base/admin/bodies/body.html:146
+#: templates/web/zurich/admin/bodies/body.html:33
+msgid "Add new category"
+msgstr "افزودن دسته‌بندی جدید"
+
+#: templates/web/base/admin/extra-metadata-item.html:88
+msgid "Add option"
+msgstr ""
+
+#: templates/web/base/auth/change_phone.html:2
+#: templates/web/base/auth/change_phone.html:7
+msgid "Add phone number"
+msgstr "افزودن شماره تلفن"
+
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_main.html:149
+#: templates/web/base/report/_main.html:25
+#: templates/web/base/report/_main.html:36
+msgid "Add to shortlist"
+msgstr "افزودن به لیست کوتاه"
+
+#: templates/web/base/admin/users/edit.html:4
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
+msgid "Add user"
+msgstr "افزودن کاربر"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
+msgid "Add/edit problem categories"
+msgstr "دسته‌بندی‌های مشکل را ویرایش یا به آن اضافه کنید"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
+msgid "Add/edit response priorities"
+msgstr "اولویت‌های پاسخ‌دهی را اضافه یا ویرایش کنید"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
+msgid "Add/edit response templates"
+msgstr "قالب‌های پاسخ‌دهی را اضافه یا ویرایش کنید"
+
+#: templates/web/base/my/my.html:119
+msgid "Added %s"
+msgstr "اضافه شد%s"
+
+#: templates/web/base/report/_main.html:158
+msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
+msgstr ""
+
+#: templates/web/base/main_nav_items.html:31
+msgid "Admin"
+msgstr "مدیر"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
+#: templates/web/base/auth/change_password.html:51
+msgid "Again:"
+msgstr "دوباره:"
+
+#: templates/web/base/admin/timeline.html:35
+msgid "Alert %d created for %s, type %s, parameters %s / %s"
+msgstr "هشدار%dایجاد شده برای%s، نوع%s، مولفه‌های%s/%s"
+
+#: templates/web/base/admin/timeline.html:37
+msgid "Alert %d disabled (created %s)"
+msgstr "هشدار%d غیرفعال (ساخته شده%s)"
+
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
+msgid "Alert me to future updates"
+msgstr "از بروزرسانی‌های آینده آگاهم کنید"
+
+#: templates/web/base/admin/reports/edit.html:96
+msgid "Alerts:"
+msgstr "هشدارها:"
+
+#: templates/web/base/dashboard/index.html:40
+#: templates/web/base/dashboard/index.html:52
+#: templates/web/base/dashboard/index.html:65
+#: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
+#: templates/web/zurich/reports/_list-filter-status.html:2
+msgid "All"
+msgstr "همه"
+
+#: templates/web/zurich/admin/reports/index.html:1
+#: templates/web/zurich/reports/index.html:14
+msgid "All Reports"
+msgstr "همه گزارش‌ها"
+
+#: templates/web/zurich/admin/stats/index.html:47
+msgid "All Reports as CSV"
+msgstr "تمام گزارش‌ها به عنوان فایل CVS"
+
+#: templates/web/base/admin/category-multiselect.html:5
+#: templates/web/base/admin/responsepriorities/index.html:26
+#: templates/web/base/admin/templates/view.html:19
+msgid "All categories"
+msgstr "همه دسته‌بندی‌ها"
+
+#: templates/web/base/admin/reportextrafields/edit.html:26
+msgid "All cobrands"
+msgstr ""
+
+#: templates/web/base/admin/reportextrafields/edit.html:47
+msgid "All languages"
+msgstr "تمام زبان‌ها"
+
+#: templates/web/base/navigation/_all_reports.html:0
+#: templates/web/base/navigation/_all_reports.html:12
+#: templates/web/zurich/admin/index-dm.html:14
+#: templates/web/zurich/admin/stats/index.html:11
+#: templates/web/zurich/footer.html:20
+#: templates/web/zurich/nav_over_content.html:6
+msgid "All reports"
+msgstr "همه گزارش‌ها"
+
+#: templates/web/zurich/admin/stats/index.html:45
+msgid "All reports between %s and %s"
+msgstr "همه گزارش‌ها بین %s و %s"
+
+#: templates/web/base/reports/index.html:25
+msgid "All time"
+msgstr "همه زمان‌ها"
+
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "گزارش‌های ایجاد شده در این دسته‌بندی را پنهان کنید"
+
+#: templates/web/base/report/new/duplicate_suggestions.html:7
+msgid "Already been reported?"
+msgstr "در گذشته گزارش شده است؟"
+
+#: templates/web/base/my/anonymize.html:20
+msgid "Alternatively, we can hide your name on <strong>all of your reports and updates</strong> across the site:"
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:165
+msgid "Always fetch all problems"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:10
+#: templates/web/base/admin/bodies/contact-form.html:16
+msgid "An email address or service ID (Open311 or similar)."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:14
+msgid "An email address."
+msgstr "یک آدرس ایمیل."
+
+#: templates/web/base/questionnaire/index.html:33
+msgid "An update marked this problem as fixed."
+msgstr "یک بروزرسانی این مشکل را درست شده، علامت‌گذاری کرده."
+
+#: templates/web/base/admin/list_updates.html:33
+#: templates/web/base/admin/problem_row.html:20
+msgid "Anonymous"
+msgstr "ناشناس"
+
+#: templates/web/base/report/new/form_user_loggedin.html:22
+#: templates/web/base/report/update/form_user_loggedin.html:19
+msgid "Anonymous user"
+msgstr "کاربر ناشناس"
+
+#: templates/web/base/admin/reports/edit.html:148
+#: templates/web/base/admin/update_edit.html:23
+#: templates/web/base/admin/update_edit.html:96
+#: templates/web/base/report/update/moderation_diff.html:5
+msgid "Anonymous:"
+msgstr "ناشناس:"
+
+#: templates/web/base/report/new/form_user_loggedin.html:25
+#: templates/web/base/report/update/form_user_loggedin.html:16
+msgid "Another user"
+msgstr "کاربر دیگری"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:81
+msgid "Are you sure you want to cancel this upload?"
+msgstr "آیا برای لغو این بارگذاری مطمئن هستید؟"
+
+#. ("JS")
+#: templates/web/base/admin/manifesttheme/form.html:62
+#: templates/web/base/admin/reports/edit.html:85
+#: templates/web/base/admin/roles/form.html:25
+#: templates/web/base/admin/states/index.html:48
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/report/display_tools.html:7
+msgid "Are you sure?"
+msgstr "مطمئن هستید؟"
+
+#: templates/web/base/admin/bodies/body.html:21
+#: templates/web/base/admin/bodies/form.html:77
+#: templates/web/zurich/admin/bodies/form.html:36
+msgid "Area covered"
+msgstr "منطقه پوشش داده شده"
+
+#: templates/web/base/admin/users/form.html:56
+msgid "Area:"
+msgstr "منطقه:"
+
+#: templates/web/base/admin/bodies/body.html:65
+#: templates/web/base/admin/bodies/index.html:19
+msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category."
+msgstr ""
+
+#: templates/web/base/admin/users/index.html:73
+msgid "Assign selected to role:"
+msgstr ""
+
+#: templates/web/zurich/admin/reports/edit.html:203
+msgid "Assign to competent body:"
+msgstr ""
+
+#: templates/web/zurich/admin/reports/edit.html:162
+#: templates/web/zurich/admin/stats/index.html:57
+msgid "Assign to different category:"
+msgstr "اختصاص به دسته‌بندی‌ دیگر:"
+
+#: templates/web/zurich/admin/reports/edit.html:201
+msgid "Assign to external body:"
+msgstr ""
+
+#: templates/web/zurich/admin/reports/edit.html:180
+msgid "Assign to subdivision:"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
+msgid "Assign users to areas"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "همه دسته‌بندی‌ها"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:185
+msgid "Assigned to %s"
+msgstr ""
+
+#: templates/web/base/open311/index.html:76
+msgid "At most %d requests are returned in each query.  The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date."
+msgstr ""
+
+#: templates/web/base/open311/index.html:68
+msgid "At the moment only searching for and looking at reports work."
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:70
+msgid "Authorised staff users can be associated with the categories in which they operate."
+msgstr ""
+
+#: templates/web/base/admin/templates/view.html:9
+msgid "Auto Response"
+msgstr "پاسخ خودکار"
+
+#: templates/web/base/admin/templates/edit.html:66
+msgid "Auto-response:"
+msgstr "پاسخ خودکار:"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
+msgid "Automatically populate report subject/detail"
+msgstr ""
+
+#: templates/web/base/reports/index.html:112
+msgid "Average time between a problem being reported and being fixed, last 100 reports."
+msgstr ""
+
+#: templates/web/base/report/new/after_photo.html:7
+msgid "Avoid personal information and vehicle number plates"
+msgstr "از ارائه اطلاعات شخصی و پلاک خودرو خودداری کنید."
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
+#: templates/web/zurich/report/_item.html:11
+msgid "Awaiting moderation"
+msgstr "در انتظار بررسی"
+
+#. ("JS")
+#: templates/web/base/dashboard/status.html:17
+#: templates/web/base/js/translation_strings.html:45
+msgid "Back"
+msgstr "بازگشت"
+
+#: templates/web/base/report/_main.html:8
+msgid "Back to all reports"
+msgstr "بازگشت به همه گزارش‌ها"
+
+#: templates/web/base/admin/manifesttheme/index.html:9
+msgid "Background Colour"
+msgstr "رنگ پس زمینه"
+
+#: templates/web/base/admin/report_blocks.html:18
+msgid "Ban user"
+msgstr "تحریم کاربر"
+
+#: templates/web/base/admin/extra-metadata-item.html:35
+msgid "Behaviour"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
+#: templates/web/base/admin/bodies/index.html:1
+#: templates/web/base/admin/reports/edit.html:56
+#: templates/web/zurich/header.html:61
+msgid "Bodies"
+msgstr ""
+
+#: templates/web/base/admin/flagged.html:17
+#: templates/web/base/admin/index.html:69
+#: templates/web/base/admin/reports/index.html:15
+#: templates/web/base/admin/users/import.html:25
+#: templates/web/base/admin/users/import.html:48
+#: templates/web/base/admin/users/index.html:45
+msgid "Body"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
+msgid "Body:"
+msgstr ""
+
+#: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
+msgid "CSV File"
+msgstr "فایل CSV"
+
+#: templates/web/base/auth/token.html:27 templates/web/base/email_sent.html:20
+msgid "Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time."
+msgstr ""
+
+#: templates/web/base/around/_report_banner.html:5
+msgid "Can't see the map? <em>Skip this step</em>"
+msgstr "نقشه را نمی‌بینید؟ <em>این مرحله را رد کنید</em>"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: templates/web/base/admin/responsepriorities/index.html:8
+#: templates/web/base/admin/templates/view.html:7
+msgid "Categories"
+msgstr "دسته‌بندی‌ها"
+
+#: templates/web/base/admin/category-checkboxes.html:26
+#: templates/web/base/admin/category-multiselect.html:2
+#: templates/web/base/admin/responsepriorities/edit.html:31
+msgid "Categories:"
+msgstr "دسته‌بندی‌ها:"
+
+#: templates/web/base/admin/bodies/_category_field.html:12
+#: templates/web/base/admin/bodies/body.html:73
+#: templates/web/base/admin/stats/fix_rate.html:4
+#: templates/web/base/dashboard/index.html:101
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
+#: templates/web/base/report/new/category.html:23
+#: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
+#: templates/web/zurich/admin/bodies/body.html:14
+#: templates/web/zurich/admin/bodies/form.html:25
+#: templates/web/zurich/admin/stats/index.html:26
+#: templates/web/zurich/admin/stats/index.html:71
+msgid "Category"
+msgstr "دسته‌بندی‌"
+
+#: templates/web/base/dashboard/index.html:104
+msgid "Category and State"
+msgstr "دسته‌بندی و وضعیت"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
+msgid "Category changed from ‘%s’ to ‘%s’"
+msgstr "تغییر دسته‌بندی از ‘%s’ به ‘%s’ "
+
+#: 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 ""
+
+#: templates/web/base/admin/reports/edit.html:131
+#: templates/web/base/dashboard/index.html:39
+#: templates/web/base/report/update/moderation_diff.html:7
+#: templates/web/zurich/admin/bodies/contact-form.html:8
+#: templates/web/zurich/admin/report_edit-sdm.html:60
+#: templates/web/zurich/admin/reports/edit.html:88
+msgid "Category:"
+msgstr "دسته‌بندی:"
+
+#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44
+#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57
+msgid "Change"
+msgstr "تغییر"
+
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "تغییر رمز عبور"
+
+#: templates/web/base/auth/change_email.html:2
+#: templates/web/base/auth/change_email.html:3
+msgid "Change email address"
+msgstr "تغییر آدرس ایمیل"
+
+#: templates/web/base/auth/change_password.html:2
+#: templates/web/base/auth/change_password.html:5
+#: templates/web/base/my/my.html:64 templates/web/base/my/my.html:68
+msgid "Change password"
+msgstr "تغییر رمز عبور"
+
+#: templates/web/base/auth/change_phone.html:2
+#: templates/web/base/auth/change_phone.html:3
+msgid "Change phone number"
+msgstr "تغییر شماره تلفن"
+
+#: templates/web/base/auth/generate_token.html:60
+msgid "Change two-factor authentication"
+msgstr "تغییر تایید هویت دو مرحله‌ای"
+
+#: templates/web/base/admin/bodies/_category_field.html:3
+msgid ""
+"Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n"
+"                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:45
+msgid "Choose another"
+msgstr "انتخاب دیگری"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:100
+msgid "Clear offline data"
+msgstr "پاک کردن داده‌های آفلاین"
+
+#: templates/web/base/around/_report_banner.html:2
+msgid "Click map to report a problem"
+msgstr "برای گزارش مشکل روی نقشه کلیک کنید"
+
+#: templates/web/base/email_sent.html:13
+msgid "Click the link in our confirmation email to activate your alert."
+msgstr "برای فعال کردن هشدارتان روی پیوند موجود در ایمیل تأیید ما، کلیک کنید."
+
+#: templates/web/base/email_sent.html:9
+msgid "Click the link in our confirmation email to publish your problem."
+msgstr "بر روی پیوند موجود در ایمیل تایید ما کلیک کنید تا مشکل شما منتشر شود."
+
+#: templates/web/base/email_sent.html:11
+msgid "Click the link in our confirmation email to publish your update."
+msgstr "بر روی پیوند موجود در ایمیل تایید ما کلیک کنید تا بروزرسانی شما منتشر شود."
+
+#: templates/web/base/auth/token.html:23
+msgid "Click the link in our confirmation email to sign in."
+msgstr "برای ورود به سیستم، بر روی پیوند موجود در ایمیل تایید ما کلیک کنید."
+
+#: templates/web/base/auth/token.html:20
+msgid "Click the link in that email to sign in."
+msgstr "برای ورود به سیستم روی پیوند موجود در آن ایمیل کلیک کنید."
+
+#: templates/web/base/report/new/fill_in_details_form.html:7
+msgid "Click the map or drag the pin to adjust the location"
+msgstr "برای تنظیم مکان، روی نقشه کلیک کنید یا نشانگر مکان را بکشید"
+
+#: templates/web/base/report/new/duplicate_suggestions.html:6
+msgid "Close"
+msgstr "بسته"
+
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:72
+#: templates/web/base/admin/states/index.html:103
+#: templates/web/base/admin/states/index.html:27
+#: templates/web/base/admin/states/index.html:33
+#: templates/web/base/dashboard/index.html:118
+#: templates/web/zurich/admin/stats/index.html:52
+msgid "Closed"
+msgstr "بسته شد"
+
+#: templates/web/base/admin/reports/edit.html:194
+msgid "Closed to updates"
+msgstr "بروزرسانی بسته شده"
+
+#: templates/web/base/admin/reports/edit.html:38
+msgid "Co-ordinates:"
+msgstr ""
+
+#: templates/web/base/admin/list_updates.html:10
+#: templates/web/base/admin/manifesttheme/index.html:6
+#: templates/web/base/admin/reportextrafields/edit.html:24
+#: templates/web/base/admin/reportextrafields/index.html:7
+msgid "Cobrand"
+msgstr ""
+
+#: templates/web/base/admin/reports/edit.html:99
+#: templates/web/base/admin/update_edit.html:54
+msgid "Cobrand data:"
+msgstr ""
+
+#: templates/web/base/admin/reports/edit.html:98
+#: templates/web/base/admin/update_edit.html:53
+msgid "Cobrand:"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-item.html:29
+#: templates/web/base/auth/2fa/form-add.html:11
+#: templates/web/base/auth/2fa/form.html:17
+#: templates/web/base/auth/smsform.html:24
+msgid "Code"
+msgstr "کد"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:71
+msgid "Collapse map"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
+#: templates/web/base/admin/config_page.html:1
+msgid "Configuration"
+msgstr ""
+
+#: templates/web/base/admin/bodies/body.html:78
+msgid "Confirm"
+msgstr "تایید"
+
+#: templates/web/base/auth/2fa/form.html:1
+#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1
+msgid "Confirm account"
+msgstr "تایید حساب کاربری"
+
+#: templates/web/base/report/form/user_loggedout_password.html:26
+msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated."
+msgstr ""
+
+#: templates/web/base/questionnaire/creator_fixed.html:1
+#: templates/web/base/tokens/confirm_problem.html:1
+#: templates/web/base/tokens/confirm_update.html:1
+#: templates/web/zurich/tokens/confirm_problem.html:1
+#: templates/web/zurich/tokens/confirm_problem.html:3
+msgid "Confirmation"
+msgstr "تاییدیه"
+
+#: templates/web/base/admin/bodies/contact-form.html:30
+#: templates/web/base/admin/users/alerts.html:10
+#: templates/web/zurich/admin/bodies/contact-form.html:39
+#: templates/web/zurich/admin/stats/index.html:61
+msgid "Confirmed"
+msgstr "تایید شده"
+
+#: templates/web/base/admin/list_updates.html:40
+#: templates/web/base/admin/problem_row.html:36
+#: templates/web/base/admin/reports/edit.html:79
+msgid "Confirmed:"
+msgstr "تایید شده:"
+
+#. ("%s is the site name")
+#: templates/web/base/about/_sidebar.html:6
+msgid "Contact %s"
+msgstr "تماس%s"
+
+#: templates/web/base/contact/index.html:4
+#: templates/web/base/contact/index.html:5
+#: templates/web/base/contact/submit.html:1
+msgid "Contact Us"
+msgstr "تماس با ما"
+
+#: templates/web/base/contact/index.html:18
+msgid "Contact the team"
+msgstr "تماس با تیم"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:62
+#: templates/web/base/report/form/user.html:8
+msgid "Continue"
+msgstr "ادامه"
+
+#: templates/web/base/report/new/duplicate_suggestions.html:17
+msgid "Continue – report a new problem"
+msgstr "ادامه – یک مشکل جدید گزارش کنید"
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:151
+msgid "Convert location from Easting/Northing"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:723
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:753
+msgid "Could not find user"
+msgstr "کاربر یافت نشد"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:55
+msgid "Could not look up location"
+msgstr ""
+
+#: templates/web/base/admin/list_updates.html:9
+msgid "Council"
+msgstr ""
+
+#: templates/web/base/admin/bodies/body.html:1
+#: templates/web/base/admin/bodies/body.html:2
+#: templates/web/base/admin/bodies/category.html:1
+#: templates/web/base/admin/bodies/category.html:2
+#: templates/web/zurich/admin/bodies/body.html:1
+msgid "Council contacts for %s"
+msgstr ""
+
+#: templates/web/base/report/_council_sent_info.html:6
+msgid "Council ref:&nbsp;%s"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:51
+msgid "Council:"
+msgstr ""
+
+#: templates/web/zurich/admin/stats/index.html:66
+#: templates/web/zurich/admin/stats/index.html:71
+msgid "Count"
+msgstr "شمارش"
+
+#: templates/web/base/admin/manifesttheme/index.html:31
+#: templates/web/base/admin/roles/index.html:32
+#: templates/web/base/admin/states/index.html:114
+msgid "Create"
+msgstr "ایجاد"
+
+#: templates/web/base/email_sent.html:1
+msgid "Create a report"
+msgstr "ایجاد گزارش"
+
+#: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:7
+msgid "Create an account"
+msgstr "ایجاد حساب کاربری"
+
+#: templates/web/base/admin/bodies/contact-form.html:164
+#: templates/web/zurich/admin/bodies/contact-form.html:51
+msgid "Create category"
+msgstr "ایجاد دسته‌بندی"
+
+#: templates/web/base/admin/responsepriorities/edit.html:41
+#: templates/web/base/admin/responsepriorities/index.html:41
+msgid "Create priority"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
+msgid "Create reports/updates as anonymous user"
+msgstr "ایجاد گزارش‌ها/بروزرسانی‌ها به عنوان کاربر ناشناس"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
+msgid "Create reports/updates as the council"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
+msgid "Create reports/updates on a user's behalf"
+msgstr ""
+
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/zurich/admin/templates/edit.html:32
+msgid "Create template"
+msgstr "ایجاد قالب"
+
+#: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
+#: templates/web/zurich/admin/templates/view.html:10
+msgid "Created"
+msgstr "ایجاد شده"
+
+#: templates/web/base/admin/users/import.html:20
+msgid "Created %d new users"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "ایجاد شده"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "ایجاد شده"
+
+#: templates/web/base/admin/list_updates.html:39
+#: templates/web/base/admin/reports/edit.html:78
+#: templates/web/base/admin/update_edit.html:55
+#: templates/web/zurich/admin/update_edit.html:29
+msgid "Created:"
+msgstr "ایجاد شده:"
+
+#: templates/web/base/auth/change_password.html:40
+msgid "Current password:"
+msgstr "رمز عبور کنونی:"
+
+#: templates/web/base/dashboard/index.html:93
+msgid "Currently grouped by %s"
+msgstr ""
+
+#: templates/web/base/admin/bodies/index.html:9
+#: templates/web/base/admin/index.html:17
+msgid "Currently no bodies have been created."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
+msgid "Customer not contactable"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:8
+#: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
+#: templates/web/base/reports/index.html:15
+#: templates/web/base/reports/index.html:18
+msgid "Dashboard"
+msgstr "داشبورد"
+
+#: templates/web/base/auth/generate_token.html:62
+msgid "Deactivate two-factor authentication"
+msgstr "غیرفعال کردن تایید هویت دو مرحله‌ای"
+
+#: templates/web/zurich/admin/stats/index.html:56
+msgid "Dealt with by subdivision within 5 working days"
+msgstr ""
+
+#: templates/web/base/admin/responsepriorities/index.html:9
+msgid "Default"
+msgstr "پیش‌فرض"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
+msgid "Default to creating reports/updates as the council"
+msgstr ""
+
+#: templates/web/base/admin/roles/form.html:25
+#: templates/web/base/admin/users/alerts.html:15
+msgid "Delete"
+msgstr "حذف"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/zurich/admin/templates/edit.html:36
+msgid "Delete template"
+msgstr "حذف قالب"
+
+#: templates/web/base/admin/manifesttheme/form.html:62
+msgid "Delete theme"
+msgstr "حذف زمینه"
+
+#: templates/web/base/admin/bodies/contact-form.html:40
+#: templates/web/base/admin/bodies/index.html:31
+#: templates/web/zurich/admin/bodies/contact-form.html:41
+msgid "Deleted"
+msgstr "حذف شده"
+
+#: templates/web/base/report/_main.html:125
+#: templates/web/base/report/update.html:56
+msgid "Describe why you are moderating this"
+msgstr ""
+
+#: templates/web/base/admin/responsepriorities/index.html:7
+#: templates/web/zurich/admin/_index_table.html:4
+msgid "Description"
+msgstr "شرح"
+
+#: templates/web/base/admin/bodies/contact-form.html:7
+msgid "Destination"
+msgstr "مقصد"
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
+msgid "Detailed information is limited to %d characters."
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/admin/users/alerts.html:12
+#: templates/web/base/js/translation_strings.html:47
+#: templates/web/zurich/report/new/fill_in_details_form.html:45
+msgid "Details"
+msgstr "جزئیات"
+
+#: templates/web/base/admin/reports/edit.html:124
+#: templates/web/base/report/update/moderation_diff.html:3
+#: templates/web/zurich/admin/report_edit-sdm.html:29
+#: templates/web/zurich/admin/reports/edit.html:31
+#: templates/web/zurich/admin/reports/edit.html:45
+msgid "Details:"
+msgstr "جزئیات:"
+
+#: templates/web/base/dashboard/index.html:105
+msgid "Device and Site"
+msgstr ""
+
+#: templates/web/base/admin/bodies/body.html:94
+msgid "Devolved"
+msgstr ""
+
+#: templates/web/base/admin/bodies/edit-league.html:8
+msgid "Diligency prize league table"
+msgstr ""
+
+#: templates/web/base/admin/users/alerts.html:14
+msgid "Disable"
+msgstr "غیرفعال"
+
+#: templates/web/base/admin/bodies/contact-form.html:58
+#: templates/web/base/admin/extra-metadata-item.html:100
+msgid "Disable form when this category is selected"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-option.html:18
+msgid "Disable form when this option is selected"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "گزارش‌های ایجاد شده در این دسته‌بندی را پنهان کنید"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "گزارش‌های ایجاد شده در این دسته‌بندی را پنهان کنید"
+
+#: templates/web/base/admin/users/alerts.html:23
+msgid "Disabled:"
+msgstr "غیرفعال:"
+
+#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/update.html:59
+msgid "Discard changes"
+msgstr "لغو تغییرات"
+
+#: templates/web/base/admin/extra-metadata-item.html:67
+msgid "Display as"
+msgstr "نمایش به عنوان"
+
+#: templates/web/base/admin/extra-metadata-option.html:10
+msgid "Displayed label"
+msgstr "برچسب نمایش داده شده"
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:107
+msgid "Do not send email alerts on fetched comments to problem creator"
+msgstr ""
+
+#. ("%s is the site name")
+#: templates/web/base/report/form/user_loggedout.html:5
+msgid "Do you have a %s password?"
+msgstr "آیا شما %s رمز عبور دارید؟"
+
+#: templates/web/base/questionnaire/index.html:43
+msgid "Don&rsquo;t know"
+msgstr ""
+
+#: templates/web/base/contact/index.html:128
+msgid "Don't like forms?"
+msgstr ""
+
+#: templates/web/base/report/_item.html:38
+msgid "Down one"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:79
+msgid "Drag photos here or <u>browse photos</u>"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-item.html:71
+msgid "Drop-down list"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:40
+msgid "Duplicate of"
+msgstr "نسخه‌ی دوم از"
+
+#: templates/web/base/report/_inspect.html:50
+msgid "Duplicates"
+msgstr "دو نسخه‌ها"
+
+#: templates/web/base/admin/bodies/body.html:136
+msgid ""
+"Each contact for the body has a category, which is displayed to the public. \n"
+"            Different categories <strong>can have the same contact</strong> (email address).\n"
+"            This means you can add many categories even if you only have one contact for the body.\n"
+"    "
+msgstr ""
+
+#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/inspect/information.html:22
+msgid "Easting/Northing:"
+msgstr ""
+
+#: templates/web/base/admin/list_updates.html:44
+#: templates/web/base/admin/manifesttheme/index.html:22
+#: templates/web/base/admin/problem_row.html:43
+#: templates/web/base/admin/responsepriorities/index.html:34
+#: templates/web/base/admin/roles/index.html:24
+#: templates/web/base/admin/templates/view.html:31
+#: templates/web/base/admin/users/index.html:67
+#: templates/web/zurich/admin/problem_row.html:52
+#: templates/web/zurich/admin/templates/view.html:20
+msgid "Edit"
+msgstr "ویرایش"
+
+#: templates/web/base/admin/bodies/body.html:161
+#: templates/web/base/admin/index.html:43
+#: templates/web/zurich/admin/bodies/body.html:47
+msgid "Edit body details"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
+msgid "Edit other users' permissions"
+msgstr "مجوزهای سایر کاربران را ویرایش کنید"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
+msgid "Edit report category"
+msgstr "دسته‌بندی گزارش را ویرایش کنید"
+
+#: templates/web/base/report/new/form_user.html:13
+msgid "Edit report details"
+msgstr "جزئیات گزارش را ویرایش کنید"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
+msgid "Edit report priority"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
+msgid "Edit reports"
+msgstr "ویرایش گزارش‌ها"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
+msgid "Edit users' details/search for their reports"
+msgstr ""
+
+#: templates/web/base/report/update/form_user.html:8
+msgid "Edit your update"
+msgstr "بروزرسانی خود را ویرایش کنید"
+
+#: templates/web/base/admin/reports/edit.html:0
+#: templates/web/base/admin/reports/edit.html:15
+#: templates/web/base/admin/reports/edit.html:6
+#: templates/web/zurich/admin/report_edit-sdm.html:2
+#: templates/web/zurich/admin/report_edit-sdm.html:6
+#: templates/web/zurich/admin/reports/edit.html:2
+#: templates/web/zurich/admin/reports/edit.html:6
+msgid "Editing problem %d"
+msgstr "مشکل ویرایش %d"
+
+#: templates/web/base/admin/update_edit.html:1
+#: templates/web/zurich/admin/update_edit.html:1
+msgid "Editing update %d"
+msgstr ""
+
+#: templates/web/base/admin/users/edit.html:2
+msgid "Editing user %d"
+msgstr ""
+
+#: templates/web/base/admin/bodies/category.html:31
+msgid "Editor"
+msgstr "ویراستار"
+
+#: templates/web/base/admin/bodies/category.html:29
+#: templates/web/base/admin/bodies/index.html:27
+#: templates/web/base/admin/flagged.html:38
+#: templates/web/base/admin/users/import.html:24
+#: templates/web/base/admin/users/import.html:47
+#: templates/web/base/admin/users/index.html:44
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
+#: templates/web/base/report/new/duplicate_suggestions.html:33
+#: templates/web/zurich/admin/bodies/body.html:15
+#: templates/web/zurich/admin/bodies/form.html:9
+#: templates/web/zurich/auth/general.html:14
+#: templates/web/zurich/auth/general.html:37
+msgid "Email"
+msgstr "ایمیل"
+
+#: templates/web/base/alert/_list.html:70
+#: templates/web/base/auth/change_email.html:37
+#: templates/web/base/report/new/form_user_loggedin.html:39
+#: templates/web/base/report/update/form_user_loggedin.html:25
+msgid "Email address"
+msgstr "آدرس ایمیل"
+
+#: templates/web/base/report/new/form_user_loggedin.html:63
+msgid "Email address (optional)"
+msgstr "آدرس ایمیل (اختیاری)"
+
+#: templates/web/base/tokens/confirm_alert.html:6
+msgid "Email alert created"
+msgstr ""
+
+#: templates/web/base/tokens/confirm_alert.html:10
+msgid "Email alert deleted"
+msgstr ""
+
+#: templates/web/base/auth/general.html:106
+msgid "Email me a link or text me a code to sign in"
+msgstr "کد ورود را به من ایمیل یا پیامک دهید تا وارد شوم."
+
+#: templates/web/base/auth/general.html:108
+msgid "Email me a link to sign in"
+msgstr "لینک ورود را به ایمیل من ارسال کنید."
+
+#: templates/web/base/admin/users/_form_details.html:21
+msgid "Email verified:"
+msgstr "ایمیل تایید شد:"
+
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
+#: templates/web/zurich/admin/bodies/contact-form.html:23
+msgid "Email:"
+msgstr "ایمیل:"
+
+#: templates/web/base/admin/users/alerts.html:13
+msgid "Enable"
+msgstr "فعال"
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:156
+#: templates/web/base/admin/bodies/open311-form-fields.html:157
+msgid ""
+"Enable <strong>Always fetch all problems</strong> if you've enabled Open311 problem-fetching above\n"
+"                and the endpoint always returns a list of all problems. This will suppress error messages about\n"
+"                bad dates in the problems fetched."
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:143
+#: templates/web/base/admin/bodies/open311-form-fields.html:144
+msgid ""
+"Enable <strong>Convert location from Easting/Northing</strong> if you've enabled Open311 problem-fetching above\n"
+"                and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude."
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:127
+#: templates/web/base/admin/bodies/open311-form-fields.html:128
+msgid ""
+"Enable <strong>Open311 problem-fetching</strong> if you want to display reports created at\n"
+"          the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n"
+"          For more information, see \n"
+"          <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>."
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:66
+#: templates/web/base/admin/bodies/open311-form-fields.html:67
+msgid ""
+"Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n"
+"          updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n"
+"          For more information, see \n"
+"          <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>."
+msgstr ""
+
+#: templates/web/base/admin/bodies/form.html:121
+#: templates/web/base/admin/bodies/form.html:122
+msgid ""
+"Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n"
+"          different endpoint (and send method) from the body's. For example, if reports for some categories of\n"
+"          problem must be emailed, while others can be sent over Open311."
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:54
+#: templates/web/base/admin/bodies/open311-form-fields.html:55
+msgid "Enabling this will suppress the error message that is normally emitted when an update has no description"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:79
+msgid "End Date"
+msgstr "تاریخ پایان"
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:21
+msgid "Endpoint"
+msgstr "نقطه پایانی"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
+msgid "Enter a Zürich street name"
+msgstr "نام خیابانی در زوریخ را وارد کنید"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
+msgid "Enter a nearby UK postcode, or street name and area"
+msgstr "کد پستی انگلیس یا نام خیابان و منطقه‌ای در این نزدیکی را وارد کنید"
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21
+msgid "Enter a nearby postcode, or street name and area"
+msgstr "کد پستی یا نام خیابان و منطقه‌ای در نزدیکی را وارد کنید."
+
+#: templates/web/base/around/postcode_form.html:8
+msgid "Enter a nearby street name and area"
+msgstr " نام خیابان و منطقه‌ای در نزدیکی را وارد کنید"
+
+#: templates/web/base/index-steps.html:6
+msgid "Enter details of the problem"
+msgstr "جزئیات مشکل را وارد کنید"
+
+#. ("JS")
+#: templates/web/base/errors/generic.html:1
+#: templates/web/base/js/translation_strings.html:7
+#: templates/web/base/tokens/abuse.html:1
+#: templates/web/base/tokens/abuse.html:3
+#: templates/web/base/tokens/error.html:1
+#: templates/web/base/tokens/error.html:5
+msgid "Error"
+msgstr "خطا"
+
+#: templates/web/base/admin/triage/_list-filters.html:13
+#: templates/web/base/admin/triage/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
+msgid "Everything"
+msgstr "همه چیز"
+
+#: templates/web/base/admin/bodies/body.html:19
+#: templates/web/base/admin/bodies/category.html:19
+msgid "Example postcode %s"
+msgstr "نمونه‌ی کدپستی %s"
+
+#: templates/web/base/open311/index.html:86
+msgid "Examples:"
+msgstr "مثال‌ها:"
+
+#: templates/web/base/admin/report-category.html:8
+msgid "Existing category"
+msgstr "دسته‌بندی موجود"
+
+#: templates/web/base/admin/users/import.html:66
+msgid "Existing users won't be modified."
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:70
+msgid "Expand map"
+msgstr "گسترش نقشه"
+
+#: templates/web/base/report/new/form_report.html:65
+msgid "Explain what’s wrong"
+msgstr "توضیح دهید مشکل چیست"
+
+#: templates/web/base/dashboard/index.html:107
+msgid "Export as CSV"
+msgstr "گرفتن خروجی به عنوان فایل CSV"
+
+#: templates/web/base/admin/reports/edit.html:103
+msgid "External ID"
+msgstr ""
+
+#: templates/web/base/admin/bodies/form.html:88
+msgid "External URL"
+msgstr "پیوند خارجی"
+
+#: templates/web/base/admin/reports/edit.html:105
+msgid "External body"
+msgstr ""
+
+#: templates/web/base/admin/reports/edit.html:112
+#: templates/web/base/admin/templates/_external.html:10
+msgid "External status code"
+msgstr ""
+
+#: templates/web/base/admin/update_edit.html:57
+msgid "External status code:"
+msgstr ""
+
+#: templates/web/base/admin/reports/edit.html:107
+msgid "External team"
+msgstr "تیم خارجی"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
+#: templates/web/base/admin/reportextrafields/edit.html:1
+#: templates/web/base/admin/reportextrafields/index.html:1
+msgid "Extra Fields"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:146
+#: templates/web/base/admin/reports/edit.html:134
+#: templates/web/base/admin/update_edit.html:97
+#: templates/web/base/report/update/moderation_diff.html:8
+msgid "Extra data:"
+msgstr "اطلاعات اضافی:"
+
+#: templates/web/base/report/_item.html:99
+#: templates/web/base/report/inspect/_extra_details_field.html:2
+#: templates/web/base/report/new/category_extras.html:15
+msgid "Extra details"
+msgstr "جزئیات اضافی"
+
+#: templates/web/zurich/admin/bodies/contact-form.html:27
+msgid "Extra fields:"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-item.html:38
+msgid "Extra question shown to user"
+msgstr "سوال اضافی نشان داده شده به کاربر"
+
+#: templates/web/base/contact/submit.html:13
+msgid "Failed to send message"
+msgstr "پیام ارسال نشد"
+
+#: templates/web/base/admin/reportextrafields/edit.html:58
+#: templates/web/base/admin/reportextrafields/index.html:9
+msgid "Fields"
+msgstr "فضا ها"
+
+#: perllib/FixMyStreet/App/Form/ManifestTheme.pm:42
+msgid "File type not recognised. Please upload an image."
+msgstr "نوع فایل تشخیص داده نشد. لطفا یک تصویر بارگذاری کنید."
+
+#: templates/web/base/report/form/user_loggedout_password.html:21
+#: templates/web/base/report/form/user_loggedout_password.html:8
+msgid "Fill in your details manually."
+msgstr "جزئیات خود را به صورت دستی وارد کنید."
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:73
+msgid "Filter"
+msgstr "فیلتر"
+
+#: templates/web/base/questionnaire/creator_fixed.html:16
+#: templates/web/base/questionnaire/index.html:68
+msgid "First time"
+msgstr "بار اول"
+
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "عکس‌های گزارش‌های اخیر در این نزدیکی"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "گزارشات جدید"
+
+#: templates/web/base/admin/bodies/body.html:53
+msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/States.pm:35
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:179
+#: templates/web/base/admin/states/index.html:29
+#: templates/web/base/admin/stats/fix_rate.html:4
+#: templates/web/base/dashboard/index.html:119
+msgid "Fixed"
+msgstr "درست شد"
+
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:67
+msgid "Fixed - Council"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:68
+msgid "Fixed - User"
+msgstr "درست شد - کاربر"
+
+#: templates/web/base/admin/bodies/form.html:96
+#: templates/web/zurich/admin/bodies/form.html:47
+msgid "Flag as deleted"
+msgstr ""
+
+#: templates/web/base/admin/report_blocks.html:23
+msgid "Flag user"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
+#: templates/web/base/admin/users/index.html:47
+msgid "Flagged"
+msgstr ""
+
+#: templates/web/base/admin/flagged.html:1
+msgid "Flagged reports and users"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:95
+msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
+msgstr ""
+
+#: templates/web/base/admin/flagged.html:31
+msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
+msgstr ""
+
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
+msgid "Flagged:"
+msgstr ""
+
+#: templates/web/base/reports/_ward-list.html:6
+msgid "Follow a ward link to view only reports within that ward."
+msgstr ""
+
+#: templates/web/base/report/new/after_photo.html:4
+msgid "For best results include a close-up and a wide shot"
+msgstr ""
+
+#: templates/web/base/admin/bodies/form.html:73
+msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
+msgstr ""
+
+#: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:3
+msgid "Forgot password"
+msgstr "فراموش کردن رمز عبور"
+
+#: templates/web/base/auth/general.html:98
+#: templates/web/base/report/form/user_loggedout_password.html:20
+#: templates/web/base/report/form/user_loggedout_password.html:25
+msgid "Forgotten your password?"
+msgstr "رمز عبورتان را فراموش کرده‌اید؟"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
+msgid "Forwarded to external body"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
+msgid "Forwarded wish to external body"
+msgstr ""
+
+#: templates/web/base/about/_sidebar.html:4
+#: templates/web/base/about/faq-en-gb.html:1
+#: templates/web/base/about/faq-en-gb.html:5
+msgid "Frequently Asked Questions"
+msgstr "سوالات متداول"
+
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
+#: templates/web/base/contact/enquiry/index.html:1
+#: templates/web/base/contact/enquiry/index.html:3
+msgid "General Enquiry"
+msgstr "جست و جوی کلی"
+
+#: templates/web/base/auth/generate_token.html:75
+msgid "Generate token"
+msgstr ""
+
+#: templates/web/base/around/_updates.html:3
+#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/new/duplicate_suggestions.html:36
+#: templates/web/base/report/new/duplicate_suggestions.html:39
+#: templates/web/base/report/new/duplicate_suggestions.html:45
+msgid "Get updates"
+msgstr "دریافت بروزرسانی‌ها"
+
+#: templates/web/base/reports/_rss.html:12
+#: templates/web/base/reports/_rss.html:4
+msgid "Get updates of %s problems"
+msgstr "دریافت بروزرسانی‌های %s مشکلات"
+
+#: templates/web/base/reports/_rss.html:14
+#: templates/web/base/reports/_rss.html:4
+msgid "Get updates of problems in this %s"
+msgstr ""
+
+#: templates/web/base/alert/_list.html:81
+msgid "Give me an RSS feed"
+msgstr ""
+
+#: templates/web/base/admin/reportextrafields/edit.html:6
+msgid "Give this collection of fields a name. It is not shown publicly, just here in the admin."
+msgstr ""
+
+#: templates/web/base/questionnaire/completed.html:14
+msgid "Glad to hear it’s been fixed!"
+msgstr "از اینکه درست شده، خوشحالیم!"
+
+#: templates/web/base/admin/index.html:29
+#: templates/web/base/admin/index.html:37
+#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/responsepriorities/index.html:48
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
+#: templates/web/base/admin/users/index.html:32
+#: templates/web/base/around/_postcode_submit_button.html:2
+#: templates/web/base/around/_postcode_submit_button.html:5
+#: templates/web/base/reports/_list-filters-sort.html:13
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
+#: templates/web/base/reports/index.html:89
+#: templates/web/zurich/admin/stats/index.html:37
+msgid "Go"
+msgstr "برو"
+
+#: templates/web/base/admin/reports/edit.html:101
+msgid "Going to send questionnaire?"
+msgstr "می‌خواهید پرسشنامه ارسال کنید؟"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
+msgid "Grant access to the admin"
+msgstr "به مدیر اجازه دسترسی دهید"
+
+#: templates/web/base/admin/stats/index.html:7
+msgid "Graph of problem creation by status over time"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:95
+msgid "Group by %s"
+msgstr "گروه به وسیله ی %s"
+
+#: templates/web/base/dashboard/index.html:100
+msgid "Group by:"
+msgstr "گروه به وسیله‌ ی:"
+
+#: templates/web/base/questionnaire/index.html:34
+msgid "Has this problem been fixed?"
+msgstr "آیا این مشکل درست شد؟"
+
+#: templates/web/base/questionnaire/index.html:63
+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:17
+#: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
+msgid "Heatmap"
+msgstr ""
+
+#: 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 "کمک"
+
+#: templates/web/base/report/new/category_extras.html:17
+#: templates/web/base/report/new/category_extras.html:18
+msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online."
+msgstr "با ارائه جزئیات بیشتر، به حل سریعتر مشکلتان کمک<strong>%s</strong> کنید. این اطلاعات اضافی در فضای مجازی منتشر نخواهند شد."
+
+#: templates/web/base/around/on_map_list_items.html:8
+msgid "Here are some other nearby reports:"
+msgstr "برخ گزارش‌های دیگر که در این نزدیکی هستند:"
+
+#: templates/web/zurich/footer.html:11
+msgid "Hi %s"
+msgstr "سلام %s"
+
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:65
+#: templates/web/base/admin/update_edit.html:30
+#: templates/web/zurich/admin/stats/index.html:53
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Hidden"
+msgstr "پنهان"
+
+#: templates/web/base/admin/extra-metadata-item.html:46
+msgid "Hidden data in reporting form"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
+msgid "Hide all reports and updates"
+msgstr "تمام گزارش‌ها و بروزرسانی‌ها را مخفی کنید"
+
+#: templates/web/base/report/_main.html:121
+msgid "Hide entire report"
+msgstr "کل گزارش را پنهان کنید"
+
+#: templates/web/base/my/anonymize.html:1
+#: templates/web/base/my/anonymize.html:2
+msgid "Hide my name"
+msgstr "نامم را پنهان کنید"
+
+#: templates/web/base/my/anonymize.html:21
+msgid "Hide my name everywhere"
+msgstr "نامم را در همه جا پنهان کنید"
+
+#: templates/web/base/my/anonymize.html:10
+msgid "Hide my name in this update"
+msgstr "نامم را در این بروزرسانی پنهان کنید"
+
+#: templates/web/base/my/anonymize.html:16
+msgid "Hide my name on this report"
+msgstr "نامم را در این گزارش پنهان کنید"
+
+#. ("JS")
+#: templates/web/base/around/display_location.html:65
+#: templates/web/base/around/display_location.html:73
+#: templates/web/base/js/translation_strings.html:76
+msgid "Hide pins"
+msgstr "پنهان‌سازی نشانگرهای مکان"
+
+#: templates/web/base/admin/bodies/contact-form.html:52
+msgid "Hide reports made in this category"
+msgstr "گزارش‌های ایجاد شده در این دسته‌بندی را پنهان کنید"
+
+#: templates/web/base/report/update.html:18
+msgid "Hide update completely?"
+msgstr "بروزرسانی کاملا پنهان شود؟"
+
+#: templates/web/base/report/_report_meta_info.html:3
+#: templates/web/base/report/_update_state.html:16
+msgid "Hide your name?"
+msgstr "نامتان پنهان شود؟"
+
+#: templates/web/base/admin/bodies/category.html:25
+msgid "History"
+msgstr "تاریخچه"
+
+#: templates/web/base/around/display_location.html:78
+msgid "Home"
+msgstr "خانه"
+
+#: templates/web/base/index-steps.html:1
+msgid "How to report a problem"
+msgstr "چگونه یک مشکل را گزارش داد"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:46
+msgid "How to send successful reports"
+msgstr "چگونه گزارش‌های موفق ارسال کرد"
+
+#: templates/web/base/tokens/confirm_problem.html:46
+#: templates/web/base/tokens/confirm_problem.html:51
+msgid "I just reported a problem on @fixmystreet"
+msgstr "همین الان مشکلی را در fixmystreet@ گزارش کردم"
+
+#: templates/web/base/tokens/confirm_update.html:20
+#: templates/web/base/tokens/confirm_update.html:25
+msgid "I just updated a problem on @fixmystreet"
+msgstr "همین الان مشکلی را در fixmystreet@ بروزرسانی کردم"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:86
+msgid "I'm afraid we couldn't locate your problem in the database.\n"
+msgstr "متاسفانه نتوانستیم مشکل شما را در بانک اطلاعاتی پیدا کنیم.\n"
+
+#: templates/web/base/admin/flagged.html:14
+#: templates/web/base/admin/index.html:66
+#: templates/web/base/admin/list_updates.html:6
+#: templates/web/base/admin/reports/index.html:12
+#: templates/web/base/admin/users/alerts.html:8
+#: templates/web/zurich/admin/_index_table.html:3
+#: templates/web/zurich/admin/list_updates.html:24
+#: templates/web/zurich/admin/list_updates.html:38
+msgid "ID"
+msgstr "شناسه"
+
+#: templates/web/base/admin/bodies/form.html:32
+#: templates/web/base/admin/bodies/form.html:33
+msgid ""
+"Identify a <strong>parent</strong> if this body is itself part of another body.\n"
+"          For basic installations, you don't need to join bodies in this way."
+msgstr ""
+
+#: templates/web/base/auth/token.html:19
+msgid "If there's a user associated with the address you entered, we've sent a confirmation email."
+msgstr "اگر کاربری در ارتباط با آدرسی که وارد کرده اید وجود دارد، ما یک ایمیل تأیید ارسال کرده‌ایم."
+
+#: templates/web/base/admin/responsepriorities/edit.html:12
+msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-item.html:101
+msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
+msgstr "اگر علامت بزنید، فرم غیرفعال می‌شود و متن آگهی این مورد، نمایش داده می‌شود."
+
+#: templates/web/base/admin/extra-metadata-item.html:107
+msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
+msgstr ""
+
+#: templates/web/base/admin/templates/edit.html:61
+msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
+msgstr ""
+
+#: templates/web/base/admin/bodies/_category_field.html:6
+msgid ""
+"If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
+"                  the menu. Make sure you use the same category name in the bodies if you want this to happen."
+msgstr ""
+
+#: templates/web/base/contact/index.html:116
+msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
+msgstr "اگر در رابطه با یک گزارش یا به روزرسانی خاص با ما تماس می‌گیرید، لطفاً پیوند گزارش در پیام خود وارد کنید."
+
+#: templates/web/base/auth/generate_token.html:80
+msgid "If you generate a new token the existing token will no longer work."
+msgstr ""
+
+#: templates/web/base/questionnaire/completed.html:8
+msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
+msgstr "اگر اطلاعات بیشتری درباره وضعیت مشکل خود به دست آوردید، لطفاً به سایت برگردید و مشکل را بروزرسانی کنید."
+
+#: templates/web/base/report/new/duplicate_suggestions.html:25
+msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed."
+msgstr "اگر آدرس ایمیل خود را به ما اطلاع دهید، ما در صورت بروزرسانی یا رفع این مشکل به شما اطلاع خواهیم داد."
+
+#: templates/web/base/admin/responsepriorities/edit.html:28
+msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories."
+msgstr ""
+
+#: templates/web/base/admin/templates/edit.html:39
+msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories."
+msgstr "اگر می‌خواهید این قالب فقط برای دسته‌بندی‌های خاصی باشد، آنها را در اینجا انتخاب کنید. به طور پیش فرض، قالب برای همه دسته‌بندی‌ها نشان داده می‌شود."
+
+#: templates/web/base/report/new/top_message_none.html:10
+msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
+msgstr ""
+
+#: templates/web/base/admin/templates/_external.html:6
+msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
+msgstr ""
+
+#: templates/web/base/admin/templates/edit.html:46
+msgid "If you want to use this template to prefill the update field when changing a report&rsquo;s state, select the state here."
+msgstr ""
+
+#: templates/web/base/questionnaire/index.html:72
+msgid ""
+"If you wish to leave a public update on the problem, please enter it here\n"
+"(please note it will not be sent to the council)."
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:112
+#: templates/web/base/admin/bodies/open311-form-fields.html:113
+msgid ""
+"If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n"
+"              its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n"
+"              Check that your cobrand supports this feature before switching it on."
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:100
+#: templates/web/base/admin/bodies/open311-form-fields.html:99
+msgid ""
+"If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n"
+"              if you do <strong>not</strong> want that user to be notified whenever these updates are created."
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:82
+#: templates/web/base/admin/bodies/open311-form-fields.html:83
+msgid ""
+"If you've enabled Open311 update-sending above, you must identify which \n"
+"              FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n"
+"              when they are shown on the site. Enter the ID (number) of that user."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:157
+msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
+msgstr "اگر تغییراتی ایجاد کرده‌اید، در یادداشتی برای دیگر مدیران توضیح دهید که این تغییرات چه هستند"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:166
+msgid "Illegal ID"
+msgstr "شناسه نامعتبر"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:106
+msgid "Illegal feed selection"
+msgstr ""
+
+#: templates/web/base/admin/users/import.html:15
+msgid "Import users"
+msgstr "وارد کردن کاربران"
+
+#: templates/web/base/admin/flagged.html:39
+msgid "In abuse table?"
+msgstr ""
+
+#: templates/web/base/open311/index.html:80
+msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+msgid "In wards"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:35
+#: templates/web/zurich/admin/bodies/contact-form.html:40
+msgid "Inactive"
+msgstr "غیرفعال"
+
+#: templates/web/base/tokens/confirm_alert.html:11
+msgid "Inbox zero, here we come!"
+msgstr ""
+
+#: templates/web/zurich/admin/reports/edit.html:217
+msgid "Include reporter personal details"
+msgstr "مشخصات شخصی گزارشگر را درج کنید"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
+msgid "Incorrect has_photo value \"%s\""
+msgstr ""
+
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
+msgid "Inspect report"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
+msgid "Instruct contractors to fix problems"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-item.html:50
+msgid "Internal data set by Open311"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-option.html:6
+msgid "Internal key"
+msgstr "کلید داخلی"
+
+#: templates/web/zurich/admin/list_updates.html:35
+msgid "Internal notes"
+msgstr "یاداشت‌های داخلی"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
+msgid "Invalid format %s specified."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Moderate.pm:305
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
+msgid "Invalid location. New location must be covered by the same council."
+msgstr ""
+
+#: templates/web/base/contact/blurb.html:2
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
+#: templates/web/base/tokens/confirm_problem.html:31
+msgid "It’s on its way to the council right now."
+msgstr ""
+
+#: templates/web/base/admin/states/index.html:9
+#: templates/web/base/admin/states/index.html:95
+msgid "Label"
+msgstr "برچسب"
+
+#: templates/web/base/admin/bodies/_translations.html:6
+#: templates/web/base/admin/reportextrafields/edit.html:45
+msgid "Language"
+msgstr "زبان"
+
+#: templates/web/base/admin/reportextrafields/index.html:8
+msgid "Languages"
+msgstr "زبان‌ها"
+
+#: templates/web/base/reports/index.html:40
+msgid "Last 7 days"
+msgstr "7 روز پیش"
+
+#: templates/web/base/admin/bodies/body.html:75
+#: templates/web/zurich/admin/bodies/body.html:16
+msgid "Last editor"
+msgstr "آخرین ویرایشگر"
+
+#: templates/web/base/admin/reports/edit.html:92
+msgid "Last failure:"
+msgstr ""
+
+#: templates/web/base/questionnaire/index.html:55
+msgid "Last update"
+msgstr "آخرین بروزرسانی"
+
+#: templates/web/base/admin/reports/edit.html:95
+msgid "Last update:"
+msgstr "آخرین بروزرسانی:"
+
+#: templates/web/base/admin/problem_row.html:39
+msgid "Last&nbsp;update:"
+msgstr ""
+
+#: templates/web/base/report/_item.html:83
+#: templates/web/base/report/inspect/information.html:26
+#: templates/web/base/report/update/moderation_diff.html:6
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/reports/_list-filters-sort.html:10
+msgid "Least recently updated"
+msgstr "آخرین بروزرسانی‌های اخیر"
+
+#: templates/web/base/admin/bodies/form.html:128
+msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
+msgstr ""
+
+#: templates/web/base/admin/bodies/body.html:32
+msgid "List all reported problems"
+msgstr "تمام مشکلات گزارش شده را لیست کنید"
+
+#: templates/web/base/around/on_map_list_items.html:18
+msgid "Loading reports…"
+msgstr "گزارش‌ها در حال بارگیری..."
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: templates/web/base/report/new/category_wrapper.html:9
+msgid "Loading..."
+msgstr "در حال بارگیری..."
+
+#: templates/web/base/alert/choose.html:2
+#: templates/web/base/alert/choose.html:4 templates/web/base/alert/index.html:2
+#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:2
+#: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1
+#: templates/web/base/tokens/confirm_alert.html:1
+msgid "Local RSS feeds and email alerts"
+msgstr ""
+
+#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14
+#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3
+msgid "Local RSS feeds and email alerts for ‘%s’"
+msgstr ""
+
+#: templates/web/base/main_nav_items.html:16
+#: templates/web/base/main_nav_items.html:21
+msgid "Local alerts"
+msgstr ""
+
+#: templates/web/base/index-steps.html:5
+msgid "Locate the problem on a map of the area"
+msgstr "مشکل را بر روی نقشه‌ی منطقه مشخص کنید"
+
+#: templates/web/base/auth/general.html:29
+#: templates/web/base/report/form/user.html:13
+msgid "Log in with Facebook"
+msgstr "ورود توسط حساب کاربری فیس بوک"
+
+#: templates/web/base/auth/general.html:44
+#: templates/web/base/report/form/user.html:24
+msgid "Log in with Twitter"
+msgstr "ورود توسط حساب کاربری توییتر"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:87
+#: templates/web/base/report/form/user.html:27
+msgid "Log in with email"
+msgstr "ورود توسط ایمیل"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:85
+msgid "Log in with email/text"
+msgstr "ورود توسط ایمیل/پیامک"
+
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
+msgid "Log out of all sessions"
+msgstr "پایان دادن به تمامی نشست‌های دیگر"
+
+#: templates/web/base/auth/general.html:36
+#: templates/web/base/report/form/user.html:18
+msgid "Login with %s"
+msgstr "ورود با %s"
+
+#: templates/web/base/dashboard/index.html:83
+msgid "Look up"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:63
+msgid "MAP"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
+msgid "Make anonymous on all reports and updates"
+msgstr "در تمام گزارش‌ها و بروزرسانی‌ها ناشناس شوید"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
+msgid "Manage shortlist"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
+msgid "Manifest Theme"
+msgstr ""
+
+#: templates/web/base/admin/triage/_list-filters.html:32
+#: templates/web/base/reports/_list-filters-sort.html:5
+msgid "Manual order"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:65
+msgid "Map"
+msgstr "نقشه"
+
+#: templates/web/base/admin/reports/edit.html:87
+msgid "Mark as sent"
+msgstr "به عنوان ارسال شده، علامت گذاری کنید"
+
+#: templates/web/base/admin/users/form.html:93
+msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
+msgid "Markup problem details"
+msgstr ""
+
+#: templates/web/base/contact/enquiry/index.html:42
+#: templates/web/base/contact/index.html:109
+msgid "Message"
+msgstr "پیام"
+
+#: templates/web/zurich/admin/reports/edit.html:273
+msgid "Message to competent body:"
+msgstr ""
+
+#: templates/web/zurich/admin/reports/edit.html:271
+msgid "Message to external body:"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:62
+#: templates/web/base/admin/extra-metadata-option.html:21
+msgid "Message to show when form is disabled (HTML permitted)"
+msgstr ""
+
+#: templates/web/base/admin/reports/edit.html:72
+msgid "Missing bodies:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+msgid "Missing jurisdiction_id"
+msgstr ""
+
+#: templates/web/base/report/_main.html:143
+msgid "Moderate"
+msgstr "اداره کردن"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
+msgid "Moderate report details"
+msgstr ""
+
+#: templates/web/base/report/_main.html:143
+msgid "Moderate this report"
+msgstr ""
+
+#: templates/web/base/report/update.html:15
+msgid "Moderate this update"
+msgstr ""
+
+#: templates/web/base/admin/update_edit.html:92
+#: templates/web/base/report/_main.html:85
+#: templates/web/base/report/_update_state.html:19
+#: templates/web/base/report/update/moderation_meta.html:2
+msgid "Moderated by %s at %s"
+msgstr ""
+
+#: templates/web/zurich/admin/stats/index.html:55
+msgid "Moderated by division within one working day"
+msgstr ""
+
+#: templates/web/base/admin/reports/edit.html:206
+#: templates/web/base/admin/update_edit.html:86
+msgid "Moderation history"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:103
+#: templates/web/zurich/admin/stats/index.html:9
+msgid "Month"
+msgstr "ماه"
+
+#: templates/web/base/admin/triage/_list-filters.html:38
+#: templates/web/base/reports/_list-filters-sort.html:11
+msgid "Most commented"
+msgstr "بیشترین نظر داده شده"
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
+#: templates/web/base/admin/category-checkboxes.html:32
+msgid "Multiple Groups"
+msgstr ""
+
+#: templates/web/base/admin/bodies/form.html:24
+#: templates/web/base/admin/bodies/index.html:25
+#: templates/web/base/admin/flagged.html:16
+#: templates/web/base/admin/flagged.html:37
+#: templates/web/base/admin/index.html:68
+#: templates/web/base/admin/list_updates.html:7
+#: templates/web/base/admin/manifesttheme/index.html:7
+#: templates/web/base/admin/reportextrafields/edit.html:11
+#: templates/web/base/admin/reportextrafields/index.html:6
+#: templates/web/base/admin/reports/index.html:14
+#: templates/web/base/admin/responsepriorities/index.html:6
+#: templates/web/base/admin/states/index.html:108
+#: templates/web/base/admin/states/index.html:11
+#: templates/web/base/admin/users/import.html:23
+#: templates/web/base/admin/users/import.html:46
+#: templates/web/base/admin/users/index.html:43
+#: templates/web/base/report/form/user_name.html:2
+#: templates/web/zurich/admin/bodies/form.html:4
+#: templates/web/zurich/auth/general.html:43
+#: templates/web/zurich/report/new/fill_in_details_form.html:59
+msgid "Name"
+msgstr "نام"
+
+#: templates/web/base/admin/reports/edit.html:153
+#: templates/web/base/admin/update_edit.html:34
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
+#: templates/web/zurich/admin/stats/index.html:62
+msgid "Name:"
+msgstr "نام:"
+
+#: perllib/FixMyStreet/Cobrand/Rutland.pm:20
+#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:26
+msgid "Names are limited to %d characters in length."
+msgstr ""
+
+#: templates/web/base/report/inspect/information.html:40
+msgid "Navigate to this problem"
+msgstr ""
+
+#: templates/web/base/report/inspect/information.html:35
+msgid "Nearest calculated address:"
+msgstr "نزدیکترین آدرس محاسبه شده:"
+
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
+msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
+msgstr "نام نزدیکترین جاده به نشانگر مکان قرار داده شده روی نقشه (به طور خودکار با استفاده از OpenStreetMap تولید شده):%s%s"
+
+#: perllib/FixMyStreet/Geocode/Address.pm:21
+msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
+msgstr "نزدیکترین کدپستی به نشانگر مکان قرار داده شده روی نقشه (به طور خودکار تولید شده توسط): %s (%s کیلومتر دورتر)"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
+#: perllib/FixMyStreet/Geocode/Address.pm:17
+msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
+msgstr "نزدیکترین جاده به نشانگر مکان قرار داده شده روی نقشه (به طور خودکار با استفاده از Bing Maps تولید شده): %s"
+
+#: perllib/FixMyStreet/Script/Alerts.pm:363
+msgid ""
+"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
+"\n"
+msgstr ""
+"نزدیکترین جاده به نشانگر مکان قرار داده شده روی نقشه (به طور خودکار با استفاده از Bing Maps تولید شده): %s\n"
+"\n"
+
+#: templates/web/base/auth/token.html:18
+msgid "Nearly done!"
+msgstr "تقریبا آخر کار است!"
+
+#: templates/web/base/auth/token.html:22 templates/web/base/email_sent.html:5
+msgid "Nearly done! Now check your email&hellip;"
+msgstr ""
+
+#: templates/web/base/auth/2fa/form.html:8
+#: templates/web/base/auth/smsform.html:19
+msgid "Nearly done! Now check your phone&hellip;"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:54
+msgid "New body added"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
+msgid "New category contact added"
+msgstr ""
+
+#: templates/web/base/auth/change_email.html:39
+msgid "New email address:"
+msgstr "آدرس ایمیل جدید:"
+
+#: templates/web/base/admin/extra-metadata-item.html:14
+#: templates/web/base/admin/extra-metadata-item.html:20
+msgid "New field"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
+msgid "New internal note:"
+msgstr "یادداشت داخلی جدید:"
+
+#: db/alert_types.pl:18 db/alert_types.pl:22
+msgid "New local problems on FixMyStreet"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:106
+msgid "New note to DM:"
+msgstr ""
+
+#: templates/web/base/auth/change_password.html:47
+#: templates/web/base/auth/create.html:64
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
+msgid "New password:"
+msgstr "رمز عبور جدید:"
+
+#: templates/web/base/auth/change_phone.html:38
+msgid "New phone number:"
+msgstr "شماره تلفن جدید:"
+
+#: templates/web/base/admin/responsepriorities/edit.html:3
+#: templates/web/base/admin/responsepriorities/index.html:52
+msgid "New priority"
+msgstr "اولویت جدید"
+
+#: templates/web/base/admin/users/alerts.html:44
+msgid "New problems for %s"
+msgstr "مشکلات جدید برای %s"
+
+#: templates/web/base/admin/users/alerts.html:42
+msgid "New problems for <a href=\"%s\">%s</a>"
+msgstr "مشکلات جدید برای <a href=\"%s\">%s</a>"
+
+#: templates/web/base/admin/users/alerts.html:35
+msgid "New problems for <a href=\"%s\">%s</a> ward in <a href=\"%s\">%s</a>"
+msgstr ""
+
+#: templates/web/base/admin/users/alerts.html:47
+msgid "New problems for area id <a href=\"%s\">%s</a>"
+msgstr "مشکلات جدید برای ناحیه با شناسه <a href=\"%s\">%s</a>"
+
+#: templates/web/base/admin/users/alerts.html:37
+msgid "New problems for ward id %s in body id %s"
+msgstr ""
+
+#: db/alert_types.pl:38
+msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
+msgstr ""
+
+#: templates/web/base/admin/users/alerts.html:30
+msgid "New problems near <a href=\"%s\">%s,%s</a>"
+msgstr "مشکلات جدید نزدیک <a href=\"%s\">%s،%s</a>"
+
+#: db/alert_types.pl:26 db/alert_types.pl:30
+msgid "New problems near {{POSTCODE}} on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:10
+msgid "New problems on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:34
+msgid "New problems to {{COUNCIL}} on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:42
+msgid "New problems within {{NAME}}'s boundary on FixMyStreet"
+msgstr ""
+
+#: templates/web/zurich/admin/index-sdm.html:4
+msgid "New reports"
+msgstr "گزارشات جدید"
+
+#: templates/web/base/admin/states/index.html:91
+#: templates/web/base/admin/stats/questionnaire.html:24
+msgid "New state"
+msgstr "وضعیت جدید"
+
+#: templates/web/base/admin/templates/edit.html:4
+#: templates/web/base/admin/templates/view.html:37
+#: templates/web/zurich/admin/templates/edit.html:9
+#: templates/web/zurich/admin/templates/view.html:26
+msgid "New template"
+msgstr "قالب جدید"
+
+#: templates/web/base/admin/users/alerts.html:28
+msgid "New updates on report <a href=\"%s\">%s</a>"
+msgstr "بروزرسانی‌های جدید روی گزارش <a href=\"%s\">%s</a>"
+
+#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/reports/_list-filters-sort.html:7
+msgid "Newest"
+msgstr "جدیدترین"
+
+#: templates/web/base/pagination.html:10
+msgid "Next"
+msgstr ""
+
+#: templates/web/base/report/form/user.html:5
+msgid "Next:"
+msgstr "بعدی:"
+
+#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
+#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
+#: templates/web/base/admin/bodies/category.html:5
+#: templates/web/base/admin/list_updates.html:33
+#: templates/web/base/admin/list_updates.html:35
+#: templates/web/base/admin/list_updates.html:36
+#: templates/web/base/admin/problem_row.html:20
+#: templates/web/base/admin/reports/edit.html:101
+#: templates/web/base/admin/reports/edit.html:151
+#: templates/web/base/admin/update_edit.html:26
+#: templates/web/base/admin/users/alerts.html:21
+#: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
+msgid "No"
+msgstr "خیر"
+
+#: templates/web/base/admin/category-checkboxes.html:31
+msgid "No Group"
+msgstr ""
+
+#: templates/web/base/report/form/user_loggedout_password.html:7
+msgid "No account?"
+msgstr "حساب کاربری ندارید؟"
+
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
+msgid "No body"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+msgid "No council selected"
+msgstr ""
+
+#: templates/web/base/admin/bodies/edit-league.html:17
+msgid "No edits have yet been made."
+msgstr "هیچ ویرایشی هنوز انجام نشده است."
+
+#: templates/web/base/admin/flagged.html:25
+msgid "No flagged problems found."
+msgstr ""
+
+#: templates/web/base/admin/flagged.html:58
+msgid "No flagged users found."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
+msgid "No further updates"
+msgstr "بروزرسانی دیگری نیست."
+
+#: templates/web/base/report/form/user.html:33
+#: templates/web/base/report/form/user.html:40
+msgid "No personal details will be stored, and you will not receive updates about this report."
+msgstr ""
+
+#: templates/web/base/around/on_map_list_items.html:13
+msgid "No reports to show on map, here are some nearby:"
+msgstr "هیچ گزارشی برای نشان دادن روی نقشه وجود ندارد اما در نزدیکی چند گزارش وجود دارد:"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:56
+msgid "No result returned"
+msgstr ""
+
+#: templates/web/base/admin/bodies/form.html:68
+#: templates/web/base/admin/bodies/form.html:69
+msgid ""
+"No specific areas are currently available, because the <code>MAPIT_URL</code> in\n"
+"            your config file is not pointing to a live MapIt service."
+msgstr ""
+
+#: templates/web/base/report/_support.html:3
+#: templates/web/base/report/_support.html:4
+msgid "No supporters"
+msgstr ""
+
+#: templates/web/base/admin/reports/edit.html:67
+#: templates/web/base/admin/reports/edit.html:97
+#: templates/web/base/admin/reports/edit.html:99
+msgid "None"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
+msgid ""
+"Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
+"                  Authorised staff users can be associated with the area in which they operate."
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
+msgid ""
+"Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
+"                Authorised staff users can be associated with the body they represent.<br>\n"
+"                Depending on the implementation, staff users may have access to the dashboard (summary of\n"
+"                activity across their body), the ability to hide reports or set special report statuses."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:94
+msgid "Not for my subdivision"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
+#: templates/web/base/admin/stats/questionnaire.html:6
+msgid "Not reported before"
+msgstr ""
+
+#: templates/web/base/report/_main_sent_info.html:4
+msgid "Not reported to council"
+msgstr ""
+
+#: templates/web/base/admin/bodies/body.html:76
+#: templates/web/base/admin/bodies/category.html:32
+#: templates/web/zurich/admin/bodies/body.html:17
+msgid "Note"
+msgstr "یادداشت"
+
+#: templates/web/zurich/admin/bodies/contact-form.html:47
+msgid "Note:"
+msgstr "یادداشت:"
+
+#: templates/web/base/open311/index.html:65
+msgid "Note: <strong>%s</strong>"
+msgstr "یادداشت: <strong>%s</strong>"
+
+#: templates/web/zurich/admin/list_updates.html:21
+msgid "Notes from SDM to DM"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-item.html:42
+msgid "Notice shown to user"
+msgstr "اطلاعیه نشان داده شده به کاربر"
+
+#: templates/web/base/admin/extra-metadata-item.html:61
+msgid "Notice text"
+msgstr ""
+
+#: templates/web/base/reports/index.html:127
+msgid "Number of problems reported in each category, in the last 7 days."
+msgstr "تعداد مشكلات گزارش شده در هر دسته‌بندی، در 7 روز گذشته."
+
+#: templates/web/base/reports/index.html:99
+msgid "Number of problems reported in each ward, in the last 7 days."
+msgstr ""
+
+#: templates/web/base/offline/fallback.html:4
+msgid "Offline"
+msgstr "آفلاین"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:102
+msgid "Offline data cleared"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:99
+msgid "Offline update data saved"
+msgstr ""
+
+#: templates/web/base/admin/stats/questionnaire.html:24
+msgid "Old state"
+msgstr ""
+
+#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/reports/_list-filters-sort.html:8
+msgid "Oldest"
+msgstr "قدیمی‌ترین"
+
+#: perllib/FixMyStreet/SendReport/Email.pm:96
+msgid "On behalf of %s"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:46
+msgid "Only staff users will be able to add reports in this category."
+msgstr "فقط كاركنان قادر خواهند بود در این دسته‌بندی گزارش اضافه كنند."
+
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:71
+#: templates/web/base/admin/states/index.html:102
+#: templates/web/base/admin/states/index.html:25
+#: templates/web/base/admin/states/index.html:32
+#: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/dashboard/index.html:117
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Open"
+msgstr "باز"
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:47
+msgid "Open311 API Key"
+msgstr ""
+
+#: templates/web/base/open311/index.html:62
+msgid "Open311 API for the mySociety FixMyStreet server"
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:34
+msgid "Open311 Jurisdiction"
+msgstr ""
+
+#: templates/web/base/open311/index.html:72
+msgid "Open311 initiative web page"
+msgstr ""
+
+#: templates/web/base/open311/index.html:73
+msgid "Open311 specification"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-item.html:76
+msgid "Options"
+msgstr "گزینه‌ها"
+
+#: templates/web/base/report/new/fill_in_details_form.html:8
+msgid "Or <a href=\"/\">search for a different location</a>"
+msgstr "یا <a href=\"/\">مکان دیگری را جستجو کنید</a>"
+
+#: templates/web/base/report/form/private_details.html:6
+msgid "Or sign in with password to prefill this information."
+msgstr ""
+
+#: templates/web/base/alert/_list.html:80
+msgid "Or subscribe by RSS"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-item.html:55
+msgid "Order"
+msgstr "ترتیب"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
+#: perllib/FixMyStreet/Queue/Item/Report.pm:132
+#: perllib/FixMyStreet/Queue/Item/Report.pm:195
+msgid "Other"
+msgstr "دیگر"
+
+#: templates/web/base/reports/index.html:136
+msgid "Other categories"
+msgstr "دسته‌بندی‌های دیگر"
+
+#: templates/web/base/reports/index.html:107
+msgid "Other wards"
+msgstr ""
+
+#: templates/web/base/reports/index.html:120
+msgid "Overall average"
+msgstr "میانگین کلی"
+
+#: templates/web/base/admin/list_updates.html:8
+msgid "Owner"
+msgstr "مالک"
+
+#: templates/web/base/errors/page_error_404_not_found.html:1
+#: templates/web/base/errors/page_error_404_not_found.html:4
+msgid "Page Not Found"
+msgstr "صفحه پیدا نشد"
+
+#: templates/web/base/admin/bodies/form.html:39
+#: templates/web/zurich/admin/bodies/form.html:14
+msgid "Parent"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:130
+msgid "Parent categories"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:66
+msgid "Partial"
+msgstr ""
+
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
+#: templates/web/zurich/auth/general.html:20
+#: templates/web/zurich/auth/general.html:46
+msgid "Password (optional)"
+msgstr "رمز عبور (اختیاری)"
+
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
+msgid "Password change cancelled."
+msgstr "تغییر رمز عبور لغو شد."
+
+#: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:5
+msgid "Password expired"
+msgstr "رمز عبور منقضی شد"
+
+#: templates/web/base/admin/roles/index.html:6
+msgid "Permissions"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:144
+msgid "Permissions:"
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:61
+msgid "Permit blank updates"
+msgstr ""
+
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "تلفن:"
+
+#: templates/web/base/report/inspect/information.html:15
+msgid "Phone Reporter:"
+msgstr ""
+
+#: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
+#: templates/web/base/report/new/form_user_loggedin.html:34
+#: templates/web/zurich/report/new/fill_in_details_form.html:65
+msgid "Phone number"
+msgstr "شماره تلفن"
+
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
+msgid "Phone number (optional)"
+msgstr "شماره تلفن (اختیاری)"
+
+#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:30
+msgid "Phone numbers are limited to %s characters in length."
+msgstr ""
+
+#: templates/web/base/admin/users/_form_details.html:26
+msgid "Phone verified:"
+msgstr "تلفن تایید شده:"
+
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
+#: templates/web/zurich/admin/stats/index.html:60
+msgid "Phone:"
+msgstr "تلفن:"
+
+#: templates/web/base/admin/update_edit.html:95
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
+#: templates/web/base/report/new/form_report.html:41
+#: templates/web/base/report/new/form_report.html:56
+#: templates/web/base/report/new/form_report.html:58
+#: templates/web/base/report/update/moderation_diff.html:4
+#: templates/web/zurich/admin/_index_table.html:11
+#: templates/web/zurich/admin/stats/index.html:58
+#: templates/web/zurich/report/new/fill_in_details_form.html:20
+#: templates/web/zurich/report/new/fill_in_details_form.html:36
+#: templates/web/zurich/report/new/fill_in_details_form.html:38
+msgid "Photo"
+msgstr "عکس"
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:213
+msgid "Photo is required."
+msgstr "عکس الزامی است."
+
+#: templates/web/zurich/admin/bodies/contact-form.html:44
+msgid "Photo required"
+msgstr "عکس الزامی"
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:130
+msgid "Photo upload failed."
+msgstr "بارگذاری عکس انجام نشد."
+
+#: templates/web/base/report/form/photo_upload.html:4
+#: templates/web/base/report/new/form_report.html:41
+#: templates/web/zurich/report/new/fill_in_details_form.html:20
+msgid "Photos"
+msgstr "عکس‌ها"
+
+#: templates/web/base/alert/list.html:23
+msgid "Photos of recent nearby reports"
+msgstr "عکس‌های گزارش‌های اخیر در این نزدیکی"
+
+#: templates/web/base/contact/enquiry/index.html:50
+msgid "Photos/Documents"
+msgstr "عکس‌ها/سندها"
+
+#: templates/web/base/reports/index.html:76
+#: templates/web/base/reports/index.html:79
+msgid "Pick your council"
+msgstr ""
+
+#: templates/web/base/reports/index.html:66
+#: templates/web/base/reports/index.html:69
+msgid "Pick your ward"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "نشانگر مکان را روی نقشه قرار دهید"
+
+#. ("JS")
+#: templates/web/base/around/display_location.html:79
+#: templates/web/base/js/translation_strings.html:44
+msgid "Place pin on map"
+msgstr "نشانگر مکان را روی نقشه قرار دهید"
+
+#: perllib/FixMyStreet/App/Controller/Moderate.pm:143
+msgid "Please <a href=\"#%s\">check their changes</a> and resolve any differences."
+msgstr ""
+
+#: templates/web/base/report/new/notes.html:5
+msgid "Please be polite, concise and to the point."
+msgstr ""
+
+#: templates/web/base/auth/change_password.html:26
+#: templates/web/base/auth/change_password.html:31
+msgid "Please check the passwords and try again"
+msgstr "لطفا رمز عبور را بررسی کنید و دوباره امتحان کنید"
+
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:9
+#: templates/web/base/auth/change_email.html:24
+#: templates/web/base/auth/change_email.html:27
+msgid "Please check your email address is correct"
+msgstr "لطفا بررسی کنید که آدرس ایمیلتان درست باشد"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:7
+msgid "Please check your phone number is correct"
+msgstr "لطفا بررسی کنید که شماره تلفنتان درست باشد"
+
+#. ("JS")
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
+#: templates/web/base/js/translation_strings.html:21
+msgid "Please choose a category"
+msgstr "لطفا یک دسته‌بندی انتخاب کنید"
+
+#: perllib/FixMyStreet/App/Controller/Auth.pm:497
+msgid "Please choose a less commonly-used password"
+msgstr "لطفا یک رمز عبور کمتر رایج استفاده کنید"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
+#: templates/web/base/admin/bodies/body.html:12
+#: templates/web/base/admin/bodies/index.html:4
+#: templates/web/base/admin/templates/edit.html:13
+msgid "Please correct the errors below"
+msgstr "لطفا خطاهای زیر را تصحیح کنید"
+
+#: templates/web/base/contact/blurb.html:6
+msgid ""
+"Please do <strong>not</strong> report problems through this form; messages go to\n"
+"the team behind this site, not a council. To report a problem,\n"
+"please <a href=\"/\">go to the front page</a> and follow the instructions."
+msgstr ""
+
+#: templates/web/base/report/new/notes.html:6
+msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
+msgstr ""
+
+#. ("JS")
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
+#: templates/web/base/js/translation_strings.html:6
+msgid "Please enter a message"
+msgstr "لطفا یک پیام وارد کنید"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:4
+msgid "Please enter a mobile number"
+msgstr "لطفا یک شماره تلفن همراه وارد کنید"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
+msgid "Please enter a name"
+msgstr "لطفا یک نام وارد کنید"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
+msgid "Please enter a name for this body"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/auth/change_password.html:26
+#: templates/web/base/auth/change_password.html:29
+#: templates/web/base/js/translation_strings.html:31
+msgid "Please enter a password"
+msgstr "لطفا یک رمز عبور وارد کنید"
+
+#. ("JS")
+#: perllib/FixMyStreet/App/Controller/Contact.pm:147
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
+#: templates/web/base/js/translation_strings.html:9
+msgid "Please enter a subject"
+msgstr "لطفاً موضوع را وارد کنید"
+
+#. ("JS")
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
+#: templates/web/base/js/translation_strings.html:24
+#: templates/web/base/js/translation_strings.html:28
+msgid "Please enter a valid email"
+msgstr "لطفا یک ایمیل معتبر وارد کنید"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:355
+#: perllib/FixMyStreet/App/Controller/Contact.pm:157
+msgid "Please enter a valid email address"
+msgstr "لطفا یک آدرس ایمیل معتبر وارد کنید"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
+msgid "Please enter a valid email or phone number"
+msgstr "لطفا یک ایمیل معتبر یا شماره تلفن وارد کنید"
+
+#. ("JS")
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
+#: templates/web/base/js/translation_strings.html:14
+msgid "Please enter some details"
+msgstr "لطفاً جزئیات را وارد کنید"
+
+#. ("JS")
+#: perllib/FixMyStreet/App/Controller/Contact.pm:146
+#: perllib/FixMyStreet/DB/Result/User.pm:259
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:8
+#: templates/web/base/auth/change_email.html:24
+#: templates/web/base/auth/change_email.html:26
+#: templates/web/base/js/translation_strings.html:23
+#: templates/web/base/js/translation_strings.html:27
+msgid "Please enter your email"
+msgstr "لطفا ایمیل خودتان را وارد کنید"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:40
+msgid "Please enter your first name"
+msgstr "لطفا نام کوچک خود را وارد کنید"
+
+#. ("JS")
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
+#: templates/web/base/js/translation_strings.html:19
+msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:35
+msgid "Please enter your full name."
+msgstr "لطفا نام کامل خود را وارد کنید"
+
+#. ("JS")
+#: perllib/FixMyStreet/App/Controller/Contact.pm:145
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: templates/web/base/js/translation_strings.html:18
+msgid "Please enter your name"
+msgstr "لطفا نامتان را وارد کنید"
+
+#. ("JS")
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:6
+#: templates/web/base/js/translation_strings.html:37
+msgid "Please enter your phone number"
+msgstr "لطفا شماره تلفن خود را وارد کنید"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:41
+msgid "Please enter your second name"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:39
+msgid "Please enter your title"
+msgstr "لطفا عنوان خود را وارد کنید"
+
+#: templates/web/base/auth/sign_out.html:5
+#: templates/web/zurich/auth/sign_out.html:5
+msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>."
+msgstr ""
+
+#: templates/web/base/report/new/fill_in_details_text.html:2
+#: templates/web/base/report/new/fill_in_details_text.html:8
+msgid "Please fill in details of the problem below."
+msgstr "لطفا جزئیات مشکل زیر را پر کنید."
+
+#: templates/web/base/report/new/sidebar.html:7
+#: templates/web/zurich/report/new/sidebar.html:14
+msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
+msgstr "لطفا فرم زیر را با جزئیات مشکل پر کنید و مکان مشکل را به دقت تا جای ممکن در جعبه جزئیات توضیح دهید."
+
+#: templates/web/base/auth/2fa/form.html:9
+msgid "Please generate a two-factor code and enter it below:"
+msgstr "لطفا کدی دومرحله‌ای ایجاد کنید و آن را در قسمت زیر وارد کنید:"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+msgid "Please indicate whether you'd like to receive another questionnaire"
+msgstr "لطفا مشخص کنید که آیا می‌خواهید پرسشنامه دیگری دریافت کنید یا خیر"
+
+#. ("JS")
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
+#: templates/web/base/js/translation_strings.html:11
+msgid "Please make sure you are not including an email address"
+msgstr "لطفا اطمینان حاصل کنید که آدرس ایمیلی را قرار نداده‌اید"
+
+#. ("JS")
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
+#: templates/web/base/js/translation_strings.html:34
+msgid "Please make sure your password is at least %d characters long"
+msgstr ""
+
+#: templates/web/base/report/updates-sidebar-notes.html:2
+msgid "Please note that updates are not sent to the council."
+msgstr ""
+
+#: templates/web/base/report/new/oauth_email_form.html:4
+msgid "Please note your report has <strong>not yet been sent</strong>."
+msgstr "لطفا توجه داشته باشید که گزارش شما <strong> هنوز ارسال نشده است</strong>."
+
+#: templates/web/base/report/new/fill_in_details_form.html:23
+#: templates/web/zurich/report/new/sidebar.html:5
+msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit."
+msgstr "لطفا توجه داشته باشید که گزارش شما <strong> هنوز ارسال نشده است</strong>. یک دسته‌بندی انتخاب کنید و اطلاعات بیشتر را در قسمت زیر وارد کنید و سپس ارسال کنید."
+
+#: templates/web/base/report/display.html:34
+msgid "Please note your update has <strong>not yet been posted</strong>."
+msgstr "لطفا توجه داشته باشید که بروزرسانی شما  هنوز منتشر نشده است <strong>."
+
+#: templates/web/base/report/new/notes.html:1
+#: templates/web/zurich/report/new/notes.html:1
+msgid "Please note:"
+msgstr "لطفا توجه کنید:"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
+msgid "Please provide a duplicate ID or public update for this report."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
+msgid "Please provide a public update for this report."
+msgstr "لطفا یک بروزرسانی عمومی، برای این گزارش ارائه دهید."
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
+msgid "Please provide some explanation as to why you're reopening this report"
+msgstr "لطفا در مورد علت بازگشایی این گزارش، توضیح دهید"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
+msgid "Please provide some text as well as a photo"
+msgstr "لطفا متن و همچنین عکس ارائه کنید"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+msgid "Please say whether you've ever reported a problem to your council before"
+msgstr ""
+
+#: templates/web/base/auth/2fa/form-add.html:1
+msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
+msgstr "لطفا این تصویر را با نرم‌افزارتان اسکن کرده، یا کد متنی را در نرم‌افزار وارد کنید، سپس یک کد جدید یک بار مصرف تولید کرده و در بخش زیر آن وارد کنید:"
+
+#: templates/web/zurich/admin/reports/edit.html:198
+msgid "Please select a body."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:86
+msgid "Please select the feed you want"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:134
+msgid "Please select the type of alert you want"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
+msgid "Please state whether or not the problem has been fixed"
+msgstr "لطفا بیان کنید که آیا مشکل درست شده یا خیر"
+
+#. ("JS")
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
+#: templates/web/base/js/translation_strings.html:82
+msgid "Please upload an image only"
+msgstr "لطفا فقط تصویر بارگذاری کنید"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
+msgid "Please verify at least one of email/phone"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:148
+msgid "Please write a message"
+msgstr "لطفا یک پیام بنویسید"
+
+#: templates/web/base/alert/index.html:11
+msgid "Postcode or street name and area"
+msgstr "کدپستی یا نام خیابان و منطقه"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+msgid "Posted anonymously at %s"
+msgstr "ارسال شده به طور ناشناس در %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
+msgid "Posted by %s at %s"
+msgstr "ارسال شده توسط %s در %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "ارسال شده توسط <strong>%s</strong>  (%s) در %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "ارسال شده توسط <strong>%s</strong> در %s"
+
+#: templates/web/base/front/footer-marketing.html:6
+msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:41
+msgid "Prevent new reports from using this category, <em>and</em> also remove it from map filters."
+msgstr "مانع استفاده گزارش‌های جدید از این دسته‌بندی شوید <em> و </em>همچنین آن را از فیلترهای نقشه حذف کنید."
+
+#: templates/web/base/admin/bodies/contact-form.html:36
+msgid "Prevent new reports from using this category, but keep it available in map filters."
+msgstr "مانع استفاده گزارش‌های جدید از این دسته‌بندی شوید اما آن را در فیلترهای نقشه نگهدارید."
+
+#: templates/web/base/admin/extra-metadata-item.html:95
+msgid "Prevent user from submitting the form until this field is filled in."
+msgstr "تا زمان پر شدن این قسمت، مانع ارسال فرم کاربر شوید."
+
+#: templates/web/base/pagination.html:4
+msgid "Previous"
+msgstr "قبلی"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
+msgid "Priorities"
+msgstr ""
+
+#: templates/web/base/report/_item.html:95
+#: templates/web/base/report/inspect/extra_details.html:2
+msgid "Priority"
+msgstr ""
+
+#: templates/web/base/main_nav_items.html:27
+msgid "Privacy"
+msgstr "حریم خصوصی"
+
+#: templates/web/base/about/_sidebar.html:5
+#: templates/web/base/about/privacy.html:1
+#: templates/web/base/about/privacy.html:2
+msgid "Privacy and cookies"
+msgstr "حریم خصوصی و کوکی‌ها"
+
+#: templates/web/base/admin/bodies/body.html:90
+#: templates/web/base/admin/reports/edit.html:170
+#: templates/web/base/report/inspect/information.html:3
+#: templates/web/base/report/new/form_user_loggedin.html:73
+msgid "Private"
+msgstr "خصوصی"
+
+#: templates/web/base/reports/_list-filter-status.html:28
+msgid "Private only"
+msgstr ""
+
+#: templates/web/base/maps/pin.html:14
+msgid "Problem"
+msgstr "مشکل"
+
+#: templates/web/base/admin/timeline.html:22
+msgid "Problem %d created"
+msgstr "مشکل %d ایجاد شد"
+
+#: templates/web/base/admin/users/log.html:54
+msgid "Problem %s added to shortlist"
+msgstr "مشکل %sبه لیست کوتاه اضافه شد"
+
+#: templates/web/base/admin/timeline.html:24
+msgid "Problem %s confirmed"
+msgstr "مشکل %sتایید شد"
+
+#: templates/web/base/admin/users/log.html:47
+msgid "Problem %s created"
+msgstr "مشکل %sایجاد شد"
+
+#: templates/web/base/admin/users/log.html:49
+msgid "Problem %s created on behalf of %s"
+msgstr "مشکل %s از طرف %s ایجاد شد "
+
+#: templates/web/base/admin/users/log.html:56
+msgid "Problem %s removed from shortlist"
+msgstr "مشکل %sاز لیست کوتاه حذف شد"
+
+#: templates/web/base/admin/timeline.html:26
+msgid "Problem %s sent to council %s"
+msgstr ""
+
+#: 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:247
+msgid "Problem marked as open."
+msgstr ""
+
+#: templates/web/base/admin/stats/questionnaire.html:21
+msgid "Problem state change based on survey results"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
+#: templates/web/base/admin/flagged.html:10
+msgid "Problems"
+msgstr "مشکلات"
+
+#: templates/web/base/alert/_list.html:22
+msgid "Problems in an area"
+msgstr "مشکلات در یک منطقه"
+
+#: templates/web/base/report/display_tools.html:24
+msgid "Problems nearby"
+msgstr "مشکلات در نزدیکی"
+
+#: templates/web/base/report/display_tools.html:22
+msgid "Problems on the map"
+msgstr "مشکلات بر روی نقشه"
+
+#: db/alert_types.pl:14
+msgid "Problems recently reported fixed on FixMyStreet"
+msgstr ""
+
+#: templates/web/base/alert/_list_rss_local.html:7
+msgid "Problems within %.1fkm of %s"
+msgstr "مشکلات در فاصله %.1f کیلومتری %s"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
+msgid "Problems within %s"
+msgstr "مشکلات در فاصله %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
+msgid "Problems within %s ward"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
+msgid "Problems within %s ward, %s"
+msgstr ""
+
+#. ("First %s is the body name, second %s the site name")
+#: templates/web/base/admin/triage/index.html:0
+#: templates/web/base/admin/triage/index.html:14
+#: templates/web/base/reports/body.html:0
+#: templates/web/base/reports/body.html:27
+msgid "Problems within %s, %s"
+msgstr "مشکلات در فاصله %s، %s"
+
+#: templates/web/base/admin/reports/edit.html:75
+msgid "Property address:"
+msgstr "آدرس ملک:"
+
+#: templates/web/base/admin/extra-metadata-item.html:106
+msgid "Protect from Open311 changes"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
+msgid "Protect this category's name and group(s) from Open311 changes"
+msgstr ""
+
+#: 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 "بروزرسانی ارائه دهید"
+
+#: templates/web/base/report/update/form_user_loggedin.html:12
+msgid "Provide update as"
+msgstr "ارائه به روز رسانی به عنوان"
+
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
+msgstr "ایجاد رمز عبوراختیاری است، اما انجام این کار به شما امکان می‌دهد تا مشکلات آینده و  بروزرسانی‌ها را آسان‌تر گزارش دهید و گزارش‌های خود را مدیریت کنید."
+
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
+msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
+msgstr "ایجاد رمز عبوراختیاری است، اما انجام این کار به شما امکان می‌دهد تا مشکلات و بروزرسانی‌ها را آسان‌تر گزارش دهید و گزارش‌های خود را مدیریت کنید."
+
+#: templates/web/base/report/new/form_public_councils_text.html:2
+msgid "Public details"
+msgstr "جزئیات عمومی"
+
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
+msgid "Public response:"
+msgstr ""
+
+#: templates/web/base/report/inspect/public_update.html:13
+msgid "Public update:"
+msgstr "بروزرسانی عمومی:"
+
+#: templates/web/zurich/admin/reports/edit.html:110
+#: templates/web/zurich/admin/stats/index.html:59
+msgid "Publish photo"
+msgstr "تصویر عمومی"
+
+#: templates/web/base/admin/extra-metadata-item.html:60
+msgid "Question text"
+msgstr ""
+
+#: templates/web/base/questionnaire/completed.html:1
+#: templates/web/base/questionnaire/index.html:0
+#: templates/web/base/questionnaire/index.html:14
+#: templates/web/base/questionnaire/index.html:5
+msgid "Questionnaire"
+msgstr "پرسشنامه"
+
+#: templates/web/base/admin/timeline.html:30
+msgid "Questionnaire %d answered for problem %d, %s to %s"
+msgstr ""
+
+#: templates/web/base/admin/timeline.html:28
+msgid "Questionnaire %d sent for problem %d"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205
+#: templates/web/base/report/updates.html:20
+msgid "Questionnaire filled in by problem reporter"
+msgstr "پرسشنامه تکمیل شده توسط گزارشگر مشکل"
+
+#: templates/web/base/alert/_list.html:35
+#: templates/web/base/alert/_list.html:53
+#: templates/web/base/alert/_list_rss_local.html:3
+#: templates/web/base/alert/updates.html:9
+#: templates/web/base/around/display_location.html:3
+#: templates/web/base/report/display_tools.html:44
+msgid "RSS feed"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
+msgid "RSS feed for %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+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:296 perllib/FixMyStreet/Cobrand/UK.pm:310
+msgid "RSS feed of %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
+msgid "RSS feed of %s, within %s ward"
+msgstr ""
+
+#: templates/web/base/alert/_list_rss_local.html:3
+msgid "RSS feed of nearby problems"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
+msgid "RSS feed of problems within %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
+msgid "RSS feed of problems within %s ward"
+msgstr ""
+
+#: templates/web/base/around/display_location.html:3
+#: templates/web/base/around/display_location.html:4
+msgid "RSS feed of recent local problems"
+msgstr ""
+
+#: templates/web/base/alert/updates.html:9
+#: templates/web/base/report/display_tools.html:44
+msgid "RSS feed of updates to this problem"
+msgstr ""
+
+#: templates/web/base/report/_item_expandable.html:57
+msgid "Read less"
+msgstr ""
+
+#: templates/web/base/report/_item_expandable.html:57
+msgid "Read more"
+msgstr "بیشتر بخوانید"
+
+#: templates/web/base/admin/reports/edit.html:93
+msgid "Reason:"
+msgstr ""
+
+#: templates/web/base/alert/updates.html:14
+#: templates/web/base/report/display_tools.html:46
+msgid "Receive email when updates are left on this problem."
+msgstr " وقتی روی این مشکل بروزرسانی‌هایی ثبت می‌شود، ایمیل دریافت کنید."
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
+msgid "Received by %s moments later"
+msgstr ""
+
+#. ("%s is the site name")
+#: templates/web/base/around/display_location.html:0
+#: templates/web/base/around/display_location.html:35
+msgid "Recent local problems, %s"
+msgstr "مشکلات محلی اخیر، %s"
+
+#: templates/web/base/front/recent.html:11
+msgid "Recently reported problems"
+msgstr "مشکلات اخیرا گزارش شده"
+
+#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/reports/_list-filters-sort.html:9
+msgid "Recently updated"
+msgstr "اخیرا بروزرسانی شده"
+
+#: templates/web/base/report/inspect/information.html:52
+msgid "Reject report"
+msgstr "گزارش رد شده"
+
+#: templates/web/zurich/report/new/notes.html:5
+msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
+msgid "Remove account details"
+msgstr "حذف جزئیات حساب کاربری"
+
+#: templates/web/base/admin/extra-metadata-item.html:23
+msgid "Remove field"
+msgstr ""
+
+#: templates/web/base/admin/report_blocks.html:23
+msgid "Remove flag"
+msgstr ""
+
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
+#: templates/web/base/report/_main.html:147
+#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:32
+msgid "Remove from shortlist"
+msgstr ""
+
+#: templates/web/base/report/display_tools.html:7
+msgid "Remove from site"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-option.html:26
+msgid "Remove option"
+msgstr "حذف گزینه"
+
+#: templates/web/base/admin/reports/edit.html:187
+#: templates/web/base/admin/update_edit.html:74
+#: templates/web/zurich/admin/update_edit.html:35
+msgid "Remove photo (can't be undone!)"
+msgstr "حذف عکس ( غیرقابل بازگشت)"
+
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "مجوزهای سایر کاربران را ویرایش کنید"
+
+#: templates/web/base/auth/generate_token.html:75
+msgid "Replace token"
+msgstr ""
+
+#: templates/web/zurich/admin/reports/edit.html:232
+msgid "Reply to user:"
+msgstr "پاسخ به کاربر:"
+
+#: templates/web/base/header_logo.html:2
+msgid "Report"
+msgstr "گزارش"
+
+#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/inspect/information.html:7
+msgid "Report ID:"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/js/translation_strings.html:91
+#: 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:92
+#: templates/web/base/navigation/_report.html:4
+msgid "Report a problem here"
+msgstr "ثبت گزارش در اینجا"
+
+#: templates/web/base/report/display_tools.html:11
+msgid "Report abuse"
+msgstr ""
+
+#: templates/web/base/report/form/user.html:32
+#: templates/web/base/report/form/user.html:39
+msgid "Report anonymously"
+msgstr "ثبت به صورت ناشناس"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:93
+#: templates/web/base/navigation/_report.html:2
+#: templates/web/base/tokens/confirm_problem.html:40
+msgid "Report another problem here"
+msgstr ""
+
+#: templates/web/base/report/new/form_user_loggedin.html:18
+msgid "Report as"
+msgstr "گزارش به عنوان"
+
+#: templates/web/base/report/new/form_public_councils_text.html:3
+msgid "Report details"
+msgstr "جزئیات گزارش"
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:306
+msgid "Report on %s"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:63
+msgid "Report state:"
+msgstr "وضعیت گزارش:"
+
+#: templates/web/base/report/new/form_heading.html:1
+msgid "Report your problem"
+msgstr "مشکلتان را گزارش کنید"
+
+#: templates/web/base/header_opengraph.html:4
+msgid "Report, view, and discuss local street-related problems."
+msgstr ""
+
+#: templates/web/base/around/intro.html:1
+#: templates/web/zurich/around/intro.html:1
+msgid "Report, view, or discuss local problems"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
+#: templates/web/base/contact/index.html:64
+msgid "Reported anonymously at %s"
+msgstr ""
+
+#: templates/web/base/admin/stats/questionnaire.html:5
+#: templates/web/base/questionnaire/creator_fixed.html:14
+#: templates/web/base/questionnaire/index.html:66
+msgid "Reported before"
+msgstr "قبلا گزارش شده است"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
+#: templates/web/base/contact/index.html:66
+msgid "Reported by %s at %s"
+msgstr "گزار شده توسط %s در %s"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:48
+#: templates/web/zurich/admin/reports/edit.html:76
+msgid "Reported by:"
+msgstr "گزارش شده توسط"
+
+#: templates/web/zurich/report/_main.html:4
+msgid "Reported in the %s category"
+msgstr "گزارش شده در %sدسته‌بندی"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+msgid "Reported in the %s category anonymously at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+msgid "Reported in the %s category by %s at %s"
+msgstr "گزارش شده در %sدسته‌بندی %s در %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+msgid "Reported via %s anonymously at %s"
+msgstr "گزارش شده از طریق %s ناشناس در %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+msgid "Reported via %s by %s at %s"
+msgstr "گزارش شده از طریق %s توسط %sدر %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+msgid "Reported via %s in the %s category anonymously at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
+msgid "Reported via %s in the %s category by %s at %s"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:38
+#: templates/web/zurich/admin/reports/edit.html:57
+msgid "Reported:"
+msgstr "گزارش شده:"
+
+#. ("JS")
+#: templates/web/base/around/index.html:3
+#: templates/web/base/around/lookup_by_ref.html:3
+#: templates/web/base/js/translation_strings.html:61
+#: templates/web/base/report/new/fill_in_details.html:0
+#: templates/web/base/report/new/fill_in_details.html:10
+#: templates/web/zurich/report/new/fill_in_details_form.html:4
+msgid "Reporting a problem"
+msgstr "گزارش یک مشکل"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
+#: templates/web/base/around/tabbed_lists.html:3
+#: templates/web/base/dashboard/index.html:108
+msgid "Reports"
+msgstr "گزارش‌ها"
+
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
+#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
+#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
+msgid "Reports are limited to %s characters in length. Please shorten your report"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:15
+msgid "Reports are limited to {0} characters in length. Please shorten your report"
+msgstr ""
+
+#: templates/web/zurich/admin/index-sdm.html:7
+msgid "Reports awaiting approval"
+msgstr "گزارش‌های در انتظار تایید"
+
+#: templates/web/base/alert/_list.html:48
+msgid "Reports by destination"
+msgstr ""
+
+#: templates/web/base/alert/_list.html:15
+msgid "Reports near %s are sent to different councils, depending on the type of problem."
+msgstr ""
+
+#: templates/web/zurich/admin/index-sdm.html:10
+msgid "Reports published"
+msgstr "گزارش‌های منتشر شده"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:103
+msgid "Reports saved offline."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
+msgid "Reports sent to %s"
+msgstr "گزارش‌های ارسالی به %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
+msgid "Reports sent to %s, within %s ward"
+msgstr ""
+
+#: templates/web/base/admin/index.html:62
+msgid "Reports waiting to be sent"
+msgstr "گزارش‌های در انتظار ارسال"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:42
+msgid "Reposition if needed, then hit Continue"
+msgstr "اگر لازم است مکان را تغییر دهید، سپس گزینه ادامه را بزنید."
+
+#: templates/web/base/admin/extra-metadata-item.html:94
+msgid "Required"
+msgstr "ضروری"
+
+#: templates/web/base/admin/reports/edit.html:85
+msgid "Resend report"
+msgstr "باز ارسال گزارش"
+
+#: templates/web/base/auth/create.html:72
+msgid "Reset"
+msgstr "تنظیم مجدد"
+
+#: templates/web/base/admin/responsepriorities/index.html:1
+msgid "Response Priorities"
+msgstr ""
+
+#: templates/web/base/admin/responsepriorities/edit.html:1
+msgid "Response Priority for %s"
+msgstr ""
+
+#: templates/web/base/admin/templates/edit.html:1
+msgid "Response Template for %s"
+msgstr ""
+
+#: templates/web/base/admin/templates/index.html:1
+msgid "Response Templates"
+msgstr ""
+
+#: templates/web/base/admin/templates/view.html:1
+#: templates/web/zurich/admin/templates/edit.html:1
+#: templates/web/zurich/admin/templates/edit.html:4
+#: templates/web/zurich/admin/templates/view.html:1
+#: templates/web/zurich/admin/templates/view.html:3
+msgid "Response Templates for %s"
+msgstr ""
+
+#: templates/web/base/report/update.html:44
+msgid "Revert to original"
+msgstr "بازگشت به اصل"
+
+#: templates/web/base/report/_main.html:111
+msgid "Revert to original text"
+msgstr "بازگشت به متن اصلی"
+
+#: templates/web/base/report/_main.html:60
+msgid "Revert to original title"
+msgstr "بازگشت به عنوان اصلی"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:59
+msgid "Right place?"
+msgstr "مکان درسته؟"
+
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
+msgid "Road operator for this named road (derived from road reference number and type): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
+msgid "Road operator for this named road (from OpenStreetMap): %s"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
+#: templates/web/base/admin/roles/index.html:5
+msgid "Role"
+msgstr "نقش"
+
+#: templates/web/base/admin/users/form.html:128
+#: templates/web/base/admin/users/index.html:29
+msgid "Role:"
+msgstr "نقش:"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: templates/web/base/admin/roles/form.html:1
+#: templates/web/base/admin/roles/index.html:1
+msgid "Roles"
+msgstr "نقش‌ها"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
+#: templates/web/base/admin/update_edit.html:71
+#: templates/web/zurich/admin/reports/edit.html:106
+msgid "Rotate Left"
+msgstr "چرخش به چپ"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/update_edit.html:72
+#: templates/web/zurich/admin/reports/edit.html:107
+msgid "Rotate Right"
+msgstr "چرخش به راست"
+
+#: templates/web/zurich/admin/reports/edit.html:98
+msgid "Rotating this photo will discard unsaved changes to the report."
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:66
+#: templates/web/base/maps/google-ol.html:2
+msgid "Satellite"
+msgstr "ماهواره"
+
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
+msgid "Save + close as duplicate"
+msgstr "ذخیره + بستن به عنوان نسخه دوم"
+
+#: templates/web/base/admin/bodies/contact-form.html:164
+#: templates/web/base/admin/manifesttheme/form.html:58
+#: templates/web/base/admin/reportextrafields/edit.html:64
+#: templates/web/base/admin/responsepriorities/edit.html:41
+#: templates/web/base/admin/roles/form.html:21
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
+#: templates/web/base/report/_main.html:129
+#: templates/web/base/report/update.html:58
+#: templates/web/zurich/admin/bodies/contact-form.html:51
+#: templates/web/zurich/admin/templates/edit.html:32
+msgid "Save changes"
+msgstr "ذخیره تغییرات"
+
+#: templates/web/base/admin/reportextrafields/edit.html:64
+msgid "Save new fields"
+msgstr ""
+
+#: templates/web/base/report/inspect/public_update.html:7
+msgid "Save with a public update"
+msgstr ""
+
+#. ("This is followed by a progress count, e.g. 3/5", "JS")
+#: templates/web/base/js/translation_strings.html:104
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
+#: templates/web/base/admin/reports/index.html:1
+msgid "Search Reports"
+msgstr "جستجوی گزارش‌ها"
+
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/users/index.html:1
+msgid "Search Users"
+msgstr "جستجوی کاربرها"
+
+#: templates/web/base/alert/index.html:10
+msgid "Search for location of email alert or RSS feed"
+msgstr ""
+
+#: templates/web/zurich/header.html:79
+msgid "Search reports"
+msgstr "جستجوی گزارش‌ها"
+
+#: templates/web/base/admin/reports/index.html:5
+#: templates/web/base/admin/users/index.html:26
+#: templates/web/zurich/admin/reports/index.html:5
+msgid "Search:"
+msgstr "جستجو:"
+
+#: templates/web/base/admin/reports/index.html:27
+#: templates/web/base/around/lookup_by_ref.html:18
+msgid "Searching found no reports."
+msgstr "در جستجو گزارشی یافت نشد"
+
+#: templates/web/base/admin/users/index.html:95
+msgid "Searching found no users."
+msgstr "در جستجو کاربری یافت نشد"
+
+#: templates/web/base/auth/generate_token.html:2
+#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/my/my.html:75
+msgid "Security"
+msgstr "امنیت"
+
+#: templates/web/base/report/form/private_details.html:14
+#: templates/web/base/report/new/councils_text_private.html:8
+msgid "See our privacy policy"
+msgstr "سیاست حفظ حریم خصوصی ما را ببینید"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
+msgid "See user detail for reports created as the council"
+msgstr ""
+
+#: templates/web/base/admin/bodies/form.html:41
+#: templates/web/zurich/admin/bodies/form.html:16
+msgid "Select a body"
+msgstr ""
+
+#: templates/web/base/admin/bodies/form.html:78
+#: templates/web/base/admin/users/form.html:58
+#: templates/web/zurich/admin/bodies/form.html:37
+msgid "Select an area"
+msgstr "یک ناحیه انتخاب کنید"
+
+#: templates/web/base/admin/responsepriorities/edit.html:19
+msgid "Select if this is the default priority"
+msgstr ""
+
+#: templates/web/base/reports/_ward-list.html:7
+msgid "Select multiple wards to view only reports within those wards."
+msgstr ""
+
+#: templates/web/base/reports/_ward-list.html:8
+msgid "Select multiple wards?"
+msgstr ""
+
+#: templates/web/base/admin/category-checkboxes.html:4
+msgid "Select:"
+msgstr "انتخاب:"
+
+#: templates/web/base/contact/enquiry/index.html:76
+#: templates/web/base/contact/index.html:120
+msgid "Send"
+msgstr "ارسال"
+
+#: templates/web/base/admin/reports/edit.html:91
+msgid "Send Fail Count:"
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:121
+msgid "Send extended Open311 statuses with service request updates"
+msgstr ""
+
+#: templates/web/base/admin/users/_form_details.html:17
+msgid "Send login email"
+msgstr "ارسال ایمیل ورود"
+
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:5
+msgid "Sending a confirmation text failed: \"%s\""
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
+msgid "Sent report back"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
+msgid "Sent to %s %s later"
+msgstr "ارسال به %s%sبعدا"
+
+#: templates/web/base/admin/reports/edit.html:80
+msgid "Sent:"
+msgstr "ارسال:"
+
+#: templates/web/base/admin/reports/edit.html:97
+#: templates/web/zurich/admin/stats/index.html:66
+msgid "Service:"
+msgstr "سرویس:"
+
+#: templates/web/base/auth/change_password.html:2
+#: templates/web/base/auth/change_password.html:4
+#: templates/web/base/my/my.html:70
+msgid "Set password"
+msgstr "تعیین رمز عبور"
+
+#: templates/web/base/report/inspect/information.html:44
+msgid "Set to my current location"
+msgstr "بر روی مکان فعلی من تنظیم شود"
+
+#: templates/web/base/report/display_tools.html:18
+msgid "Share"
+msgstr "اشتراک گذاری"
+
+#: templates/web/base/admin/manifesttheme/index.html:8
+msgid "Short Name"
+msgstr ""
+
+#: 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 ""
+
+#: templates/web/base/reports/body.html:34
+msgid "Shortlist all visible"
+msgstr ""
+
+#: templates/web/base/report/_main.html:147
+#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:31
+#: templates/web/base/reports/_list-filter-status.html:24
+msgid "Shortlisted"
+msgstr ""
+
+#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_main.html:157
+msgid "Shortlisted by %s"
+msgstr ""
+
+#: templates/web/base/report/update.html:23
+msgid "Show Photo?"
+msgstr "نمایش عکس؟"
+
+#: templates/web/base/questionnaire/index.html:56
+msgid "Show all updates"
+msgstr "تمام بروزرسانی‌ها را نشان دهید"
+
+#: templates/web/base/report/_show_name_label.html:3
+msgid "Show my name publicly"
+msgstr "نام مرا به صورت عمومی نشان دهید"
+
+#: templates/web/base/report/update.html:20
+msgid "Show name publicly?"
+msgstr "نام را به صورت عمومی نشان دهید؟"
+
+#: templates/web/base/pagination.html:12
+msgid "Show older"
+msgstr ""
+
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
+msgid "Show older reports"
+msgstr "نمایش گزارش‌های قدیمی‌تر"
+
+#: templates/web/base/report/_main.html:95
+msgid "Show photo"
+msgstr "نمایش عکس"
+
+#. ("JS")
+#: templates/web/base/around/display_location.html:63
+#: templates/web/base/around/display_location.html:71
+#: templates/web/base/js/translation_strings.html:75
+msgid "Show pins"
+msgstr "نمایش نشانگرها"
+
+#: templates/web/base/report/_main.html:72
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
+#: templates/web/base/reports/index.html:64
+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:6
+#: templates/web/zurich/auth/general.html:23
+#: templates/web/zurich/auth/general.html:8
+msgid "Sign in"
+msgstr "ورود"
+
+#: templates/web/base/auth/create.html:26
+msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated."
+msgstr "به جای آن از طریق ایمیل وارد شوید و یک رمز ورود جدید ارائه دهید. وقتی روی پیوند در ایمیل خود کلیک می‌کنید، رمز عبور شما بروز می‌شود."
+
+#: templates/web/base/auth/create.html:24
+msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated."
+msgstr "به جای آن از طریق ایمیل یا پیامک وارد شوید و یک رمز ورود جدید ارائه دهید. وقتی روی پیوند در ایمیل خود کلیک یا کد تایید پیامک را وارد می‌کنید، رمز عبور شما بروز می‌شود."
+
+#: templates/web/base/auth/general.html:1
+#: templates/web/zurich/auth/general.html:1
+msgid "Sign in or create an account"
+msgstr "ورود یا ایجاد حساب کاربری"
+
+#: templates/web/base/auth/general.html:87
+msgid "Sign in with a password"
+msgstr "ورود با رمز عبور"
+
+#: templates/web/base/auth/create.html:31
+#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:77
+#: templates/web/zurich/auth/sign_out.html:1
+msgid "Sign out"
+msgstr "خروج"
+
+#: templates/web/base/report/new/fill_in_details_text.html:2
+msgid "Some categories may require additional information."
+msgstr "بعضی از دسته‌بندی‌ها ممکن است نیازمند اطلاعات اضافی باشند."
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:40
+#: templates/web/base/admin/bodies/open311-form-fields.html:41
+msgid ""
+"Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n"
+"          sent from your FixMyStreet installation."
+msgstr ""
+
+#: templates/web/base/alert/index.html:22
+msgid "Some photos of recent reports"
+msgstr "برخی عکس‌های گزارش‌های اخیر"
+
+#. ('Optional comment for translator')
+#: perllib/FixMyStreet/Template.pm:66
+msgid "Some text to localize"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Moderate.pm:142
+msgid "Someone has moderated this report since you started."
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:78
+msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
+msgstr "متاسفیم! شما به حد مجاز تعداد تصویر قابل پیوست رسیده‌اید. "
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
+msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
+msgstr ""
+
+#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8
+msgid "Sorry, that wasn&rsquo;t a valid link"
+msgstr ""
+
+#: templates/web/base/auth/2fa/form-add.html:7
+#: templates/web/base/auth/2fa/form.html:5
+#: templates/web/base/auth/smsform.html:16
+msgid "Sorry, that wasn&rsquo;t the correct code"
+msgstr ""
+
+#: templates/web/base/tokens/abuse.html:5
+msgid "Sorry, there has been an error confirming your problem."
+msgstr "متاسفیم، در تایید مشکل شما خطایی روی داد."
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
+msgid "Sorry, we could not find that location."
+msgstr "متاسفیم، نتوانستیم مکان را پیدا کنیم."
+
+#: templates/web/base/auth/general.html:16
+#: templates/web/base/report/display.html:29
+#: templates/web/base/report/new/fill_in_details_form.html:26
+msgid "Sorry, we could not log you in. Please fill in the form below."
+msgstr "متاسفیم، نتوانستیم شما را وارد سیستم کنیم. لطفا فرم زیر را پر کنید."
+
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
+#: perllib/FixMyStreet/Geocode/Google.pm:56
+#: perllib/FixMyStreet/Geocode/Zurich.pm:119
+msgid "Sorry, we could not parse that location. Please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
+#: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
+#: perllib/FixMyStreet/PhotoStorage.pm:63
+msgid "Sorry, we couldn't save your file(s), please try again."
+msgstr "متاسفیم، نتوانستیم فایل(های) شما را ذخیره کنیم، لطفا دوباره امتحان کنید."
+
+#: templates/web/base/offline/fallback.html:6
+msgid "Sorry, we don’t have a good enough connection to fetch that page."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Root.pm:129
+msgid "Sorry, you don't have permission to do that."
+msgstr "متاسفانه شما اجازه انجام این کار را ندارید."
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
+msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
+msgstr ""
+
+#: templates/web/base/admin/triage/_list-filters.html:29
+#: templates/web/base/reports/_list-filters-sort.html:2
+msgid "Sort by"
+msgstr "چیدمان براساس"
+
+#: templates/web/base/admin/bodies/contact-form.html:45
+msgid "Staff only"
+msgstr "فقط کارمندان"
+
+#: templates/web/base/admin/users/form.html:36
+msgid "Staff users have permission to log in to the admin."
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:40
+msgid "Staff:"
+msgstr "کارمندان:"
+
+#: templates/web/base/debug_header.html:3
+msgid "Staging site"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:75
+msgid "Start Date"
+msgstr "تاریخ شروع"
+
+#: templates/web/base/admin/bodies/body.html:74
+#: templates/web/base/admin/bodies/category.html:30
+#: templates/web/base/admin/bodies/contact-form.html:22
+#: templates/web/base/admin/flagged.html:18
+#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/list_updates.html:11
+#: templates/web/base/admin/reports/index.html:16
+#: templates/web/base/admin/templates/edit.html:50
+#: templates/web/base/admin/templates/view.html:8
+#: templates/web/base/admin/users/alerts.html:11
+#: templates/web/base/dashboard/index.html:102
+#: templates/web/base/report/_inspect.html:34
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
+#: templates/web/zurich/admin/bodies/contact-form.html:37
+msgid "State"
+msgstr "وضعیت"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
+msgid "State and external status code cannot be used simultaneously."
+msgstr ""
+
+#: perllib/FixMyStreet/Script/Alerts.pm:107
+#: templates/web/base/report/_update_state.html:7
+#: templates/web/base/report/updates.html:21
+msgid "State changed to:"
+msgstr "وضعیت تغییر داده شد به:"
+
+#: templates/web/base/admin/reports/edit.html:128
+#: templates/web/base/admin/update_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:63
+#: templates/web/zurich/admin/reports/edit.html:143
+#: templates/web/zurich/admin/reports/edit.html:91
+#: templates/web/zurich/admin/update_edit.html:17
+msgid "State:"
+msgstr "وضعیت:"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
+#: templates/web/base/admin/states/index.html:1
+msgid "States"
+msgstr "وضعیت‌ها"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/admin/stats/index.html:1
+#: templates/web/base/admin/stats/state.html:1
+#: templates/web/zurich/admin/stats/index.html:1
+#: templates/web/zurich/header.html:70
+msgid "Stats"
+msgstr "آمار"
+
+#: templates/web/zurich/admin/_index_table.html:5
+msgid "Status"
+msgstr "موقعیت"
+
+#: templates/web/base/report/_update_state.html:22
+#: templates/web/base/report/updates.html:25
+msgid "Still open, via questionnaire"
+msgstr "هنوز از طریق پرسشنامه باز است"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:27
+#: templates/web/zurich/admin/reports/edit.html:28
+msgid "Street View"
+msgstr "نمای واقعی خیابان"
+
+#: templates/web/base/report/new/category.html:35
+msgid "Subcategory"
+msgstr "زیر مجموعه"
+
+#: templates/web/zurich/admin/_index_table.html:9
+msgid "Subdivision/Body"
+msgstr ""
+
+#: templates/web/base/contact/enquiry/index.html:30
+#: templates/web/base/contact/index.html:103
+msgid "Subject"
+msgstr "موضوع"
+
+#: templates/web/base/admin/reports/edit.html:122
+#: templates/web/base/report/update/moderation_diff.html:2
+#: templates/web/zurich/admin/reports/edit.html:41
+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/submit.html:1
+#: templates/web/base/report/form/submit.html:2
+#: templates/web/base/report/form/user_loggedout_password.html:29
+#: templates/web/base/report/new/form_report.html:21
+#: templates/web/base/report/new/report_import.html:103
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
+msgid "Submit"
+msgstr "ارسال"
+
+#: templates/web/base/admin/reports/edit.html:198
+#: templates/web/base/admin/reports/edit.html:25
+#: templates/web/base/admin/update_edit.html:82
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
+msgid "Submit changes"
+msgstr "ارسال تغییرات"
+
+#: templates/web/base/questionnaire/index.html:89
+msgid "Submit questionnaire"
+msgstr "ارسال پرسشنامه‌ها"
+
+#: templates/web/zurich/admin/_index_table.html:5
+#: templates/web/zurich/admin/index-dm.html:8
+msgid "Submitted"
+msgstr "ارسال شد"
+
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
+msgid "Subscribe"
+msgstr "مشترک شدن"
+
+#: templates/web/base/alert/_list.html:68
+msgid "Subscribe by email"
+msgstr "مشترک شدن توسط ایمیل"
+
+#: templates/web/base/admin/users/alerts.html:22
+msgid "Subscribed:"
+msgstr "مشترک شد:"
+
+#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:34
+msgid "Summaries are limited to %d characters in length. Please shorten your summary"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
+#: perllib/FixMyStreet/Cobrand/Rutland.pm:16
+msgid "Summaries are limited to %s characters in length. Please shorten your summary"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:10
+msgid "Summaries are limited to {0} characters in length. Please shorten your summary"
+msgstr ""
+
+#: templates/web/base/report/new/form_title.html:1
+msgid "Summarise the problem"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:156
+msgid "Summarise your changes"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
+#: templates/web/base/admin/bodies/index.html:29
+#: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
+#: templates/web/base/status/index.html:3
+#: templates/web/zurich/admin/index-dm.html:1
+#: templates/web/zurich/admin/index-sdm.html:1
+#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
+#: templates/web/zurich/header.html:46
+msgid "Summary"
+msgstr "خلاصه"
+
+#: templates/web/zurich/reports/index.html:0
+#: templates/web/zurich/reports/index.html:6
+msgid "Summary reports"
+msgstr "خلاصه‌ی گزارش‌ها"
+
+#: templates/web/base/admin/stats/index.html:15
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
+msgid "Summary statistics"
+msgstr "خلاصه‌ی آمارها"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
+msgid "Superuser:"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:111
+msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
+msgstr ""
+
+#: templates/web/base/admin/stats/index.html:12
+#: templates/web/base/admin/stats/questionnaire.html:1
+msgid "Survey Results"
+msgstr "نتایج نظرسنجی"
+
+#: templates/web/base/report/form/private_details.html:2
+#: templates/web/base/report/form/user.html:5
+msgid "Tell us about you"
+msgstr "درباره خودتان بگویید"
+
+#: templates/web/zurich/admin/templates/edit.html:7
+msgid "Template &laquo;%s&raquo;"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
+#: templates/web/base/develop/email_list.html:3
+#: templates/web/zurich/header.html:74
+msgid "Templates"
+msgstr "قالب‌ها"
+
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "آخرین بروزرسانی‌های اخیر"
+
+#: templates/web/zurich/admin/templates/view.html:9
+msgid "Text"
+msgstr "متن"
+
+#: templates/web/base/admin/extra-metadata-item.html:69
+msgid "Text field"
+msgstr ""
+
+#: templates/web/base/admin/bodies/body.html:33
+msgid "Text only version"
+msgstr ""
+
+#: templates/web/base/admin/templates/edit.html:35
+#: templates/web/base/admin/update_edit.html:20
+#: templates/web/base/admin/update_edit.html:94
+#: templates/web/zurich/admin/templates/edit.html:27
+#: templates/web/zurich/admin/update_edit.html:12
+msgid "Text:"
+msgstr "متن:"
+
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "متن"
+
+#: templates/web/base/tokens/confirm_problem.html:29
+msgid "Thank you for reporting this issue!"
+msgstr "برای گزارش این مشکل، ممنونیم!"
+
+#: templates/web/base/tokens/error.html:6
+msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
+msgstr ""
+
+#: templates/web/base/tokens/confirm_update.html:16
+msgid "Thank you for updating this issue!"
+msgstr "برای بروز کردن این مشکل، متشکریم!"
+
+#: templates/web/base/contact/submit.html:6
+msgid "Thank you for your enquiry"
+msgstr "با تشکر از استعلام شما"
+
+#: templates/web/base/questionnaire/completed.html:5
+msgid "Thank you for your feedback"
+msgstr "با تشکر از  بازخورد شما"
+
+#: templates/web/base/around/_error_multiple.html:26
+msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:"
+msgstr "بابت بارگذاری عکستان متشکریم. اکنون باید مکان مشکل را بیابیم، بنابراین لطفا نام خیابان یا کدپستی را در قسمت بالا &nbsp; وارد کنید:"
+
+#: templates/web/base/questionnaire/creator_fixed.html:9
+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 ""
+
+#: templates/web/base/auth/2fa/intro.html:11
+#: templates/web/base/auth/generate_token.html:34
+msgid "Thanks, you have successfully enabled two-factor authentication on your account."
+msgstr "با تشکر، شما تایید هویت دو مرحله‌ای را با موفقیت فعال کرده‌اید."
+
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145
+msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
+msgstr "به نظر می‌رسد تصویر به درستی بارگذاری نشده است (%s)، لطفا دوباره امتحان کنید."
+
+#: perllib/FixMyStreet/App/Controller/Council.pm:105
+msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
+msgid "That location does not appear to be in the UK; please try again."
+msgstr "به نظر می‌رسد که این مکان در انگلیس نمی‌باشد. لطفا دوباره تلاش کنید."
+
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
+msgid "That postcode was not recognised, sorry."
+msgstr " کد پستی شناسایی نشد، متاسفیم."
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
+msgid "That problem has been marked as sent."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
+msgid "That problem will now be resent."
+msgstr " این مشکل اکنون دوباره ارسال خواهد شد."
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
+msgid "That report has been removed from FixMyStreet."
+msgstr "این گزارش از FixMyStreet حذف شده است."
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:581
+msgid "That user has been logged out."
+msgstr "کاربر از سیستم خارج شده است."
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:588
+msgid "That user has been made anonymous on all reports and updates."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:637
+msgid "That user’s personal details have been removed."
+msgstr "اطلاعات شخصی این کاربر حذف شده است."
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:602
+msgid "That user’s reports and updates have been hidden."
+msgstr "گزارش‌ها و بروزرسانی‌های این کاربر پنهان شده است."
+
+#: templates/web/base/admin/manifesttheme/form.html:20
+msgid "The <strong>background colour</strong> defines a placeholder background colour for the application splash screen before it has loaded.  Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</code></strong>."
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:14
+#: templates/web/base/admin/bodies/open311-form-fields.html:15
+msgid ""
+"The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n"
+"            when sending reports to this body."
+msgstr ""
+
+#: templates/web/base/admin/manifesttheme/form.html:49
+msgid "The <strong>icons</strong> are used when the application is installed to the user's home screen. Icons must be <strong>square</strong>, with <strong>512x512</strong>px and <strong>192x192</strong>px being the most common sizes."
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:27
+#: templates/web/base/admin/bodies/open311-form-fields.html:28
+msgid ""
+"The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n"
+"          than one. If the body is running its own endpoint, you can usually leave this blank."
+msgstr ""
+
+#: templates/web/base/admin/manifesttheme/form.html:5
+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:108
+#: templates/web/base/admin/bodies/contact-form.html:109
+#: templates/web/base/admin/bodies/form.html:101
+#: templates/web/base/admin/bodies/form.html:102
+msgid ""
+"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>."
+msgstr ""
+
+#: templates/web/base/admin/manifesttheme/form.html:10
+msgid "The <strong>short name</strong> is a string that represents the name of the web application displayed to the user if there is not enough space to display name (e.g., as a label for an icon on the phone home screen)."
+msgstr ""
+
+#: templates/web/base/admin/manifesttheme/form.html:15
+msgid "The <strong>theme colour</strong> defines the default theme colour for the application. This sometimes affects how the OS displays the site (e.g., on Android's task switcher, the theme colour surrounds the site). Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</code></strong>."
+msgstr ""
+
+#: templates/web/base/open311/index.html:82
+msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification."
+msgstr ""
+
+#: templates/web/base/admin/bodies/form.html:17
+#: templates/web/base/admin/bodies/form.html:18
+msgid ""
+"The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n"
+"          and may be displayed publically."
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-item.html:30
+msgid "The code used to store this field value in the database."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:31
+msgid "The contact has been confirmed as correct."
+msgstr ""
+
+#: templates/web/base/report/new/fill_in_details_text.html:2
+#: templates/web/base/report/new/fill_in_details_text.html:3
+msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
+msgstr ""
+
+#: templates/web/base/admin/bodies/edit-league.html:3
+#: templates/web/base/admin/bodies/edit-league.html:4
+msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45
+#: perllib/FixMyStreet/App/Controller/Reports.pm:58
+msgid "The error was: %s"
+msgstr "خطا این بود: %s"
+
+#: templates/web/base/open311/index.html:78
+msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
+msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
+msgstr ""
+
+#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27
+#: db/alert_types.pl:31
+msgid "The latest local problems reported by users"
+msgstr "آخرین مشکلات محلی گزارش شده توسط کاربرها"
+
+#: db/alert_types.pl:35
+msgid "The latest problems for {{COUNCIL}} reported by users"
+msgstr ""
+
+#: db/alert_types.pl:39
+msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr ""
+
+#: db/alert_types.pl:11
+msgid "The latest problems reported by users"
+msgstr "آخرین مشکلات گزارش شده توسط کاربرها"
+
+#: db/alert_types.pl:15
+msgid "The latest problems reported fixed by users"
+msgstr "آخرین مشکلاتی که توسط کاربرها، گزارش درست شدنشان ثبت شده"
+
+#: db/alert_types.pl:43
+msgid "The latest problems within {{NAME}}'s boundary reported by users"
+msgstr ""
+
+#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9
+msgid "The link might have expired, or maybe you didn&rsquo;t quite copy and paste it correctly."
+msgstr ""
+
+#: templates/web/base/admin/bodies/form.html:66
+msgid "The list of available areas is being provided by the MapIt service at %s."
+msgstr ""
+
+#: templates/web/base/auth/change_password.html:26
+#: templates/web/base/auth/change_password.html:30
+msgid "The passwords do not match"
+msgstr "رمز عبورها با هم مطابقت ندارند"
+
+#: templates/web/base/errors/page_error_404_not_found.html:9
+msgid "The requested URL '%s' was not found on this server"
+msgstr "URL درخواستی '%s' در این سرور یافت نشد"
+
+#: templates/web/base/admin/roles/form.html:5
+msgid "The role's <strong>name</strong> is used to refer to this group of permissions elsewhere in the admin."
+msgstr ""
+
+#: templates/web/base/admin/users/import.html:68
+msgid "The uploaded CSV file must contain a header row, and records can have the following fields:"
+msgstr ""
+
+#: 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 ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:627
+msgid "The user has been sent a login email"
+msgstr ""
+
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
+msgid ""
+"The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
+"                Names are not necessarily unique."
+msgstr ""
+
+#: templates/web/base/admin/manifesttheme/form.html:1
+msgid "Theme"
+msgstr ""
+
+#: templates/web/base/admin/manifesttheme/index.html:10
+msgid "Theme Colour"
+msgstr ""
+
+#: templates/web/base/admin/manifesttheme/index.html:1
+msgid "Themes"
+msgstr ""
+
+#: templates/web/base/around/_on_map_empty.html:1
+#: templates/web/base/dashboard/heatmap-list.html:21
+#: templates/web/base/my/_problem-list.html:8
+#: templates/web/base/reports/_problem-list.html:13
+msgid "There are no reports to show."
+msgstr "گزارشی برای نشان دادن وجود ندارد"
+
+#: templates/web/base/report/new/duplicate_suggestions.html:10
+msgid "There are similar problems nearby that we’re already aware of, is one of them yours?"
+msgstr "مشکلات مشابه در این نزدیکی هستند که ما از قبل از آنها آگاه هستیم، آیا یکی از آنها مال شماست؟"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:98
+msgid "There is already a template with that title."
+msgstr "در حال حاضر قالبی با آن عنوان وجود دارد."
+
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
+msgid "There is already an auto-response template for this category/state."
+msgstr "در حال حاضر یک قالب پاسخ خودکار برای این دسته‌بندی/وضعیت وجود دارد."
+
+#: perllib/FixMyStreet/App/Controller/Reports.pm:55
+msgid "There was a problem showing the All Reports page. Please try again later."
+msgstr "هنگام نمایش صفحه‌ی همه گزارش‌ها مشکلی رخ داد. لطفا بعدا دوباره امتحان کنید."
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:170
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44
+msgid "There was a problem showing this page. Please try again later."
+msgstr "هنگام نمایش این صفحه‌ مشکلی رخ داد. لطفا بعدا دوباره امتحان کنید."
+
+#: templates/web/base/auth/_username_error.html:0
+#: templates/web/base/auth/_username_error.html:14
+msgid "There was a problem with your login information."
+msgstr "در رابطه با اطلاعات ورود به سیستم مشکلی وجود دارد."
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
+msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
+msgstr "مشکلی در رابطه با اطلاعات ورود شما وجود داشته. اگر نمی‌توانید رمز عبورتان را به یاد بیاورید، یا رمز عبور ندارید؛ لطفا بخش «نه» فرم را پر کنید."
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
+msgid "There was a problem with your update. Please try again."
+msgstr "در رابطه با بروزرسانی شما مشکلی وجود داشته. لطفا دوباره امتحان کنید."
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:174
+msgid "There were problems with your report. Please see below."
+msgstr "در رابطه با گزارش شما مشکلی وجود داشته. لطفا پایین را ببینید."
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
+msgid "There were problems with your update. Please see below."
+msgstr "در رابطه با بروزرسانی شما مشکلی وجود داشته. لطفا پایین را ببینید."
+
+#: templates/web/base/admin/category-checkboxes.html:33
+msgid "These categories appear in more than one group:"
+msgstr "این دسته‌بندی‌ها در بیش از یک گروه ظاهر می‌شوند:"
+
+#: templates/web/base/report/form/private_details.html:13
+#: templates/web/base/report/new/councils_text_private.html:6
+msgid "These details will be sent to the council, but will never be shown online without your permission."
+msgstr ""
+
+#: templates/web/base/report/new/councils_text_private.html:4
+msgid "These details will never be shown online without your permission."
+msgstr "این جزئیات بدون اجازه شما هرگز به صورت آنلاین نشان داده نمی‌شوند."
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:3
+#: templates/web/base/admin/bodies/open311-form-fields.html:4
+msgid ""
+"These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n"
+"           <strong>You don't need to set them if the Send Method is email.</strong>.\n"
+"           For more information on Open311, see \n"
+"           <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n"
+"           "
+msgstr ""
+
+#: templates/web/base/admin/users/import.html:43
+msgid "These users weren't updated."
+msgstr "این کاربران بروز نشده‌اند."
+
+#: templates/web/base/report/new/councils_text.html:4
+#: templates/web/base/report/new/councils_text.html:5
+msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
+msgstr "مطابق با سیاست <a href=\"%s\">حفظ حریم خصوصی</a> ما، این موارد برای مشاهده دیگران بصورت آنلاین منتشر می‌شوند."
+
+#: templates/web/base/report/new/councils_text_all.html:6
+#: templates/web/base/report/new/councils_text_all.html:9
+msgid "These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
+msgstr "مطابق با <a href=\"%s\">سیاست حریم خصوصی</a> ما، این موارد ارسال می‌شود به <strong>%s</strong> و همچنین برای مشاهده دیگران به صورت آنلاین منتشر می‌شوند."
+
+#: templates/web/base/report/new/councils_text_all.html:16
+#: templates/web/base/report/new/councils_text_all.html:6
+msgid "These will be sent to <strong>%s</strong> but not published online."
+msgstr "این موارد ارسال می‌شود به <strong>%s</strong>اما به صورت آنلاین منتشر نمی‌شوند."
+
+#: templates/web/base/open311/index.html:69
+msgid "This API implementation is work in progress and not yet stabilized.  It will change without warnings in the future."
+msgstr ""
+
+#: templates/web/base/admin/bodies/body.html:49
+msgid ""
+"This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n"
+"            Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n"
+"            Currently, users <strong>cannot report problems to this body</strong>."
+msgstr ""
+
+#: templates/web/base/admin/bodies/body.html:59
+msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>."
+msgstr ""
+
+#: templates/web/base/admin/bodies/form.html:60
+#: templates/web/base/admin/bodies/form.html:61
+msgid ""
+"This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n"
+"          A body will not receive any reports unless it covers at least one area."
+msgstr ""
+
+#: 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/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:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
+msgid "This information is required"
+msgstr "این اطلاعات ضروری است"
+
+#: templates/web/base/admin/templates/edit.html:21
+msgid "This is a <strong>private</strong> name for this template so you can identify it when updating reports or editing in the admin."
+msgstr ""
+
+#: templates/web/base/admin/templates/edit.html:31
+msgid "This is the <strong>public</strong> text that will be shown on the site."
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:50
+msgid "This is the problem"
+msgstr "مشکل این است"
+
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
+#: templates/web/base/admin/users/import.html:65
+msgid "This page is a quick way to create many new staff users in one go."
+msgstr ""
+
+#: templates/web/base/report/update/form_state_checkbox.html:16
+msgid "This problem has been fixed"
+msgstr "این مشکل درست شده است"
+
+#: templates/web/base/report/update/form_state_checkbox.html:9
+msgid "This problem has not been fixed"
+msgstr "این مشکل درست نشده است"
+
+#: templates/web/base/report/update/form_state_checkbox.html:7
+msgid "This problem is still ongoing"
+msgstr "این مشکل هنوز ادامه دارد"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:49
+msgid "This report"
+msgstr "این گزارش"
+
+#: templates/web/base/report/duplicate-no-updates.html:5
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr "این گزارش یک نسخه تکراری است. لطفا بروزرسانی‌ها را بر روی گزارش اصلی انجام دهید:"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
+#: templates/web/zurich/report/_main.html:14
+msgid "This report is awaiting moderation."
+msgstr ""
+
+#: perllib/FixMyStreet/Script/Alerts.pm:124
+msgid "This report is currently marked as closed."
+msgstr " در حال حاضر این گزارش بسته شده است."
+
+#: perllib/FixMyStreet/Script/Alerts.pm:122
+msgid "This report is currently marked as fixed."
+msgstr " در حال حاضر این گزارش به عنوان درست شده مشخص شده است."
+
+#: perllib/FixMyStreet/Script/Alerts.pm:126
+msgid "This report is currently marked as open."
+msgstr ""
+
+#: templates/web/base/report/_updates_disallowed_message.html:1
+#: templates/web/base/report/display.html:55
+msgid "This report is now closed to updates."
+msgstr "اکنون ایجاد بروزرسانی برای این گزارش بسته شده است."
+
+#: perllib/FixMyStreet/Queue/Item/Report.pm:108
+msgid "This web page also contains a photo of the problem, provided by the user."
+msgstr "این صفحه وب همچنین حاوی عکسی از مشکل است که توسط کاربر تهیه شده است."
+
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
+#: templates/web/zurich/admin/report_edit-sdm.html:66
+#: templates/web/zurich/admin/reports/edit.html:136
+#: templates/web/zurich/admin/reports/edit.html:94
+msgid "Time spent (in minutes):"
+msgstr "زمان سپری شده (به دقیقه):"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
+#: templates/web/base/admin/timeline.html:1
+#: templates/web/base/admin/users/index.html:68
+#: templates/web/base/admin/users/log.html:1
+msgid "Timeline"
+msgstr ""
+
+#: templates/web/base/report/new/after_photo.html:2
+msgid "Tips for perfect photos"
+msgstr "نکته‌هایی برای ثبت عکس‌های کامل"
+
+#: templates/web/base/admin/flagged.html:15
+#: templates/web/base/admin/index.html:67
+#: templates/web/base/admin/reports/index.html:13
+#: templates/web/base/admin/templates/view.html:6
+#: templates/web/zurich/admin/templates/view.html:8
+msgid "Title"
+msgstr "عنوان"
+
+#: templates/web/base/admin/templates/edit.html:25
+#: templates/web/zurich/admin/templates/edit.html:23
+msgid "Title:"
+msgstr "عنوان:"
+
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
+#: templates/web/base/alert/_index_text.html:21
+msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
+msgstr ""
+
+#: templates/web/base/alert/_index_text.html:23
+msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
+msgstr "برای اطلاع از اینکه چه هشدارهای محلی برای شما داریم، لطفا کدپستی یا نام خیابان و منطقه خود را وارد کنید"
+
+#: templates/web/base/admin/reportextrafields/edit.html:19
+msgid "To limit this collection of fields to a single cobrand, select it here."
+msgstr ""
+
+#: templates/web/base/admin/reportextrafields/edit.html:40
+msgid "To limit this collection of fields to a single language, select it here."
+msgstr ""
+
+#: templates/web/base/report/update-form-wrapper.html:4
+msgid "To provide an update, please <a href=\"%s\">sign in</a>."
+msgstr "برای ارائه بروزرسانی، لطفا <a href=\"%s\">وارد سیستم شوید</a>."
+
+#: perllib/FixMyStreet/Queue/Item/Report.pm:116
+msgid "To view a map of the precise location of this issue"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:11
+#: templates/web/base/auth/generate_token.html:70
+msgid "Token"
+msgstr ""
+
+#: templates/web/base/reports/index.html:126
+msgid "Top 5 most used categories"
+msgstr "5 دسته‌بندی بیشتر استفاده شده"
+
+#: templates/web/base/reports/index.html:111
+msgid "Top 5 responsive councils"
+msgstr ""
+
+#: templates/web/base/reports/index.html:98
+msgid "Top 5 wards"
+msgstr ""
+
+#: templates/web/base/admin/stats/fix_rate.html:4
+#: templates/web/base/admin/stats/questionnaire.html:24
+#: templates/web/base/dashboard/index.html:120
+#: templates/web/base/dashboard/index.html:125
+#: templates/web/base/dashboard/index.html:149
+#: templates/web/zurich/admin/stats/index.html:51
+msgid "Total"
+msgstr "همه"
+
+#: templates/web/base/admin/bodies/_translations.html:7
+msgid "Translation"
+msgstr "ترجمه"
+
+#: templates/web/base/admin/bodies/_translations.html:2
+msgid "Translations"
+msgstr "ترجمه‌ها"
+
+#. ("JS")
+#: templates/web/base/auth/2fa/form-add.html:8
+#: templates/web/base/auth/2fa/form.html:6
+#: templates/web/base/auth/smsform.html:17
+#: templates/web/base/js/translation_strings.html:43
+msgid "Try again"
+msgstr "دوباره امتحان کنید"
+
+#: templates/web/base/contact/submit.html:14
+msgid "Try emailing us directly:"
+msgstr "سعی کنید به طور مستقیم به ما ایمیل بدهید:"
+
+#: templates/web/base/auth/2fa/intro.html:2
+#: templates/web/base/auth/2fa/intro.html:6
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
+msgid "Two-factor authentication"
+msgstr "تایید هویت دو مرحله‌ای"
+
+#: templates/web/base/auth/generate_token.html:33
+msgid "Two-factor authentication has been activated"
+msgstr "تایید هویت دو مرحله‌ای فعال شده است"
+
+#: templates/web/base/auth/generate_token.html:25
+msgid "Two-factor authentication has been deactivated"
+msgstr "تایید هویت دو مرحله‌ای غیرفعال شده است"
+
+#: templates/web/base/admin/states/index.html:10
+#: templates/web/base/admin/states/index.html:100
+#: templates/web/base/admin/users/alerts.html:9
+msgid "Type"
+msgstr ""
+
+#: templates/web/base/admin/users/_form_details.html:31
+msgid "Unban"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:64
+#: templates/web/base/admin/bodies/contact-form.html:25
+#: templates/web/base/admin/update_edit.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:54
+#: templates/web/zurich/admin/reports/edit.html:82
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Unconfirmed"
+msgstr "تایید نشده"
+
+#: templates/web/base/report/banner.html:13
+msgid "Unknown"
+msgstr "گمنام"
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:178
+msgid "Unknown alert type"
+msgstr "هشدار ناشناخته"
+
+#. ("JS")
+#: perllib/FixMyStreet/App/Controller/Photo.pm:136
+#: perllib/FixMyStreet/App/Controller/Root.pm:147
+#: templates/web/base/js/translation_strings.html:57
+msgid "Unknown error"
+msgstr "خطای ناشناخته"
+
+#: perllib/FixMyStreet/App/Controller/Develop.pm:188
+#: perllib/FixMyStreet/App/Controller/Develop.pm:207
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
+msgid "Unknown problem ID"
+msgstr "شناسه مشکل ناشناخته است"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:106
+msgid "Unknown update ID"
+msgstr "شناسه بروزرسانی ناشناخته است"
+
+#: templates/web/base/reports/_list-filter-status.html:25
+msgid "Unshortlisted"
+msgstr ""
+
+#: templates/web/base/report/_item.html:37
+msgid "Up one"
+msgstr "یکی به بالا"
+
+#: templates/web/base/admin/states/index.html:76
+#: templates/web/base/admin/users/alerts.html:58
+#: templates/web/base/report/update/form_update.html:8
+msgid "Update"
+msgstr "بروزرسانی"
+
+#: templates/web/base/admin/users/log.html:51
+msgid "Update %s created for problem %d"
+msgstr "بروزرسانی %sایجاد شده برای مشکل %d"
+
+#: templates/web/base/admin/timeline.html:33
+msgid "Update %s created for problem %d; by %s"
+msgstr "بروزرسانی %s ایجاد شده برای مشکل %d؛ توسط %s"
+
+#: templates/web/base/contact/index.html:37
+msgid "Update below added anonymously at %s"
+msgstr "بروزرسانی زیر به صورت ناشناس اضافه شده در %s"
+
+#: templates/web/base/contact/index.html:39
+msgid "Update below added by %s at %s"
+msgstr "بروزرسانی زیر اضافه شده توسط %s در %s"
+
+#: templates/web/base/admin/bodies/form.html:139
+#: templates/web/zurich/admin/bodies/form.html:63
+msgid "Update body"
+msgstr ""
+
+#: templates/web/base/admin/stats/state.html:21
+msgid "Update breakdown by state"
+msgstr ""
+
+#: db/alert_types.pl:7
+msgid "Update by {{name}}"
+msgstr "بروزرسانی توسط {{نام}}"
+
+#: templates/web/base/admin/update_edit.html:46
+#: templates/web/zurich/admin/update_edit.html:25
+msgid "Update changed problem state to %s"
+msgstr "بروزرسانی تغییر وضعیت مشکل به %s"
+
+#: templates/web/base/admin/update_edit.html:48
+msgid "Update marked problem as fixed"
+msgstr "بروزرسانی مشکل مشخص شده به عنوان درست شده"
+
+#: templates/web/base/admin/update_edit.html:50
+msgid "Update reopened problem"
+msgstr ""
+
+#: templates/web/base/admin/bodies/body.html:130
+msgid "Update statuses"
+msgstr ""
+
+#: templates/web/zurich/admin/_index_table.html:5
+msgid "Updated"
+msgstr "بروزرسانی شد"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
+msgid "Updated by <strong>%s</strong> (%s) at %s"
+msgstr "بروزرسانی شد توسط <strong>%s</strong>(%s) در %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
+msgid "Updated by <strong>%s</strong> at %s"
+msgstr "بروزرسانی شد توسط <strong>%s</strong> در %s"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
+msgid "Updated!"
+msgstr "بروزرسانی شد!"
+
+#: templates/web/base/admin/list_updates.html:2
+#: templates/web/base/dashboard/index.html:109
+#: templates/web/base/report/update.html:4
+#: templates/web/zurich/report/updates.html:2
+msgid "Updates"
+msgstr "بروزرسانی‌ها"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
+msgid "Updates are limited to %s characters in length. Please shorten your update"
+msgstr ""
+
+#: db/alert_types.pl:5 db/alert_types.pl:6
+msgid "Updates on {{title}}"
+msgstr "بروزرسانی‌ها در {{عنوان}}"
+
+#. ("%s is the site name")
+#: templates/web/base/report/display.html:0
+#: templates/web/base/report/display.html:9
+msgid "Updates to this problem, %s"
+msgstr "بروزرسانی‌های این مشکل، %s"
+
+#: templates/web/base/admin/users/import.html:64
+msgid "Usage notes"
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:137
+msgid "Use Open311 problem fetching"
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:76
+msgid "Use Open311 update-sending extension"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:53
+msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:90
+msgid "User ID to attribute fetched comments to"
+msgstr ""
+
+#: templates/web/base/admin/users/import.html:1
+msgid "User Import"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:665
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:676
+msgid "User added to abuse list"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
+msgid "User already exists"
+msgstr "کاربر از قبل وجود دارد"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:661
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:672
+msgid "User already in abuse list"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:758
+msgid "User flag removed"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:728
+msgid "User flagged"
+msgstr ""
+
+#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/users/_form_details.html:31
+#: templates/web/base/admin/users/index.html:65
+msgid "User in abuse table"
+msgstr ""
+
+#: templates/web/base/admin/users/index.html:20
+msgid "User search finds matches in users' names and email addresses."
+msgstr ""
+
+#: templates/web/base/admin/users/alerts.html:2
+msgid "User's alerts"
+msgstr "هشدارهای کاربر"
+
+#: templates/web/base/admin/reports/edit.html:155
+#: templates/web/base/admin/update_edit.html:36
+msgid "User:"
+msgstr "کاربر:"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
+#: templates/web/base/admin/flagged.html:29
+#: templates/web/base/admin/roles/index.html:25
+#: templates/web/zurich/header.html:66
+msgid "Users"
+msgstr "کاربرها:"
+
+#: templates/web/base/admin/users/form.html:125
+msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
+msgstr "به کاربران می‌توان یک یا چند نقش اختصاص داد تا همه مجوزهای آن نقش‌ها به آنها داده شود. انتخاب نقش یا نقش‌ها، گزینش اجازه دستی را غیرفعال می‌کند."
+
+#: templates/web/base/admin/users/form.html:141
+msgid "Users can perform the following actions within their assigned body or area."
+msgstr ""
+
+#: templates/web/base/admin/roles/form.html:14
+msgid "Users with this role can perform the following actions within their assigned body or area."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
+msgid "Values updated"
+msgstr ""
+
+#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55
+msgid "Verify"
+msgstr "تایید"
+
+#: templates/web/base/auth/change_email.html:2
+#: templates/web/base/auth/change_email.html:5
+msgid "Verify email address"
+msgstr "تایید آدرس ایمیل"
+
+#: templates/web/base/auth/change_phone.html:2
+#: templates/web/base/auth/change_phone.html:5
+msgid "Verify phone number"
+msgstr "تایید شماره تلفن"
+
+#: templates/web/base/admin/reports/edit.html:36
+#: templates/web/base/admin/update_edit.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:23
+#: templates/web/zurich/admin/reports/edit.html:24
+#: templates/web/zurich/admin/update_edit.html:10
+msgid "View report on site"
+msgstr "مشاهده گزارش در سایت"
+
+#: templates/web/base/reports/body.html:16
+msgid "View reports by ward"
+msgstr ""
+
+#: templates/web/base/reports/_ward-list.html:24
+msgid "View wards"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
+msgid "View/Mark private reports"
+msgstr ""
+
+#: templates/web/base/around/display_location.html:0
+#: templates/web/base/around/display_location.html:38
+msgid "Viewing a location"
+msgstr "مشاهده مکان"
+
+#: templates/web/base/report/display.html:0
+#: templates/web/base/report/display.html:6
+msgid "Viewing a problem"
+msgstr "مشاهده مشکل"
+
+#: templates/web/base/dashboard/index.html:29
+msgid "Ward:"
+msgstr ""
+
+#: templates/web/base/reports/body.html:18
+msgid "Wards of this council"
+msgstr ""
+
+#: templates/web/base/alert/choose.html:7
+#: templates/web/base/around/_error_multiple.html:6
+msgid "We found more than one match for that location."
+msgstr ""
+
+#: templates/web/base/around/lookup_by_ref.html:6
+msgid "We found more than one match for that problem reference:"
+msgstr ""
+
+#: templates/web/base/auth/smsform.html:20
+msgid "We have sent a confirmation code to your phone. Please enter it below:"
+msgstr "یک کد تایید به تلفن شما ارسال کردیم. لطفا آن را در بخش زیر وارد کنید:"
+
+#: templates/web/base/auth/general.html:13
+#: templates/web/base/report/display.html:35
+#: templates/web/base/report/new/oauth_email_form.html:5
+msgid "We need your email address, please give it below."
+msgstr " به آدرس ایمیل شما نیاز داریم، لطفا آن را در بخش زیر ارائه دهید."
+
+#: 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 "اگاه هستیم که مسئولیت این مشکل ممکن است به عهده %s باشد؛ با این وجود، در حال حاضر هیچ اطلاعات تماسی از آنها نداریم. اگر از نحوه ارتباط مناسب اطلاع دارید، لطفاً با ما تماس بگیرید."
+
+#: templates/web/base/index-steps.html:11
+msgid "We send it to the council on your behalf"
+msgstr ""
+
+#: templates/web/base/alert/choose.html:13
+#: templates/web/base/around/_error_multiple.html:20
+msgid "We show up to ten matches, please try a different search if yours is not here."
+msgstr ""
+
+#: templates/web/base/report/new/notes.html:4
+#: templates/web/zurich/report/new/notes.html:4
+msgid "We will only use your personal information in accordance with our <a href=\"%s\">privacy policy.</a>"
+msgstr ""
+
+#: templates/web/base/questionnaire/completed-open.html:2
+msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:123
+msgid "Website"
+msgstr "وب‌سایت"
+
+#: templates/web/base/contact/submit.html:7
+msgid "We’ll get back to you as soon as we can."
+msgstr "در اسرع وقت با شما تماس می‌گیریم."
+
+#: templates/web/base/report/new/duplicate_suggestions.html:12
+msgid "We’ve already reported these nearby problems to the council. Is one of them yours?"
+msgstr ""
+
+#: templates/web/base/admin/bodies/category.html:28
+#: templates/web/zurich/admin/bodies/body.html:18
+msgid "When edited"
+msgstr ""
+
+#: templates/web/base/admin/problem_row.html:35
+msgid "When sent"
+msgstr ""
+
+#: templates/web/base/alert/_list.html:9
+msgid "Which problems do you want alerts about?"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:41
+msgid "Which report is it a duplicate of?"
+msgstr "کدام یک از گزارش‌ها تکراری است؟"
+
+#: templates/web/base/tokens/confirm_alert.html:7
+msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free."
+msgstr ""
+
+#: templates/web/base/open311/index.html:84
+msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration.  The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:164
+msgid "Within the specified timeframe:"
+msgstr "در بازه زمانی مشخص شده:"
+
+#: templates/web/base/front/footer-marketing.html:3
+msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
+msgstr ""
+
+#: templates/web/base/questionnaire/index.html:80
+msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
+msgstr "آیا می‌خواهید 4 هفته دیگر با یادآوری اینکه وضعیت گزارش را بررسی کنید،  پرسشنامه دریافت کنید؟"
+
+#: templates/web/base/report/new/duplicate_suggestions.html:23
+msgid "Would you like us to notify you when this problem is updated or fixed?"
+msgstr "آیا می‌خواهید در صورت بروزرسانی یا درست شدن مشکل به شما اطلاع دهیم؟"
+
+#: templates/web/base/report/new/notes.html:7
+msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
+#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
+#: templates/web/base/admin/bodies/category.html:6
+#: templates/web/base/admin/bodies/index.html:70
+#: templates/web/base/admin/flagged.html:47
+#: templates/web/base/admin/list_updates.html:33
+#: templates/web/base/admin/list_updates.html:35
+#: templates/web/base/admin/list_updates.html:36
+#: templates/web/base/admin/problem_row.html:20
+#: templates/web/base/admin/reports/edit.html:101
+#: templates/web/base/admin/reports/edit.html:150
+#: templates/web/base/admin/update_edit.html:25
+#: templates/web/base/admin/users/alerts.html:21
+#: templates/web/base/admin/users/index.html:65
+#: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
+msgid "Yes"
+msgstr "بله"
+
+#: templates/web/base/contact/index.html:54
+msgid "You are complaining that this problem report was unnecessarily moderated:"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:26
+msgid "You are not sure of the origin or validity of the contact."
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:105
+msgid "You are offline"
+msgstr ""
+
+#: templates/web/base/contact/unsuitable-text.html:2
+msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
+msgstr ""
+
+#: templates/web/base/contact/index.html:31
+msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
+msgstr ""
+
+#: templates/web/base/report/_updates_disallowed_message.html:2
+#: templates/web/base/report/display.html:56
+msgid "You can <a href=\"%s\">make a new report in the same location</a>."
+msgstr "شما می‌توانید <a href=\"%s\">گزارش جدیدی را در همان مکان تهیه کنید</a>."
+
+#: templates/web/zurich/tokens/confirm_problem.html:6
+#: templates/web/zurich/tokens/confirm_problem.html:8
+msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
+msgstr "شما می‌توانید <a href=\"%s%s\">مشکل را در این سایت مشاهده کنید</a>."
+
+#: templates/web/base/admin/users/form.html:97
+msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
+msgstr ""
+
+#: templates/web/base/alert/_list.html:18
+msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination."
+msgstr ""
+
+#: templates/web/base/contact/index.html:131
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr "می‌توانید با پشتیبانی فنی تماس بگیرید در <a href='mailto:%s'>%s</a>"
+
+#: templates/web/base/admin/flagged.html:5
+msgid ""
+"You can flag any report or user by editing them, and they will be listed on this page.\n"
+"          For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n"
+"          reports in the past."
+msgstr ""
+
+#: templates/web/base/report/new/top_message_none.html:13
+#: templates/web/base/report/new/top_message_none.html:14
+#: templates/web/base/report/new/top_message_some.html:10
+#: templates/web/base/report/new/top_message_some.html:11
+msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
+msgstr ""
+
+#: templates/web/base/admin/bodies/form.html:92
+msgid "You can mark a body as deleted if you do not want it to be active on the site."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
+msgid "You cannot rename a category to an existing category"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:54
+msgid "You declined; please fill in the box above"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:107
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:39
+msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
+msgstr ""
+
+#: templates/web/base/contact/enquiry/index.html:59
+msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
+msgstr "در حال حاضر شما سند‌هایی را به این گزارش پیوست کرده‌اید. توجه داشته باشید که می‌توانید حداکثر 3 سند را به این گزارش پیوست کنید (اگر سعی دارید بیشتر بارگذاری کنید، سندهای قدیمی‌تر حذف می‌شوند)."
+
+#: templates/web/base/report/new/form_report.html:50
+#: templates/web/zurich/report/new/fill_in_details_form.html:30
+msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
+msgstr "در حال حاضر شما عکس‌هایی را به این گزارش پیوست کرده‌اید. توجه داشته باشید که می‌توانید حداکثر 3 عکس را به این گزارش پیوست کنید (اگر سعی دارید بیشتر بارگذاری کنید، عکس‌های قدیمی‌تر حذف می‌شوند)."
+
+#: templates/web/base/report/form/photo_upload.html:13
+msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
+msgstr "در حال حاضر شما عکس‌هایی را به این بروزرسانی پیوست کرده‌اید. توجه داشته باشید که می‌توانید حداکثر 3 عکس را به این بروزرسانی پیوست کنید (اگر سعی دارید بیشتر بارگذاری کنید، عکس‌های قدیمی‌تر حذف می‌شوند)."
+
+#: templates/web/base/auth/sign_out.html:4
+#: templates/web/zurich/auth/sign_out.html:3
+msgid "You have been signed out"
+msgstr "از حساب کاربری خود خارج شده‌اید"
+
+#: templates/web/zurich/report/new/sidebar.html:7
+msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. "
+msgstr "شما این مشکل را در نقطه‌ای که با نشانگر سبز روی نقشه مشخص شده، علامت‌گذاری کرده‌اید. اگر این مکان درست نیست، کافیست دوباره روی نقشه کلیک کنید."
+
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:143
+msgid "You have successfully added your phone number."
+msgstr "شما شماره تلفن خود را با موفقیت اضافه کردید."
+
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:159
+#: templates/web/zurich/tokens/confirm_problem.html:6
+msgid "You have successfully confirmed your email address."
+msgstr "شما آدرس ایمیل خود را با موفقیت تایید کردید."
+
+#: templates/web/base/auth/change_phone.html:15
+msgid "You have successfully confirmed your phone number."
+msgstr "شما شماره تلفن خود را با موفقیت تایید کردید."
+
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:130
+msgid "You have successfully removed your phone number."
+msgstr "شما شماره تلفن خود را با موفقیت حذف کردید."
+
+#: templates/web/base/report/display.html:25
+#: templates/web/base/report/new/login_success_form.html:3
+msgid "You have successfully signed in; please check and confirm your details are accurate:"
+msgstr "شما با موفقیت وارد سیستم شده اید؛ لطفا بررسی و تأیید کنید که جزئیات شما درست است:"
+
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:165
+msgid "You have successfully verified your phone number."
+msgstr "شما شماره تلفن خود را با موفقیت تایید کردید."
+
+#: templates/web/base/my/my.html:83
+msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
+#: templates/web/base/my/planned.html:21
+msgid "You haven&rsquo;t shortlisted any reports yet."
+msgstr ""
+
+#: templates/web/base/admin/index.html:19
+msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent."
+msgstr ""
+
+#: templates/web/base/admin/bodies/index.html:11
+msgid ""
+"You need to add bodies (such as councils or departments) so that you can then add\n"
+"    the categories of problems they can handle (such as potholes or streetlights) and the\n"
+"    contacts (such as an email address) to which reports are sent."
+msgstr ""
+
+#: templates/web/base/my/my.html:0 templates/web/base/my/my.html:5
+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:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
+msgid "Your account"
+msgstr "حساب شما"
+
+#: templates/web/base/auth/2fa/intro.html:18
+msgid "Your account requires two-factor authentication to be set up."
+msgstr "حساب کاربری شما نیازمند راه‌اندازی تایید هویت دو مرحله‌ای است."
+
+#: templates/web/base/alert/updates.html:32
+#: templates/web/base/auth/create.html:50
+#: templates/web/base/auth/general.html:56
+#: templates/web/base/contact/enquiry/index.html:18
+#: templates/web/base/contact/index.html:91
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
+#: templates/web/base/report/new/duplicate_suggestions.html:42
+#: templates/web/zurich/report/new/fill_in_details_form.html:53
+msgid "Your email"
+msgstr "ایمیل شما"
+
+#: templates/web/base/auth/change_email.html:15
+msgid "Your email address"
+msgstr "آدرس ایمیل شما"
+
+#: templates/web/base/auth/create.html:48
+#: templates/web/base/auth/general.html:54
+#: templates/web/base/report/form/user_loggedout_email.html:3
+msgid "Your email or mobile"
+msgstr "ایمیل یا شماره موبایل شما"
+
+#: templates/web/base/report/updates-sidebar-notes.html:3
+msgid "Your information will only be used in accordance with our <a href=\"%s\">privacy policy</a>"
+msgstr "اطلاعات شما فقط مطابق با <a href=\"%s\">سیاست حفظ حریم خصوصی</a> ما استفاده می‌شود."
+
+#: templates/web/base/contact/enquiry/index.html:12
+#: templates/web/base/contact/index.html:85
+msgid "Your name"
+msgstr "نام شما"
+
+#: templates/web/base/my/anonymize.html:13
+msgid "Your name has already been sent to %s, but we can hide it on this page:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/My.pm:316
+msgid "Your name has been hidden from all your reports and updates."
+msgstr "نام شما در همه گزارش‌ها و بروزرسانی‌های شما پنهان شده است."
+
+#: perllib/FixMyStreet/App/Controller/My.pm:312
+msgid "Your name has been hidden."
+msgstr "نام شما پنهان شده است."
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:97
+msgid "Your offline reports"
+msgstr ""
+
+#: templates/web/base/auth/create.html:64
+#: templates/web/base/auth/general.html:90
+#: templates/web/base/report/form/user_loggedout_password.html:13
+msgid "Your password"
+msgstr "رمز عبور شما"
+
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:171
+#: templates/web/base/auth/change_password.html:12
+msgid "Your password has been changed"
+msgstr "رمز عبور شما تغییر کرده است"
+
+#: templates/web/base/auth/create.html:34
+msgid "Your password has expired, please create a new one below. When you click the link in your email, your password will be updated."
+msgstr "رمز عبور شما منقضی شده است، لطفا یک رمز جدید در زیر ایجاد کنید. وقتی روی پیوند در ایمیل خود کلیک می‌کنید ، رمز ورود شما بروزرسانی می‌شود."
+
+#: templates/web/base/auth/create.html:67
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
+#: templates/web/zurich/auth/general.html:56
+msgid "Your password should include %d or more characters."
+msgstr ""
+
+#: templates/web/base/auth/change_phone.html:19
+#: templates/web/base/contact/enquiry/index.html:25
+#: templates/web/base/contact/index.html:98
+msgid "Your phone number"
+msgstr "شماره تلفن شما"
+
+#: templates/web/base/questionnaire/index.html:46
+msgid "Your report"
+msgstr "گزارش شما"
+
+#: templates/web/base/my/my.html:80
+msgid "Your reports"
+msgstr "گزارش‌های شما"
+
+#: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
+#: templates/web/base/my/planned.html:5
+msgid "Your shortlist"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:8
+msgid "Your token has been generated"
+msgstr ""
+
+#: templates/web/base/report/update/form_user.html:6
+msgid "Your update"
+msgstr "بروز رسانی شما"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:98
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
+#: templates/web/base/my/my.html:103
+msgid "Your updates"
+msgstr "بروزرسانی‌های شما"
+
+#: perllib/FixMyStreet/SMS.pm:46
+msgid "Your verification code is %s"
+msgstr "کد تایید شما %s"
+
+#: templates/web/base/report/new/form_user_loggedin.html:20
+#: templates/web/base/report/update/form_user_loggedin.html:14
+msgid "Yourself"
+msgstr "خودتان"
+
+#: templates/web/base/admin/users/import.html:72
+msgid "a colon-separated list of permissions to grant that user, e.g. <code>contribute_as_body:moderate:user_edit</code>."
+msgstr ""
+
+#: templates/web/base/admin/users/import.html:73
+msgid "a colon-separated list of roles to assign to that user."
+msgstr ""
+
+#: templates/web/base/report/inspect/information.html:10
+msgid "admin"
+msgstr "مدیر"
+
+#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
+#: templates/web/base/admin/category-checkboxes.html:5
+#: templates/web/base/admin/users/form.html:152
+msgid "all"
+msgstr "همه"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
+#: templates/web/base/admin/update_edit.html:92
+#: templates/web/base/report/update/moderation_meta.html:2
+msgid "an administrator"
+msgstr "یک مدیر"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
+msgid "and a defect raised"
+msgstr ""
+
+#: templates/web/base/admin/timeline.html:4
+msgid "by %s"
+msgstr "توسط %s"
+
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
+msgid "council"
+msgstr "شورا (شهر/روستا)"
+
+#: templates/web/base/admin/reports/edit.html:53
+msgid "didn't use map"
+msgstr ""
+
+#: templates/web/base/alert/index.html:12
+#: templates/web/base/around/_postcode_form_examples.html:1
+msgid "e.g. ‘%s’ or ‘%s’"
+msgstr "برای مثال ‘%s’ یا ‘%s’"
+
+#: templates/web/base/report/new/form_title.html:2
+msgid "e.g. ‘10 inch pothole on Example St, near post box’"
+msgstr ""
+
+#: templates/web/base/report/new/form_report.html:70
+msgid "e.g. ‘This pothole has been here for two months and…’"
+msgstr ""
+
+#: templates/web/base/admin/bodies/open311-form-fields.html:93
+#: templates/web/base/admin/flagged.html:51
+msgid "edit user"
+msgstr "ویرایش کاربر"
+
+#: templates/web/base/status/stats.html:20
+#: templates/web/zurich/admin/index.html:5
+msgid "from %s different users"
+msgstr ""
+
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
+#: templates/web/base/report/_item_small.html:22
+#: templates/web/zurich/report/_item.html:16
+msgid "last updated %s"
+msgstr "آخرین بروزرسانی %s"
+
+#: perllib/Utils.pm:226
+msgid "less than a minute"
+msgstr "کمتر از یک دقیقه"
+
+#: 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 "غیرقابل دسترس"
+
+#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
+#: templates/web/base/admin/category-checkboxes.html:6
+#: templates/web/base/admin/users/form.html:153
+msgid "none"
+msgstr "هیچ"
+
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:80
+msgid "not the council's responsibility"
+msgstr ""
+
+#: templates/web/base/contact/enquiry/index.html:26
+#: templates/web/base/contact/index.html:99
+msgid "optional"
+msgstr "اختیاری"
+
+#: templates/web/base/report/form/user.html:31
+#: templates/web/base/report/form/user.html:41
+msgid "or"
+msgstr "یا"
+
+#: templates/web/base/auth/general.html:6
+msgid "or <a href=\"%s\">create an account</a>"
+msgstr "یا <a href=\"%s\">یک حساب کاربری ایجاد کنید</a>"
+
+#: templates/web/base/auth/create.html:16
+msgid "or <a href=\"%s\">sign in</a>"
+msgstr "یا <a href=\"%s\">وارد سیستم شوید</a>"
+
+#: templates/web/base/alert/index.html:18
+#: templates/web/base/around/postcode_form.html:36
+msgid "or use my location"
+msgstr "یا از موقعیت مکانی من استفاده کنید"
+
+#: templates/web/base/admin/reports/edit.html:50
+#: templates/web/base/admin/reports/edit.html:51
+#: templates/web/zurich/admin/report_edit-sdm.html:33
+#: templates/web/zurich/admin/report_edit-sdm.html:34
+#: templates/web/zurich/admin/reports/edit.html:35
+#: templates/web/zurich/admin/reports/edit.html:36
+#: templates/web/zurich/admin/reports/edit.html:51
+#: templates/web/zurich/admin/reports/edit.html:52
+msgid "originally entered: &ldquo;%s&rdquo;"
+msgstr ""
+
+#: templates/web/base/admin/reports/edit.html:69
+msgid "other areas:"
+msgstr "مناطق دیگر:"
+
+#: templates/web/zurich/admin/bodies/contact-form.html:29
+msgid "show"
+msgstr "نمایش"
+
+#: templates/web/zurich/footer.html:12
+msgid "sign out"
+msgstr "خروج از سیستم"
+
+#: templates/web/base/admin/users/import.html:71
+msgid "the database id of the body to associate that user with, e.g. <code>2217</code> for Buckinghamshire."
+msgstr ""
+
+#: templates/web/base/report/new/form_public_councils_text.html:6
+msgid "the local council"
+msgstr ""
+
+#: templates/web/base/report/_report_meta_info.html:5
+#: templates/web/zurich/report/_main.html:7
+msgid "there is no pin shown as the user did not use the map"
+msgstr ""
+
+#: templates/web/base/alert/_list.html:1
+msgid "this location"
+msgstr "این موقعیت مکانی"
+
+#: perllib/FixMyStreet/Queue/Item/Report.pm:133
+msgid "this type of local problem"
+msgstr ""
+
+#: perllib/Utils.pm:176
+msgid "today"
+msgstr "امروز"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:108
+msgid "update"
+msgstr "بروزرسانی"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:109
+msgid "updates"
+msgstr "بروزرسانی‌ها"
+
+#: templates/web/base/admin/reports/edit.html:53
+msgid "used map"
+msgstr ""
+
+#: templates/web/base/admin/update_edit.html:39
+msgid "user is from same council as problem - %d"
+msgstr ""
+
+#: templates/web/base/admin/update_edit.html:42
+msgid "user is problem owner"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:700
+msgid "user not in abuse list"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:698
+msgid "user removed from abuse list"
+msgstr ""
+
+#: templates/web/base/reports/body.html:0
+#: templates/web/base/reports/body.html:5
+msgid "ward"
+msgstr ""
+
+#: templates/web/base/admin/bodies/index.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:249
+#, perl-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:251
+#, perl-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:253
+#, perl-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:245
+#, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/report/_support.html:6
+#, perl-format
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:247
+#, perl-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:243
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/reports/index.html:120
+#, perl-format
+msgid "%s day"
+msgid_plural "%s days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/reports/index.html:57
+#, perl-format
+msgid "%s problem marked as fixed"
+msgid_plural "%s problems marked as fixed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/reports/index.html:45
+#, perl-format
+msgid "%s problem reported"
+msgid_plural "%s problems reported"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/reports/index.html:136
+#, perl-format
+msgid "%s report"
+msgid_plural "%s reports"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/reports/index.html:51
+#, perl-format
+msgid "%s update on problems"
+msgid_plural "%s updates on problems"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/front/stats.html:19
+#, perl-format
+msgid "<big>%s</big> fixed in past month"
+msgid_plural "<big>%s</big> fixed in past month"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/front/stats.html:8
+#, perl-format
+msgid "<big>%s</big> report in past week"
+msgid_plural "<big>%s</big> reports in past week"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/front/stats.html:13
+#, perl-format
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/front/stats.html:25
+#, perl-format
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/report/_item_small.html:10
+#, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/report/new/top_message_some.html:3
+#, perl-format
+msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
+msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/report/new/top_message_none.html:3
+#, perl-format
+msgid "We do not yet have details for the council that covers this location."
+msgid_plural "We do not yet have details for the councils that cover this location."
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/base/report/_item_small.html:20
+#, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/email/default/inactive-account.txt:8
+#, perl-format
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/email/rutland/archive.html:28
+#, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] ""
+msgstr[1] ""
+
+#~ msgid "Filter report list"
+#~ msgstr "فیلتر لیست گزارش"
+
+#~ msgid "Traffic management required?"
+#~ msgstr "نیاز به مدیریت ترافیک است؟"
diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
index 5acfb1d8c..f8d0d856b 100644
--- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: fixmystreetfr <fixmystreet@fixmystreet.fr>, 2019\n"
 "Language-Team: French (France) (https://www.transifex.com/mysociety/teams/12067/fr_FR/)\n"
@@ -22,8 +22,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " et "
@@ -58,7 +58,7 @@ msgstr "%d les utilisateurs existent déjà"
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Rapports résumés"
 
@@ -119,7 +119,7 @@ msgstr "%s questionnaires envoyés &ndash; %s complétés (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s réf&nbsp;:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributeurs"
 
@@ -165,6 +165,8 @@ msgstr "(n'existe plus)"
 msgid "(not sent to council)"
 msgstr "(non signalé à l’administration)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -183,8 +185,8 @@ msgstr "(envoyé aux deux)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr "(nous avons également des flux RSS pour les problèmes internes%s)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Choisissez une catégorie --"
@@ -214,17 +216,18 @@ msgstr ""
 "              Peut etre ajouter un <code>MAPIT_TYPES</code> a votre fichier de config?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr "<h2>Rapports, statistiques et actions pour</h2> <h1>%s</h1>"
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Afficher </label> %s les rapports <label for=\"filter_categories\"> sur </label> %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span>enregistré."
 
@@ -254,7 +257,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Oui</strong>, j'ai un mot de passe :"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -271,7 +274,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr "Activer l’authentification à deux facteurs"
 
@@ -294,7 +297,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Ajouter un contact en utilisant le formulaire ci-dessous."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Ajouter une nouvelle catégorie"
@@ -327,7 +330,7 @@ msgstr "Ajouter un état fixe"
 msgid "Add new category"
 msgstr "Ajouter une nouvelle catégorie"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "Ajouter une option"
 
@@ -336,8 +339,8 @@ msgstr "Ajouter une option"
 msgid "Add phone number"
 msgstr "Ajouter un téléphone"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -345,21 +348,20 @@ msgid "Add to shortlist"
 msgstr "Ajouter à la liste"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Ajouter/modifier des catégories de problèmes"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Ajouter/modifier les priorités de réponse"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Ajouter/modifier des modèles de réponse"
 
@@ -375,6 +377,12 @@ msgstr "L'ajout de ce rapport à votre liste va le supprimer de la liste %s’s.
 msgid "Admin"
 msgstr "Admin"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Encore une fois :"
@@ -387,8 +395,8 @@ msgstr "Alerte %d créée pour %s, type %s, paramètres %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Alerte %d désactivée (création %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "M'alerter de futures mises à jour"
 
@@ -400,10 +408,12 @@ msgstr "Alertes:"
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Tous"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Tous les rapports"
@@ -443,6 +453,11 @@ msgstr "Tous les rapports entre %s et %s"
 msgid "All time"
 msgstr "Tout le temps"
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Rapporté dans la catégorie %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr "Déjà signalé ?"
@@ -479,7 +494,7 @@ msgstr "Anonyme"
 msgid "Anonymous user"
 msgstr "Utilisateur anonyme"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -492,7 +507,7 @@ msgid "Another user"
 msgstr "un autre utilisateur"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Êtes-vous sûr de vouloir annuler cet envoi ?"
 
@@ -501,8 +516,8 @@ msgstr "Êtes-vous sûr de vouloir annuler cet envoi ?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr ?"
@@ -513,7 +528,7 @@ msgstr "Êtes-vous sûr ?"
 msgid "Area covered"
 msgstr "Zone couverte"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Région:"
 
@@ -527,27 +542,32 @@ msgstr "Comme ceci est un site de développement et %s est un test, les rapports
 msgid "Assign selected to role:"
 msgstr "Affecter des utilisateurs aux zones"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Attribuer à l'organisme compétent:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Affecté à une catégorie différente:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Affecté à un \"interlocuteur\" externe:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Affecté à la subdivision:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "Affecter des utilisateurs aux zones"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Catégories disponibles"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Affecté à %s"
@@ -560,7 +580,7 @@ msgstr "Un maximum de %d requètes sont renvoyées pour chaque tentative. Les re
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Pour le moment, seul la recherche et la consultation de rapports sont supportés."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr "Les utilisateurs autorisés peuvent être associés aux catégories sur lesquelles ils interviennent."
 
@@ -568,11 +588,11 @@ msgstr "Les utilisateurs autorisés peuvent être associés aux catégories sur
 msgid "Auto Response"
 msgstr "Réponse auto"
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Réponse automatique:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr "Remplir automatiquement le sujet/le détail du rapport"
 
@@ -584,12 +604,13 @@ msgstr "Temps moyen entre un problème signalé et corrigé sur les 100 derniers
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Évitez les renseignements personnels et les plaques d'immatriculation"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "En attente de modération"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Retour"
@@ -610,14 +631,12 @@ msgstr "Bannir un utilisateur"
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Interlocuteurs"
 
@@ -630,11 +649,13 @@ msgstr "Interlocuteurs"
 msgid "Body"
 msgstr "Interlocuteur"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Interlocuteur:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr "Fichier CSV"
 
@@ -646,8 +667,7 @@ msgstr "Si vous ne trouvez pas notre e-mail? Vérifiez dans votre dossier spam."
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Vous ne pouvez pas voir le plan ? <em>Sautez cette étape</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -663,15 +683,13 @@ msgstr "Catégories:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -681,7 +699,7 @@ msgstr "Catégorie"
 msgid "Category and State"
 msgstr "Catégorie et Statistique"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Changement de catégorie de ‘%s’ à ‘%s’"
 
@@ -704,6 +722,11 @@ msgstr "Catégorie :"
 msgid "Change"
 msgstr "Changer"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Changer le mot de passe"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -720,7 +743,7 @@ msgstr "Changer le mot de passe"
 msgid "Change phone number"
 msgstr "Changer le Téléphone"
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 #, fuzzy
 msgid "Change two-factor authentication"
 msgstr "Activer l’authentification à deux facteurs"
@@ -734,12 +757,12 @@ msgstr ""
 "public  (ex., \"nid de poule\", \"éclairage public\") mais est aussi utile pour l'interlocuteur.\n"
 " Elle apparaitra dans le menu déroulant sur la page \"Rapporter-un-problème\"."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr "Choisissez un autre"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr "Effacer les données hors ligne"
 
@@ -776,8 +799,8 @@ msgid "Close"
 msgstr "Fermer"
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -787,11 +810,7 @@ msgstr "Fermer"
 msgid "Closed"
 msgstr "Clos"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Clos par l'administration"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr "Fermé aux mises à jour"
 
@@ -824,13 +843,12 @@ msgid "Code"
 msgstr "Code"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr "Réduire la carte"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Configuration"
@@ -947,7 +965,7 @@ msgstr "Créer un rapport"
 msgid "Create an account"
 msgstr "Créer un compte"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Créer une catégorie"
@@ -957,27 +975,25 @@ msgstr "Créer une catégorie"
 msgid "Create priority"
 msgstr "Créer une priorité"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr "Créer un rapports / une mises à jour en tant qu’utilisateur anonyme"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "Créer des rapports/mises à jour de l'administration"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "Créer des rapports/mises à jour pour le compte d'un utilisateur"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Créer un modèle"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Créé"
@@ -986,6 +1002,17 @@ msgstr "Créé"
 msgid "Created %d new users"
 msgstr "Création %d de nouveaux utilisateurs"
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Créé"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Créé"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -997,10 +1024,6 @@ msgstr "Créé :"
 msgid "Current password:"
 msgstr "Mot de passe actuel:"
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr "Jeton actuel:"
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr "Actuellement regroupé par %s"
@@ -1010,19 +1033,21 @@ msgstr "Actuellement regroupé par %s"
 msgid "Currently no bodies have been created."
 msgstr "Pour l'instant, aucun intelocuteur n'a été créé."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Le client est injoignable"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr "Désactiver l’authentification à deux facteurs"
 
@@ -1034,7 +1059,7 @@ msgstr "Traité par la subdivision dans les 5 jours ouvrables"
 msgid "Default"
 msgstr "Défaut"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr "Par défaut pour créer des rapports/mises à jour en tant que conseil"
 
@@ -1044,7 +1069,7 @@ msgid "Delete"
 msgstr "Effacer"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Supprimer le modèle"
@@ -1066,9 +1091,7 @@ msgid "Describe why you are moderating this"
 msgstr "Décrivez pourquoi vous modérez ceci"
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Description"
 
@@ -1077,7 +1100,7 @@ msgstr "Description"
 msgid "Destination"
 msgstr "Description"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr "Les informations détaillées se à %d caractàre."
 
@@ -1113,7 +1136,7 @@ msgid "Disable"
 msgstr "Désactiver"
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1121,6 +1144,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Rapporté dans la catégorie %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Rapporté dans la catégorie %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr "Désactivé:"
@@ -1155,25 +1188,25 @@ msgstr "Je ne sais pas"
 msgid "Don't like forms?"
 msgstr "Vous n'aimez pas les formulaires ?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr "En bas d’un"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Glissez et déposez les photos ici ou <u> cliquer pour les envoyer </ u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr "Dupliquer de"
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr "Dupliqués"
 
@@ -1188,7 +1221,7 @@ msgstr ""
 "Des catégories différents <strong>peuvent avoir le même contact</strong> (adresse email).\n"
 "Cela signifie que vous pouvez ajouter plusieurs catégories même si vous n'avez qu'un contact pour l'interlocuteur."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr "Abscisse/Ordonnée :"
@@ -1200,7 +1233,7 @@ msgstr "Abscisse/Ordonnée :"
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Éditer"
@@ -1211,12 +1244,11 @@ msgstr "Éditer"
 msgid "Edit body details"
 msgstr "Editer les détails de l'intelocuteur"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "Modifier les autorisations des autres utilisateurs"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Éditer la catégorie des rapports"
 
@@ -1224,17 +1256,15 @@ msgstr "Éditer la catégorie des rapports"
 msgid "Edit report details"
 msgstr "Éditer les détails du rapport"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Éditer la priorité des rapports"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Éditer les rapports"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr "Modifier les détails des utilisateurs/rechercher leurs rapports"
 
@@ -1271,8 +1301,9 @@ msgstr "Éditeur"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1281,15 +1312,14 @@ msgstr "Éditeur"
 msgid "Email"
 msgstr "Email"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Adresse e-mail"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr "Adresse e-mail (facultatif)"
 
@@ -1309,12 +1339,13 @@ msgstr "Envoyez-moi un lien par SMS ou envoyez-moi un code pour vous connecter"
 msgid "Email me a link to sign in"
 msgstr "Envoyez-moi un courriel électronique pour me connecter"
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "Email verifié:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Email :"
@@ -1388,12 +1419,12 @@ msgstr "Date de fin"
 msgid "Endpoint"
 msgstr "destinataire"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Saisir un nom de rue Zücomplet"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Saisir un code postal proche, ou un nom de rue ou de localité"
 
@@ -1420,10 +1451,10 @@ msgstr "Saisissez les détails du problème"
 msgid "Error"
 msgstr "Erreur"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Tout"
 
@@ -1436,7 +1467,7 @@ msgstr "Exemple de code postal %s"
 msgid "Examples:"
 msgstr "Exemples :"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Catégorie existante"
 
@@ -1445,7 +1476,7 @@ msgid "Existing users won't be modified."
 msgstr "Les utilisateurs existants ne seront pas modifiés."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr "Agrandir la carte"
 
@@ -1470,7 +1501,7 @@ msgid "External body"
 msgstr "Body extérieur"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr "Code de’état externe"
 
@@ -1482,20 +1513,20 @@ msgstr "Code de’état externe:"
 msgid "External team"
 msgstr "Équipe externe"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "Champs supplémentaires"
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Donnée supplémentaire:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1528,20 +1559,25 @@ msgid "Fill in your details manually."
 msgstr "Introduisez vos informations manuellement"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Liste de filtres de rapport"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Première fois"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Photos de rapports récents à proximité"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nouveaux rapports"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Résoudre ceci en chosissant une <strong>zone couverte</strong> dans le formulaire <em>Saisie des détails interlocuteur</em> ci-dessous."
@@ -1571,7 +1607,7 @@ msgstr "Signaler comme supprimé"
 msgid "Flag user"
 msgstr "Signaler l'usager"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Signalé"
@@ -1580,7 +1616,7 @@ msgstr "Signalé"
 msgid "Flagged reports and users"
 msgstr "Rapports signalés et utilisateurs"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Les utilisateurs signalés sont listés dans la page <a href='%s'>signalé</a>"
 
@@ -1588,8 +1624,8 @@ msgstr "Les utilisateurs signalés sont listés dans la page <a href='%s'>signal
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Les utilisateurs signalés ne sont pas restreints en aucune façon. il s'agit juste d'une liste d'utilisateurs qui ont été marqués pour attention."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Signalé :"
 
@@ -1615,11 +1651,11 @@ msgstr "Mot de passe oublié ?"
 msgid "Forgotten your password?"
 msgstr "Vous avez oublié votre mot de passe? "
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Transmis à l'administration"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Souhait transmis à l'administration"
 
@@ -1629,12 +1665,20 @@ msgstr "Souhait transmis à l'administration"
 msgid "Frequently Asked Questions"
 msgstr "Foire Aux Questions"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr "Générer un jeton"
 
@@ -1656,7 +1700,7 @@ msgstr "Recevoir les mises à jours de %s problèmes"
 msgid "Get updates of problems in this %s"
 msgstr "Recevez les mises à jour pour les problèmes dans cette %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Donnez-moi un flux RSS"
 
@@ -1672,15 +1716,15 @@ msgstr "Heureux d'entendre qu'il a été résolu!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1690,7 +1734,7 @@ msgstr "Ok"
 msgid "Going to send questionnaire?"
 msgstr "Envoi du questionnaire ?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr "Accorder l'accès à l'admin"
 
@@ -1716,6 +1760,7 @@ msgstr "Est-ce que vous aviez déjà signalé un problème à une administration
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1750,7 +1795,8 @@ msgstr "Caché(s)"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr "Masquer tous les rapports et mises à jour"
 
@@ -1778,7 +1824,7 @@ msgstr "Cacher mon nom sur ce rapport"
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Cacher les épingles"
 
@@ -1832,11 +1878,9 @@ msgstr "Je suis désolé, nous n'avons pas trouvé votre problème dans notre ba
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1855,15 +1899,15 @@ msgstr "S’il y a un utilisateur associé à l’adresse que vous avez saisie,
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr "Si cette priorité est transmise à un service externe (par exemple Exor / Confirm), entrez le code de priorité à utiliser avec ce service ici."
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr "Si cette option est cochée, ce modèle sera utilisé pour les mises à jour Open311 qui posent des problèmes dans cet état."
 
@@ -1877,7 +1921,7 @@ msgstr "Si deux interlocuteurs ou plus servent le même lieu, FixMyStreet combin
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr "Si vous nous contacté pour un rapport ou une mise à jour spécifique, veuillez inclure un lien vers le rapport dans le message."
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr "Si vous générez un nouveau jeton, le jeton existant ne fonctionnera plus."
 
@@ -1901,7 +1945,7 @@ msgstr "Si vous voulez que seulement ce modèle soit une option pour des catégo
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "Si vous soumettez un problème ici, le problème <strong>ne sera pas </strong> signalé a l'administration."
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr "Si vous souhaitez utiliser ce modèle pour pré-remplir le champ de mise à jour lorsqu’un rapport <strong>externe</strong> (exemple: Confirmer) d’un rapport change, entrez le code d’état ici."
 
@@ -1940,7 +1984,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1964,6 +2008,17 @@ msgstr "En table d'abus ?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "En plus, les attributs suivants qui ne font pas partie de la spécification Open311 v2 sont renvoyés : agency_sent_datetime, title (qui est aussi renvoyé dans la description), interface_used, comment_count, requestor_name (seulement s'il est présent et que le requérant nous a autorisé à l'afficher sur le site)"
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "Voir les quartiers"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1973,20 +2028,20 @@ msgstr "Inactif"
 msgid "Inbox zero, here we come!"
 msgstr "Boîte de réception zéro, nous voilà!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Inclure les détails personnels du reporter"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Valeur has_photo invalide \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr "Inspecter le rapport"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "Instruire entrepreneurs pour résoudre les problèmes"
 
@@ -2003,16 +2058,12 @@ msgstr "Notes internes"
 msgid "Internal notes"
 msgstr "Notes internes"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Valeur agency_responsible invalide \"%s\""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Format spécifié %s invalide"
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Location invalide. Le nouvel emplacement doit être couvert par la même administration."
 
@@ -2064,13 +2115,13 @@ msgstr "Dernière actualisation :"
 msgid "Last&nbsp;update:"
 msgstr "Dernière&nbsp;actualisation :"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Latitude/Longitude:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Moins récemment mis à jour"
@@ -2087,7 +2138,7 @@ msgstr "Lister tous les problèmes rapportés"
 msgid "Loading reports…"
 msgstr "Chargement des rapports…"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Chargement…"
@@ -2125,17 +2176,18 @@ msgid "Log in with Twitter"
 msgstr "Se connecter avec Twitter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "Se connecter par email"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr "Connectez-vous avec email/texte"
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr "Se déconnecter de toutes les sessions"
 
@@ -2154,19 +2206,20 @@ msgstr "Chercher"
 msgid "MAP"
 msgstr "CARTE"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr "Rendre anonyme tous les rapports et mises à jour"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr "Gérer la liste"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr "Commande manuelle"
@@ -2180,24 +2233,24 @@ msgstr "Carte"
 msgid "Mark as sent"
 msgstr "Marqué comme envoyé"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Marquer les utilisateurs dont vous voulez surveiller le comportement comme <strong>cochés</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr "Marquer les détails du problème"
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Message"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Message à l'organisme compétent:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Message à l'organisme externe compétent:"
 
@@ -2210,7 +2263,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr "Organismes disparus :"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "jurisdiction_id manquant"
 
@@ -2218,8 +2271,7 @@ msgstr "jurisdiction_id manquant"
 msgid "Moderate"
 msgstr "Modérer"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Modérer les détails du rapport"
 
@@ -2242,7 +2294,7 @@ msgstr "Modifiez par %s à %s"
 msgid "Moderated by division within one working day"
 msgstr "Modéré par division dans le délai d'un jour ouvrable"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr "Historique de la modération"
@@ -2252,14 +2304,14 @@ msgstr "Historique de la modération"
 msgid "Month"
 msgstr "Mois"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Les plus commentés"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2287,9 +2339,10 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Nom :"
@@ -2307,7 +2360,7 @@ msgstr "Accédez à ce problème"
 msgid "Nearest calculated address:"
 msgstr "Adresse calculée la plus proche:"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Route la plus proche de l'épingle placée sur le plan (génerée automatiquement à partir d'OpenStreetMap): %s%s"
 
@@ -2315,12 +2368,12 @@ msgstr "Route la plus proche de l'épingle placée sur le plan (génerée automa
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Code postal le plus proche de l'épingle placée sur le plan (géneré automatiquement): %s (à %sm d'ici)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Route la plus proche de l'épingle placée sur le plan (génerée automatiquement à partir de Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2345,7 +2398,7 @@ msgstr "Presque fini! Maintenant, vérifiez votre téléphone&hellip;"
 msgid "New body added"
 msgstr "Nouveau body ajouté"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Nouveau contact de catégorie rajouté"
 
@@ -2359,8 +2412,8 @@ msgstr "Nouvelle adresse émail :"
 msgid "New field"
 msgstr "Sauvegarder de nouveaux champs"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nouvelle note interne:"
 
@@ -2368,13 +2421,13 @@ msgstr "Nouvelle note interne:"
 msgid "New local problems on FixMyStreet"
 msgstr "Nouveaux problèmes locaux sur FixMyStreet.fr"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Nouvelle note à DM:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Nouveau mot de passe :"
 
@@ -2451,7 +2504,7 @@ msgstr "Nouveau modèle"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr "Nouvelles mises à jour sur le rapport <a href=\"%s\">%s</a>"
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Plus récents"
@@ -2464,7 +2517,6 @@ msgstr "Suivant"
 msgid "Next:"
 msgstr "Suivant:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2473,11 +2525,11 @@ msgstr "Suivant:"
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Non"
 
@@ -2490,11 +2542,12 @@ msgstr "Groupe"
 msgid "No account?"
 msgstr "Vous n'avez pas de compte ?"
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Aucun intelocuteur"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Aucune administration sélectionnée"
 
@@ -2510,8 +2563,8 @@ msgstr "Aucun problème coché trouvé."
 msgid "No flagged users found."
 msgstr "Aucun utilisateur coché trouvé."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Pas d'autres mises à jour"
 
@@ -2549,8 +2602,8 @@ msgstr "Aucun supporter"
 msgid "None"
 msgstr "Aucun"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
@@ -2558,8 +2611,8 @@ msgstr ""
 "Les utilisateurs (publics) ne doivent pas être associés à toute <strong> zone </strong>. <br>\n"
 "Le personnel autorisés peuvent être associés à la zone dans laquelle ils opèrent."
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2571,10 +2624,14 @@ msgstr ""
 "Suivant l'implémentation, les utilisateurs autorisés peuvent avoir accès au tableau de bord (résumé de \n"
 "l'activité concernant leur interloculteur), et la faculté de cacher des rapports ou de définir des statuts spéciaux pour les rapports."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Pas pour ma subdivision"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Jamais signalé"
@@ -2623,12 +2680,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr "Données hors ligne effacées"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr "Données de mise à jour hors ligne enregistrées"
 
@@ -2636,12 +2693,12 @@ msgstr "Données de mise à jour hors ligne enregistrées"
 msgid "Old state"
 msgstr "Ancien état"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Plus anciens"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr "De la part de %s"
 
@@ -2650,7 +2707,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2681,7 +2738,7 @@ msgstr "Page web de l'initiative Open311"
 msgid "Open311 specification"
 msgstr "Spécification Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr "Options"
 
@@ -2693,7 +2750,7 @@ msgstr "Ou <a href=\"/\">rechercher un lieu différent</a>"
 msgid "Or sign in with password to prefill this information."
 msgstr "Ou connectez-vous avec un mot de passe pour pré-remplir ces informations."
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr "Ou abonnez-vous par RSS"
 
@@ -2701,16 +2758,16 @@ msgstr "Ou abonnez-vous par RSS"
 msgid "Order"
 msgstr "Commander"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2742,7 +2799,7 @@ msgstr "Page Introuvable"
 msgid "Parent"
 msgstr "Parent"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Autres catégories"
@@ -2751,13 +2808,13 @@ msgstr "Autres catégories"
 msgid "Partial"
 msgstr "Partiel"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Mot de passe (facultatif)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Votre mot de passe a été changé"
@@ -2772,7 +2829,7 @@ msgstr "Mot de passe (facultatif)"
 msgid "Permissions"
 msgstr "Autorisations :"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Autorisations :"
 
@@ -2780,19 +2837,24 @@ msgstr "Autorisations :"
 msgid "Permit blank updates"
 msgstr "Autoriser les mises à jour vierges"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Téléphone"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr "Téléphone Reporter:"
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Téléphone (facultatif)"
 
@@ -2800,30 +2862,26 @@ msgstr "Téléphone (facultatif)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr "Les numéros de téléphone sont limités à %s caractères."
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr "Téléphone vérifié:"
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Téléphone"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2843,9 +2901,8 @@ msgstr "Photo requise"
 msgid "Photo upload failed."
 msgstr "Échec du téléchargement de la photo."
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Photos"
@@ -2854,7 +2911,7 @@ msgstr "Photos"
 msgid "Photos of recent nearby reports"
 msgstr "Photos de rapports récents à proximité"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2868,6 +2925,11 @@ msgstr "Choisissez votre administration"
 msgid "Pick your ward"
 msgstr "Choisissez votre quartier"
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Placer l'épingle sur la carte"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2895,27 +2957,26 @@ msgid "Please check your email address is correct"
 msgstr "Merci de vérifier que votre adresse email est correcte"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr "Veuillez vérifier que votre numéro de téléphone est correct"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Merci de sélectionner une catégorie"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr "Veuillez choisir un mot de passe moins utilisé"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2937,27 +2998,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Merci de ne pas être injurieux&nbsp;&mdash; Calomnier l'administration dévalue le service pour tous les utilisateurs."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Merci d'entrer un message"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr "Merci d’entrer un numéro de téléphone portable"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Merci d'entrer un nom"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "S'il vous plaît entrez un nom pour cet organisme"
 
@@ -2970,16 +3031,16 @@ msgstr "Merci d'entrer un mot de passe :"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Merci d'enter un sujet"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2990,20 +3051,20 @@ msgstr "Merci d'entrer un email valide"
 msgid "Please enter a valid email address"
 msgstr "Merci d'entrer une adresse email valide"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr "Veuillez entrer un email ou un numéro de téléphone valide"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Merci d'entrer quelques détails"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -3019,7 +3080,7 @@ msgid "Please enter your first name"
 msgstr "Saisissez votre prénom"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Merci de saisir votre nom complet, les administrations ont besoin de cette information. Si vous ne souhaitez pas que votre nom soit affiché sur ce site, décochez la case ci-dessous"
@@ -3031,9 +3092,9 @@ msgstr "Merci de saisir votre nom"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Merci de saisir votre nom"
@@ -3074,19 +3135,19 @@ msgstr "Merci de remplir le formulaire ci-dessous avec les détails du problème
 msgid "Please generate a two-factor code and enter it below:"
 msgstr "Veuillez générer un code à deux facteurs et entrez-le ci-dessous:"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Merci d'indiquer si vous souhaitez recevoir un autre questionnaire"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Merci d'entrer une adresse email valide"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr "Veuillez vous assurer que votre mot de passe comporte au moins %d caractères"
@@ -3113,24 +3174,28 @@ msgstr "Veuillez noter que votre mise à jour n'a <strong> pas encore été post
 msgid "Please note:"
 msgstr "Quelques remarques :"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr "Veuillez fournir un ID en double ou une mise à jour publique pour ce rapport."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr "Veuillez fournir une mise à jour publique de ce rapport."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Merci d'expliquer pourquoi vous ré-ouvrez ce rapport"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Merci de fournir du texte ainsi qu'une photo."
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Merci de nous dire si vous avez signalé un problème à une administration auparavant."
 
@@ -3138,7 +3203,7 @@ msgstr "Merci de nous dire si vous avez signalé un problème à une administrat
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Veuillez sélectionner une administration."
 
@@ -3150,7 +3215,7 @@ msgstr "Merci de sélectionner le type de flux que vous voulez"
 msgid "Please select the type of alert you want"
 msgstr "Merci de sélectionner le type d'alerte que vous voulez"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Merci de préciser si le problème a été réglé ou non."
 
@@ -3158,12 +3223,12 @@ msgstr "Merci de préciser si le problème a été réglé ou non."
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Veuillez uniquement envoyer une image"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr "Merci de vérifier au moins l’un des e-mail/téléphone"
 
@@ -3171,27 +3236,23 @@ msgstr "Merci de vérifier au moins l’un des e-mail/téléphone"
 msgid "Please write a message"
 msgstr "Merci de saisir un message"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Envoyer"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr "Code postal ou nom de rue et zone"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Signalé anonymement à %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Signalé par %s à %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Envoyé par <strong>%s</strong> (%s) à %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Envoyé par <strong>%s</strong> à %s"
 
@@ -3207,7 +3268,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3215,11 +3276,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Précédent"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Priorités"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Priorité"
@@ -3235,9 +3296,9 @@ msgid "Privacy and cookies"
 msgstr "Vie privée et cookies"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privé"
 
@@ -3287,7 +3348,7 @@ msgstr "Problème %d signalé à l’administration %s"
 msgid "Problem breakdown by state"
 msgstr "Répartition des problèmes par état"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problème signalé comme ouvert."
 
@@ -3295,8 +3356,7 @@ msgstr "Problème signalé comme ouvert."
 msgid "Problem state change based on survey results"
 msgstr "Changement état des problèmes d'après résultats sondage"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problèmes"
@@ -3321,18 +3381,18 @@ msgstr "Problèmes récemment signalés sur FixMyStreet.fr"
 msgid "Problems within %.1fkm of %s"
 msgstr "Problèmes entre %.1fkm de %s "
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problèmes à l'intérieur de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problèmes dans la localité %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr "Problèmes entre%squartier,%s"
 
@@ -3340,7 +3400,7 @@ msgstr "Problèmes entre%squartier,%s"
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Problèmes dans %s, %s"
 
@@ -3348,11 +3408,15 @@ msgstr "Problèmes dans %s, %s"
 msgid "Property address:"
 msgstr "Adresse de propriété:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3366,11 +3430,11 @@ msgstr "Apporter une mise à jour"
 msgid "Provide update as"
 msgstr "Fournir la mise à jour comme"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Un mot de passe n'est pas obligatoire, mais vous permettra de créer, mettre à jour et administrer vos rapports plus facilement."
 
@@ -3378,12 +3442,12 @@ msgstr "Un mot de passe n'est pas obligatoire, mais vous permettra de créer, me
 msgid "Public details"
 msgstr "Détails public"
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Réponse publique:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Mise à jour publique :"
 
@@ -3426,11 +3490,11 @@ msgstr "Questionnaire rempli par le requérant"
 msgid "RSS feed"
 msgstr "Flux RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "Flux RSS pour %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "Flux RSS pour la localité %s, %s"
 
@@ -3438,11 +3502,11 @@ msgstr "Flux RSS pour la localité %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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "Flux RSS de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "Flux RSS de %s, dans la localité %s"
 
@@ -3450,13 +3514,13 @@ msgstr "Flux RSS de %s, dans la localité %s"
 msgid "RSS feed of nearby problems"
 msgstr "Flux RSS de problèmes à proximité"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "Flux RSS des problèmes à l'intérieur de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "Flux RSS de problèmes à l'intérieur de la localité %s"
 
@@ -3470,11 +3534,11 @@ msgstr "Flux RSS des problèmes locaux récents"
 msgid "RSS feed of updates to this problem"
 msgstr "Flux RSS des mises à jour pour ce problème"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3487,7 +3551,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Etre informé par courriel lorsque ce problème est mis à jour."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr "Reçu par %s un peu plus tard"
 
@@ -3501,7 +3565,7 @@ msgstr "Les problèmes récents, %s"
 msgid "Recently reported problems"
 msgstr "Problèmes signalés récemment"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Récemment mis à jour"
@@ -3514,7 +3578,8 @@ msgstr "Rejeter le rapport"
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Rappelez-vous que FixMyStreet est principalement destiné au signalement de problèmes physiques qui peuvent être résolus. Si votre problème ne convient pas pour être soumis via ce site, n'oubliez pas que vous pouvez contacter votre administration directement à l'aide de leur propre site web."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr "Supprimer les détails du compte"
 
@@ -3526,8 +3591,8 @@ msgstr "Retirer le champ"
 msgid "Remove flag"
 msgstr "Effacer le signalement"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3543,17 +3608,22 @@ msgstr "Retirer du site"
 msgid "Remove option"
 msgstr "Retirer le champ"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Effacer la photo (ne peut pas être annulé !)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Modifier les autorisations des autres utilisateurs"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr "Remplacer le jeton"
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Répondre à l'utilisateur:"
 
@@ -3561,14 +3631,14 @@ msgstr "Répondre à l'utilisateur:"
 msgid "Report"
 msgstr "Rapport"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "Rapport ID :"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3577,7 +3647,7 @@ msgid "Report a problem"
 msgstr "Signaler un problème"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr "Signaler un problème ici"
@@ -3593,7 +3663,7 @@ msgid "Report anonymously"
 msgstr "Signalé anonymement à %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3629,7 +3699,7 @@ msgstr "Signalez des incidents sur l’espace public et participez à l’améli
 msgid "Report, view, or discuss local problems"
 msgstr "Signalez et suivez les problèmes locaux"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Signalé anonymement à %s"
@@ -3640,7 +3710,7 @@ msgstr "Signalé anonymement à %s"
 msgid "Reported before"
 msgstr "Signalé avant"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Signalé par %s à %s"
@@ -3654,27 +3724,27 @@ msgstr "Rapporté par:"
 msgid "Reported in the %s category"
 msgstr "Rapporté dans la catégorie %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Signalé dans la catégorie %s anonymement à %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Signalé dans la catégorie %s par %s à %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Signalé par %s anonymement à %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Signalé par %s par %s à %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Signalé par %s dans la catégorie %s anonymement à %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Signalé par %s dans la catégorie %s par %s"
 
@@ -3693,17 +3763,15 @@ msgstr "Remis:"
 msgid "Reporting a problem"
 msgstr "Signalisation d'un problème"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Rapports"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3731,15 +3799,15 @@ msgid "Reports published"
 msgstr "Rapports publiés"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr "Rapports enregistrés hors ligne."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr "Rapports envoyés à %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr "Rapports envoyés à %s, entre %s quartier"
 
@@ -3752,7 +3820,7 @@ msgstr "Rapports en attente d'être envoyés"
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr "Obligatoire"
 
@@ -3805,39 +3873,45 @@ msgstr "Revenir au titre original"
 msgid "Right place?"
 msgstr "Lieu correct?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "L'opérateur pour cette route (déterminé à partir de la référence et du type de la route): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "L'opérateur pour cette route (selon OpenStreetMAp): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Pivoter à gauche"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3853,20 +3927,20 @@ msgstr "La rotation de cette photo annulera les modifications non enregistrées
 msgid "Satellite"
 msgstr "Satellite"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr "Enregistrer + fermer en double"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3883,13 +3957,12 @@ msgid "Save with a public update"
 msgstr "Sauvegardez avec une mise à jour publique"
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr "Enregistrement des rapports hors ligne"
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Rechercher rapports"
 
@@ -3902,7 +3975,7 @@ msgstr "Rechercher les utilisateurs"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Rechercher les rapports"
 
@@ -3917,12 +3990,12 @@ msgstr "Rechercher :"
 msgid "Searching found no reports."
 msgstr "Aucun rapport trouvé lors de la recherche."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Aucun utilisateur trouvé lors de la recherche."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr "Sécurité"
@@ -3932,8 +4005,7 @@ msgstr "Sécurité"
 msgid "See our privacy policy"
 msgstr "Voir notre politique de confidentialité"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr "Voir les détails des utilisateurs pour les rapports créés en tant que conseil"
 
@@ -3943,7 +4015,7 @@ msgid "Select a body"
 msgstr "Sélectionnez un interlocuteur"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Sélectionnez une zone"
@@ -3964,7 +4036,7 @@ msgstr "Sélectionnez plusieurs quartiers?"
 msgid "Select:"
 msgstr "Sélectionner :"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr "Envoyé"
@@ -3977,7 +4049,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr "Envoyer un statuts Open311 étendus avec des mises à jour de demande de service"
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr "Envoyer un e-mail de connexion"
 
@@ -3986,11 +4058,11 @@ msgstr "Envoyer un e-mail de connexion"
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr "L’envoi d’un texte de confirmation a échoué: \"%s\""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "Envoyé le rapport en retour"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Envoyé à %s %s plus tard)"
 
@@ -4028,7 +4100,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr "Liste"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr "Liste abrégée visible"
 
@@ -4039,7 +4111,7 @@ msgstr "Liste abrégée visible"
 msgid "Shortlisted"
 msgstr "Shortlisté"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr "Shortlisté par %s"
@@ -4064,8 +4136,8 @@ msgstr "Afficher le nom publiquement ?"
 msgid "Show older"
 msgstr "Montrer les plus vieux"
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr "Afficher les anciens rapports"
 
@@ -4076,7 +4148,7 @@ msgstr "Afficher la photo"
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Montrer les épingles"
 
@@ -4138,7 +4210,7 @@ msgid "Some photos of recent reports"
 msgstr "Photos de rapports récents"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Du texte pour localiser"
 
@@ -4147,12 +4219,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Désolé, ceci semble être un code postal d'une dépendance de la Couronne, que nous ne couvrons pas."
 
@@ -4170,9 +4241,9 @@ msgstr "Désolé, ce n’était pas le bon code"
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Désolé, il n'y a eu une erreur lors de la confirmation de votre problème."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Désolé, nous n'avons pas pu trouver cet emplacement."
 
@@ -4182,13 +4253,13 @@ msgstr "Désolé, nous n'avons pas pu trouver cet emplacement."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr "Désolé, nous ne pouvons pas vous connecter pour le moment. Veuillez compléter le formulaire ci-dessous."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessayer."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4206,11 +4277,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr "Désolé, vous n'êtes pas autorisé à faire cette action."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Trier par"
@@ -4220,11 +4291,11 @@ msgstr "Trier par"
 msgid "Staff only"
 msgstr "Personnel :"
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr "Les utilisateurs du personnel ont la permission de se connecter à l'administration du site."
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr "Personnel :"
 
@@ -4248,18 +4319,18 @@ msgstr "Date de début"
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "État actuel"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr "L’état et le code d’état externe ne peuvent pas etre utilisés simultanément."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4268,31 +4339,28 @@ msgstr "L’état a changé pour:"
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "État actuel :"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr "État"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Statistiques"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Statut"
 
@@ -4310,7 +4378,7 @@ msgstr "Street View"
 msgid "Subcategory"
 msgstr "Sous-catégorie"
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Subdivision/Interlocuteur"
 
@@ -4329,50 +4397,48 @@ msgstr "Sujet :"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Envoyer"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Envoyer les modifications"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Envoi du questionnaire"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Soumis"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "S'abonner"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr "S’abonner par email"
 
@@ -4385,7 +4451,7 @@ msgstr "Abonné:"
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Les résumés sont limités à  {0} caractères. Veuillez raccourcir votre résumé"
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4399,20 +4465,19 @@ msgstr "Les résumés sont limités à  {0} caractères. Veuillez raccourcir vot
 msgid "Summarise the problem"
 msgstr "Résumer le problème"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Résumez vos modifications"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Résumé"
 
@@ -4423,14 +4488,20 @@ msgstr "Rapports résumés"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr "Statistiques récapitulatives"
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Superuser"
+msgstr "Superuser :"
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr "Superuser :"
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "Supeusers ont l'autorisation d'effectuer des <strong> toutes les actions </strong> au sein de l'administration du site."
 
@@ -4448,13 +4519,18 @@ msgstr "A propos de vous"
 msgid "Template &laquo;%s&raquo;"
 msgstr "Modèle &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Modèles"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Moins récemment mis à jour"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Texte"
@@ -4476,6 +4552,11 @@ msgstr "Version texte seulement"
 msgid "Text:"
 msgstr "Texte :"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Texte"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Merci d’avoir signalé ce problème!"
@@ -4505,7 +4586,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Merci, heureux d'apprendre que cela a été résolu ! Pourrions-nous juste vous demander si vous aviez déjà signalé un problème à une administration auparavant ?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4517,27 +4598,29 @@ msgstr "Cette image ne ​​semble pas avoir été chargée correctement (% s),
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Ce lieu ne semble pas être couvert par une administration; peut-être est elle en dehors de la zone couverte. Merci de le saisir à nouveau."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Ce lieu ne semble pas ce trouver au Royaume-Uni; Merci de le saisir à nouveau."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Ce code postal n'a pas été reconnu, désolé."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Ce problème a été marqué comme envoyé."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Ce problème va maintenant être renvoyé."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Ce rapport a été retiré de FixMyStreet.fr."
 
@@ -4587,8 +4670,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4647,7 +4730,7 @@ msgstr "L'erreur était : %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "Les attributs Open311 v2 suivants sont retournés pour chaque requête : service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code et service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "Les informations suivantes au sujet de la route la plus proche pourrait être inexactes ou non pertinentes si le problème est proche de plusieurs routes ou près d'une route sans nom enregistré dans OpenStreetMap."
 
@@ -4710,8 +4793,8 @@ msgstr "L'utilisateur n'a pas pu localiser le problème sur une carte, mais pour
 msgid "The user has been sent a login email"
 msgstr "L’utilisateur a reçu un email de connexion"
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4747,7 +4830,7 @@ msgstr "Nous connaissons déjà des problèmes similaires à proximité. L’un
 msgid "There is already a template with that title."
 msgstr "Il existe déjà un modèle de réponse automatique pour cette catégorie/Emplacement."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr "Il existe déjà un modèle de réponse automatique pour cette catégorie/Emplacement."
 
@@ -4765,12 +4848,12 @@ msgstr "Il y a eu un problème pour afficher cette page. Merci de réessayer ult
 msgid "There was a problem with your login information."
 msgstr "Il y avait un problème avec vos informations de connexion."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr "Il y a un problème avec vos informations de connexion. Si vous ne vous souvenez plus de votre mot de passe ou n’en avez pas, veuillez remplir le champ ‘Non’ du formulaire."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Il y a un problème avec votre mise à jour. Réessayez s'il vous plaît."
 
@@ -4778,7 +4861,7 @@ msgstr "Il y a un problème avec votre mise à jour. Réessayez s'il vous plaît
 msgid "There were problems with your report. Please see below."
 msgstr "Il y a un problème avec votre rapport. Voir s'il vous plaît plus bas."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Il y a un problème avec votre mise à jour. Voir s'il vous plaît plus bas."
 
@@ -4862,10 +4945,10 @@ msgstr "Cet email a été envoyé aux deux administrations couvrant l'emplacemen
 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 "Cet email a été envoyé à plus d'une administration couvrant l'emplacement du problème, la catégorie de problème choisie par l'utilisateur étant présente pour chacune d'entre elles ; ignorez-le s'il vous plaît si vous n'êtes pas l'administration responsable pour la question."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Ces renseignements sont nécessaires"
 
@@ -4882,19 +4965,23 @@ msgstr "Ceci est le texte <strong>public</strong> qui sera affiché sur le site.
 msgid "This is the problem"
 msgstr "Voici le problème"
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr "Cette page est un moyen rapide de créer de nombreux nouveaux utilisateurs en une seule fois."
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Ce problème a été résolu"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Ce problème n'a pas été résolu"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr "Ce problème est toujours en cours"
 
@@ -4907,26 +4994,26 @@ msgstr "Ce rapport"
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr "Ce rapport est un dupliqua. Veuillez mettre è jour le rapport original:"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Ce rapport attend une modération."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Ce rapport est actuellement marqué comme fermé."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Ce rapport est actuellement marqué comme résolu."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Ce rapport est actuellement marqué comme ouvert."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr "Ce rapport est maintenant fermé aux mises à jour."
 
@@ -4934,15 +5021,18 @@ msgstr "Ce rapport est maintenant fermé aux mises à jour."
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Cette page Web contient également une photo du problème, fournie par l'utilisateur."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Le temps passé (en minutes):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4966,6 +5056,10 @@ msgstr "Titre"
 msgid "Title:"
 msgstr "Titre:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "Pour savoir quelles sont les alertes locales pour vous, s'il vous plaît entrez le code postal de votre %s, le nom de la rue et de la commune:"
@@ -4992,7 +5086,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "Pour voir une carte de l'emplacement précis de ce problème"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 #, fuzzy
 msgid "Token"
 msgstr "Jeton:"
@@ -5018,11 +5112,6 @@ msgstr "Les 5 meilleurs quartiers"
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr "La gestion du trafic est nécessaire ?"
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr "Traduction"
@@ -5045,17 +5134,17 @@ msgstr "Essayez en nous envoyant un e-mail directement:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 #, fuzzy
 msgid "Two-factor authentication"
 msgstr "Activer l’authentification à deux facteurs"
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr "L’authentification à deux facteurs a été activée"
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr "L’authentification à deux facteurs a été désactivée"
 
@@ -5065,7 +5154,7 @@ msgstr "L’authentification à deux facteurs a été désactivée"
 msgid "Type"
 msgstr "Type"
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr "Débannir"
 
@@ -5095,10 +5184,10 @@ msgstr "erreur inconnue"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "ID de problème inconnu"
 
@@ -5110,13 +5199,13 @@ msgstr "ID de mise à jour inconnu"
 msgid "Unshortlisted"
 msgstr "Dé-Sélectionné"
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr "Remonter d’un"
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Mise à jour"
 
@@ -5167,29 +5256,27 @@ msgstr "Mettre a jour le problème réouvert"
 msgid "Update statuses"
 msgstr "Mettre à jour les statuts"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr "Mis à par <strong>%s</strong> (%s) à %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr "Mis à par <strong>%s</strong> à %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Mis à jour !"
 
@@ -5200,7 +5287,7 @@ msgstr "Mis à jour !"
 msgid "Updates"
 msgstr "Mises à jour"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Les mises à jour sont limitées à %s caractères de long. Merci de raccourcir votre texte"
 
@@ -5230,6 +5317,14 @@ msgstr "Utiliser l'extension de mise à jour d'envoi Open311"
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr "ID utilisateur de récupération des commentaires à"
@@ -5243,8 +5338,8 @@ msgstr "Import utilisateur"
 msgid "User added to abuse list"
 msgstr "Utilisateur ajouté à la liste d’abus"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr "L’utilisateur existe déjà"
 
@@ -5262,7 +5357,7 @@ msgid "User flagged"
 msgstr "Utilisateur signalé"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr "Utilisateur dans le tableau d’abus"
@@ -5275,27 +5370,25 @@ msgstr "La recherche utilisateurs parcourt les noms et adresses courriel."
 msgid "User's alerts"
 msgstr "Alertes de l'utilisateur"
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr "Utilisateur:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr "Les utilisateurs peuvent effectuer les actions suivantes concernant leur administration ou dans la zone affectée."
 
@@ -5304,9 +5397,9 @@ msgstr "Les utilisateurs peuvent effectuer les actions suivantes concernant leur
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr "Les utilisateurs peuvent effectuer les actions suivantes concernant leur administration ou dans la zone affectée."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Valeurs mises à jour"
 
@@ -5332,7 +5425,7 @@ msgstr "Vérifier votre numéro de téléphone"
 msgid "View report on site"
 msgstr "Voir le rapport sur le site"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Afficher les rapports par quartier"
 
@@ -5340,7 +5433,7 @@ msgstr "Afficher les rapports par quartier"
 msgid "View wards"
 msgstr "Voir les quartiers"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr "Voir / Marquer les rapports privés"
 
@@ -5358,7 +5451,7 @@ msgstr "Consultation d'un problème"
 msgid "Ward:"
 msgstr "Quartier:"
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Localités de cette administration"
 
@@ -5428,7 +5521,7 @@ msgstr "Envoyé le"
 msgid "Which problems do you want alerts about?"
 msgstr "De quels problèmes voulez-vous alerter?"
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr "De quel rapport ? s’agit-il d’un double exemplaire?"
 
@@ -5448,7 +5541,7 @@ msgstr "Dans les délais spécifiés:"
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "Aimeriez-vous contribuer à FixMyStreet? Notre code est open source et <a href=\"http://fixmystreetf.org\"> disponible sur fixmystreet.org </a>"
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Aimeriez-vous recevoir un autre questionnaire dans 4 semaines, pour vous rappeler de vérifier l'état?"
 
@@ -5460,7 +5553,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Si vous rédigez votre message entièrement en capitales, ou sans ponctuation, il sera difficile à lire."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5471,12 +5563,12 @@ msgstr "Si vous rédigez votre message entièrement en capitales, ou sans ponctu
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Oui"
 
@@ -5489,7 +5581,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr "vous êtes hors ligne"
 
@@ -5502,7 +5594,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Vous signalez la mise à jour suivante comme étant violente, contenant des renseignements personnels, ou similaires :"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr "Vous pouvez <a href=\"%s\"> créer un nouveau rapport au même endroit.</a>."
 
@@ -5511,7 +5603,7 @@ msgstr "Vous pouvez <a href=\"%s\"> créer un nouveau rapport au même endroit.<
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Vous pouvez <a href=\"%s%s\">consulter le problème sur ce site</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Vous pouvez ajouter un courriel d'utilisateur abusif dans la liste des abus, qui cache automatiquement (et n'envoie jamais) les rapports qu'ils crèent."
 
@@ -5544,7 +5636,7 @@ msgstr "Vous pouvez nous aider en trouvant une adresse e-mail de contact pour le
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Vous pouvez marqué un interlocuteur comme supprimé si vous ne voulez pas qu'il soit actif sur le site."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5554,7 +5646,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Vous avez refusé; merci de remplir le champ ci-dessus"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr "vous avez <a id=\"oFN\" href=\"\"><span>%s</span> sauvegradé à publié</a>."
 
@@ -5562,7 +5654,7 @@ msgstr "vous avez <a id=\"oFN\" href=\"\"><span>%s</span> sauvegradé à publié
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Vous avez déjà répondu à ce questionnaire. Si vous avez une question, <a href='%s'>entrez en contact avec nous</a>, ou <a href='%s'>affichez votre problème</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 #, fuzzy
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Vous avez déjà joint les photos de ce rapport. Notez que vous pouvez joindre un maximum de 3 photos par déclaration (si vous en télécharger plus, le plus ancien est supprimé)."
@@ -5572,8 +5664,7 @@ msgstr "Vous avez déjà joint les photos de ce rapport. Notez que vous pouvez j
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Vous avez déjà joint les photos de ce rapport. Notez que vous pouvez joindre un maximum de 3 photos par déclaration (si vous en télécharger plus, le plus ancien est supprimé)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr "Il y a déjà des photos pour cette mise à jour. veuillez noter que vous pouvez joindre un maximum de 3 photos sur cette mise à jour (si vous en envoyez plus, la plus ancienne sera supprimée)."
 
@@ -5637,9 +5728,9 @@ msgstr "Vos rapports"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Votre compte"
@@ -5649,13 +5740,14 @@ msgstr "Votre compte"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr "Désactiver l’authentification à deux facteurs"
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5684,16 +5776,16 @@ msgstr "Votre nom"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr "Votre nom a déjà été envoyé, mais nous pouvons le cacher sur cette page:"
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr "Votre nom a été caché de tous vos rapports et mises à jour."
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr "Votre nom a été caché."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr "Vos rapports hors ligne"
 
@@ -5714,8 +5806,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr "Connectez-vous par e-mail à la place en fournissant un nouveau mot de passe. Lorsque vous cliquez sur le lien dans votre e-mail, votre mot de passe sera mis à jour."
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr "Votre mot de passe doit inclure %d ou plus de caractères."
@@ -5748,7 +5840,7 @@ msgid "Your update"
 msgstr "Votre mise à jour"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr "Votre mise à jour a été sauvegardée en mode hors connexion pour la soumission en ligne."
 
@@ -5779,19 +5871,19 @@ msgstr "admin"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "Tous"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr "un administrateur"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr "et un défaut soulevé"
 
@@ -5799,8 +5891,8 @@ msgstr "et un défaut soulevé"
 msgid "by %s"
 msgstr "par %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "administration"
 
@@ -5831,6 +5923,10 @@ msgstr "saisissez l'utilisateur"
 msgid "from %s different users"
 msgstr "de %s utilisateurs différents"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5848,7 +5944,7 @@ msgstr "s.o."
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr "aucun"
 
@@ -5931,12 +6027,12 @@ msgid "today"
 msgstr "aujourd'hui"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr "mettre à jour"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr "mises à jour"
 
@@ -5961,7 +6057,7 @@ msgid "user removed from abuse list"
 msgstr "utilisateur supprimé de la liste d’abus"
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "localité"
 
@@ -6021,7 +6117,7 @@ msgid_plural "%d years"
 msgstr[0] "%d année "
 msgstr[1] "%d année"
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6042,7 +6138,7 @@ msgid_plural "%s problems reported"
 msgstr[0] "%s problème signalé "
 msgstr[1] "%s problèmes signalés"
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6063,21 +6159,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> résolu le mois passé"
 msgstr[1] "<big>%s</big> résolus le mois passé"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> rapport la semaine passée"
 msgstr[1] "<big>%s</big> rapports la semaine passée"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> rapport récemment"
 msgstr[1] "<big>%s</big> rapports récemment"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6112,20 +6208,38 @@ msgid_plural "last updated %d days ago"
 msgstr[0] "dernier enregistrement %d jours"
 msgstr[1] "dernière %d mise à jour"
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] "month"
 msgstr[1] "mois"
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] "rapport"
 msgstr[1] "rapports"
 
+#~ msgid "Closed by council"
+#~ msgstr "Clos par l'administration"
+
+#~ msgid "Current token:"
+#~ msgstr "Jeton actuel:"
+
+#~ msgid "Filter report list"
+#~ msgstr "Liste de filtres de rapport"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Valeur agency_responsible invalide \"%s\""
+
+#~ msgid "Post"
+#~ msgstr "Envoyer"
+
+#~ msgid "Traffic management required?"
+#~ msgstr "La gestion du trafic est nécessaire ?"
+
 #~ msgid "(ignored if type is \"String\")"
 #~ msgstr "(ignoré si le type est \"String\")"
 
@@ -6138,9 +6252,6 @@ msgstr[1] "rapports"
 #~ msgid "Automated"
 #~ msgstr "Automatique"
 
-#~ msgid "Available categories"
-#~ msgstr "Catégories disponibles"
-
 #~ msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (<code>meta.datatype_description</code>), you must add it in <code>category_extras_fields.html</code>"
 #~ msgstr "Peut être utilisé pour afficher du texte supplémentaire à l'utilisateur le long du champ. Le modèle par défaut ne montre pas ceci (<code>meta.datatype_description</code>), vous devez l’ajouter <code>category_extras_fields.html</code>"
 
diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po
index fcf382607..3ff3a47c5 100644
--- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2020-03-05 09:59+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>, 2020\n"
 "Language-Team: Hebrew (Israel) (https://www.transifex.com/mysociety/teams/12067/he_IL/)\n"
@@ -22,8 +22,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "וגם"
@@ -58,7 +58,7 @@ msgstr "%d משתמשים כבר היו קיימים"
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - דיווחי סיכום "
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "%s ref:&nbsp;%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; מתנדבי <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>"
 
@@ -159,6 +159,8 @@ msgstr "(לא קיים עוד)"
 msgid "(not sent to council)"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -177,8 +179,8 @@ msgstr "(נשלח לשניהם)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- נא לבחור קטגוריה --"
@@ -204,17 +206,18 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr "<h2>דיווחים, סטטיסטיקה ופעולות על</h2> <h1>%s</h1>"
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">הצגת</label> דיווחים מסוג %s <label for=\"filter_categories\">על</label> %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -244,7 +247,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>כן</strong> יש לי ססמה"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -261,7 +264,7 @@ msgid "Access denied"
 msgstr "הגישה נדחתה"
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr "הפעלת אימות דו־שלבי"
 
@@ -281,7 +284,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 msgid "Add another parent category"
 msgstr ""
 
@@ -313,7 +316,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "הוספת קטגוריה חדשה"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "הוספת אפשרות"
 
@@ -322,8 +325,8 @@ msgstr "הוספת אפשרות"
 msgid "Add phone number"
 msgstr "הוספת מספר טלפון"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -331,21 +334,20 @@ msgid "Add to shortlist"
 msgstr "הוספה לרשימה מקוצרת"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "הוספת משתמש"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "הוספה/עריכה של קטגוריות תקלות"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "הוספה/עריכה של עדיפויות מענה"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "הוספה/עריכה של תבניות תגובה"
 
@@ -361,6 +363,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "שוב:"
@@ -373,8 +381,8 @@ msgstr ""
 msgid "Alert %d disabled (created %s)"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "להודיע לי על עדכונים עתידיים"
 
@@ -386,10 +394,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "הכול"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "כל הדיווחים"
@@ -429,6 +439,10 @@ msgstr "כל הדיווחים בין %s לבין %s"
 msgid "All time"
 msgstr "מתישהו"
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+msgid "Allow anonymous reports on this category"
+msgstr ""
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr "כבר דווח?"
@@ -464,7 +478,7 @@ msgstr "אלמוני"
 msgid "Anonymous user"
 msgstr "משתמש אלמוני"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -477,7 +491,7 @@ msgid "Another user"
 msgstr "משתמש אחר"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "לבטל את ההעלאה הזאת?"
 
@@ -486,8 +500,8 @@ msgstr "לבטל את ההעלאה הזאת?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "להמשיך?"
@@ -498,7 +512,7 @@ msgstr "להמשיך?"
 msgid "Area covered"
 msgstr "שטח כיסוי"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "שטח:"
 
@@ -511,27 +525,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "כל הקטגוריות"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr ""
@@ -544,7 +563,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -552,11 +571,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr "מענה אוטומטי"
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "מענה אוטומטי:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -568,12 +587,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr ""
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "חזרה"
@@ -594,14 +614,12 @@ msgstr "חסימת משתמש"
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr ""
 
@@ -614,11 +632,13 @@ msgstr ""
 msgid "Body"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr ""
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr "קובץ CSV"
 
@@ -630,8 +650,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "אין לך אפשרות לצפות במפה? <em>ניתן לדלג על שלב זה</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -647,15 +666,13 @@ msgstr "קטגוריות:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -665,7 +682,7 @@ msgstr "קטגוריה"
 msgid "Category and State"
 msgstr "קטגוריה ומדינה"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -688,6 +705,11 @@ msgstr "קטגוריה"
 msgid "Change"
 msgstr "שינוי"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "החלפת ססמה"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -704,7 +726,7 @@ msgstr "החלפת ססמה"
 msgid "Change phone number"
 msgstr "החלפת מספר טלפון"
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -714,12 +736,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -756,8 +778,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -767,11 +789,7 @@ msgstr ""
 msgid "Closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr ""
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr "סגור לעדכונים"
 
@@ -804,13 +822,12 @@ msgid "Code"
 msgstr "קוד"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr "צמצום המפה"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "תצורה"
@@ -927,7 +944,7 @@ msgstr "יצירת דוח"
 msgid "Create an account"
 msgstr "יצירת חשבון"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "יצירת קטגוריה"
@@ -937,27 +954,25 @@ msgstr "יצירת קטגוריה"
 msgid "Create priority"
 msgstr "יצירת עדיפות"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr "יצירת דיווחים/עדכונים כמשתמש אלמוני"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "יצירת דיווחים/עדכונים בתור הוועדה"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "יצירת דיווחים/עדכונים בתור משתמש"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "יצירת תבנית"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr ""
@@ -966,6 +981,17 @@ msgstr ""
 msgid "Created %d new users"
 msgstr "נוצרו %d משתמשים חדשים"
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "יצירה"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "יצירה"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -977,10 +1003,6 @@ msgstr ""
 msgid "Current password:"
 msgstr "ססמה נוכחית:"
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr "אסימון נוכחי:"
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr "כרגע מקובץ לפי %s"
@@ -990,19 +1012,21 @@ msgstr "כרגע מקובץ לפי %s"
 msgid "Currently no bodies have been created."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "לוח מחוונים"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1014,7 +1038,7 @@ msgstr ""
 msgid "Default"
 msgstr "בררת מחדל"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1024,7 +1048,7 @@ msgid "Delete"
 msgstr "מחיקה"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "מחיקת תבנית"
@@ -1045,9 +1069,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "תיאור"
 
@@ -1055,7 +1077,7 @@ msgstr "תיאור"
 msgid "Destination"
 msgstr "יעד"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1091,7 +1113,7 @@ msgid "Disable"
 msgstr "השבתה"
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1099,6 +1121,14 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+msgid "Disable reopening of reports in this category"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+msgid "Disable updates on reports in this category"
+msgstr ""
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1133,24 +1163,24 @@ msgstr "לא ידוע לי"
 msgid "Don't like forms?"
 msgstr "לא בא לך על טפסים?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr "כפיל של"
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1162,7 +1192,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1174,7 +1204,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "עריכה"
@@ -1185,12 +1215,11 @@ msgstr "עריכה"
 msgid "Edit body details"
 msgstr "ערוך פרטי גוף"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1198,17 +1227,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "עריכת דוחות"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1245,8 +1272,9 @@ msgstr "עורך"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1255,15 +1283,14 @@ msgstr "עורך"
 msgid "Email"
 msgstr "דוא״ל"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "כתובת דוא״ל"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr "כתובת דוא״ל (רשות)"
 
@@ -1283,12 +1310,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "כתובת דוא״ל אומתה:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "דוא\"ל:"
@@ -1351,11 +1379,11 @@ msgstr "מועד סיום"
 msgid "Endpoint"
 msgstr "נקודת סיום"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1382,10 +1410,10 @@ msgstr "נא להקליד את פרטי התקלה"
 msgid "Error"
 msgstr "שגיאה"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "הכול"
 
@@ -1398,7 +1426,7 @@ msgstr ""
 msgid "Examples:"
 msgstr "דוגמאות:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "קטגוריה קיימת"
 
@@ -1407,7 +1435,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr "הרחבת המפה"
 
@@ -1432,7 +1460,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1444,20 +1472,20 @@ msgstr ""
 msgid "External team"
 msgstr "צוות חיצוני"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "שדות נוספים"
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "נתונים נוספים:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1490,20 +1518,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr ""
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "שם פרטי"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "תמונות של דיווחים אחרונים בקרבת מקום"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "דיווחים חדשים"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1533,7 +1566,7 @@ msgstr ""
 msgid "Flag user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr ""
@@ -1542,7 +1575,7 @@ msgstr ""
 msgid "Flagged reports and users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1550,8 +1583,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr ""
 
@@ -1577,11 +1610,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1591,12 +1624,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1618,7 +1659,7 @@ msgstr "קבלת עדכונים על %s תקלות"
 msgid "Get updates of problems in this %s"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr ""
 
@@ -1634,15 +1675,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1652,7 +1693,7 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1678,6 +1719,7 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1712,7 +1754,8 @@ msgstr ""
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1740,7 +1783,7 @@ msgstr "הסתרת השם שלי בדוח זה"
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "הסתרת נעצים"
 
@@ -1793,11 +1836,9 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "מזהה"
 
@@ -1816,15 +1857,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1838,7 +1879,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1862,7 +1903,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1899,7 +1940,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1923,6 +1964,17 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "מחלקה"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1932,20 +1984,20 @@ msgstr "בלתי פעיל"
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr "חקירת דוח"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "הנחיית קבלני ביצוע לתיקון תקלות"
 
@@ -1961,16 +2013,12 @@ msgstr ""
 msgid "Internal notes"
 msgstr "הערות פנימיות"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2021,13 +2069,13 @@ msgstr "עדכון אחרון:"
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2044,7 +2092,7 @@ msgstr ""
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "בטעינה…"
@@ -2082,17 +2130,18 @@ msgid "Log in with Twitter"
 msgstr "כניסה עם טוויטר"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "כניסה עם דוא״ל"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2110,19 +2159,20 @@ msgstr "חיפוש"
 msgid "MAP"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr "סדר ידני"
@@ -2136,24 +2186,24 @@ msgstr ""
 msgid "Mark as sent"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "הודעה"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2166,7 +2216,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -2174,8 +2224,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2198,7 +2247,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2208,14 +2257,14 @@ msgstr ""
 msgid "Month"
 msgstr "חודש"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2243,9 +2292,10 @@ msgstr ""
 msgid "Name"
 msgstr "שם"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "שם:"
@@ -2263,7 +2313,7 @@ msgstr "ניווט לבעיה הזאת"
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -2271,12 +2321,12 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2299,7 +2349,7 @@ msgstr ""
 msgid "New body added"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr ""
 
@@ -2312,8 +2362,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr ""
 
@@ -2321,13 +2371,13 @@ msgstr ""
 msgid "New local problems on FixMyStreet"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "ססמה חדשה:"
 
@@ -2404,7 +2454,7 @@ msgstr "תבנית חדשה"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2417,7 +2467,6 @@ msgstr ""
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2426,11 +2475,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr ""
 
@@ -2442,11 +2491,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr ""
 
@@ -2462,8 +2512,8 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr ""
 
@@ -2499,15 +2549,15 @@ msgstr "אין תומכים"
 msgid "None"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2515,10 +2565,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr ""
@@ -2566,12 +2620,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2579,12 +2633,12 @@ msgstr ""
 msgid "Old state"
 msgstr "מצב ישן"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr "בשם %s"
 
@@ -2593,7 +2647,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2624,7 +2678,7 @@ msgstr "אתר היזמה Open311"
 msgid "Open311 specification"
 msgstr "פירוט Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr "אפשרויות"
 
@@ -2636,7 +2690,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2644,16 +2698,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2685,7 +2739,7 @@ msgstr "העמוד לא נמצא"
 msgid "Parent"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 msgid "Parent categories"
 msgstr ""
 
@@ -2693,13 +2747,13 @@ msgstr ""
 msgid "Partial"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "ססמה (רשות)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
 msgstr ""
 
@@ -2711,7 +2765,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "הרשאות:"
 
@@ -2719,19 +2773,24 @@ msgstr "הרשאות:"
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "טלפון:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "מספר טלפון"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "מספר טלפון (רשות)"
 
@@ -2739,30 +2798,26 @@ msgstr "מספר טלפון (רשות)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "טלפון:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2782,9 +2837,8 @@ msgstr "נדרשת תמונה"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "תמונות"
@@ -2793,7 +2847,7 @@ msgstr "תמונות"
 msgid "Photos of recent nearby reports"
 msgstr "תמונות של דיווחים אחרונים בקרבת מקום"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2807,6 +2861,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "הצבת נעץ על מפה"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2834,27 +2893,26 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "נא לבחור קטגוריה"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2873,27 +2931,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "נא לכתוב הודעה"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr "נא להקליד מספר טלפון"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "נא להזין שם"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2906,16 +2964,16 @@ msgstr "נא להקליד ססמה"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "נא להקליד נושא"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2926,20 +2984,20 @@ msgstr "נא להקליד כתובת דוא״ל תקנית"
 msgid "Please enter a valid email address"
 msgstr "נא להקליד כתובת דוא״ל תקנית"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr "נא להקליד כתובת דוא״ל או טלפון תקניים"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2955,7 +3013,7 @@ msgid "Please enter your first name"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr ""
@@ -2966,9 +3024,9 @@ msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr ""
@@ -3009,18 +3067,18 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 msgid "Please make sure you are not including an email address"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3047,24 +3105,28 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -3072,7 +3134,7 @@ msgstr ""
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3084,7 +3146,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -3092,12 +3154,12 @@ msgstr ""
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3105,27 +3167,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr ""
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr ""
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -3141,7 +3199,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3149,11 +3207,11 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3169,9 +3227,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr ""
 
@@ -3217,7 +3275,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr ""
 
@@ -3225,8 +3283,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr ""
@@ -3251,18 +3308,18 @@ msgstr ""
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3270,7 +3327,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3278,11 +3335,15 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3296,11 +3357,11 @@ msgstr ""
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr ""
 
@@ -3308,12 +3369,12 @@ msgstr ""
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3355,11 +3416,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -3367,11 +3428,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -3379,13 +3440,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -3399,11 +3460,11 @@ msgstr ""
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3416,7 +3477,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3430,7 +3491,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3443,7 +3504,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3455,8 +3517,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3471,17 +3533,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3489,14 +3555,14 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3505,7 +3571,7 @@ msgid "Report a problem"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3520,7 +3586,7 @@ msgid "Report anonymously"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3555,7 +3621,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -3566,7 +3632,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr ""
@@ -3580,27 +3646,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -3619,17 +3685,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3657,15 +3721,15 @@ msgid "Reports published"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3678,7 +3742,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3731,39 +3795,45 @@ msgstr ""
 msgid "Right place?"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3779,20 +3849,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3809,13 +3879,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr ""
 
@@ -3828,7 +3897,7 @@ msgstr ""
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr ""
 
@@ -3843,12 +3912,12 @@ msgstr ""
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr "אבטחה"
@@ -3858,8 +3927,7 @@ msgstr "אבטחה"
 msgid "See our privacy policy"
 msgstr "הצגת מדיניות הפרטיות שלנו"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3869,7 +3937,7 @@ msgid "Select a body"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "בחירת אזור"
@@ -3890,7 +3958,7 @@ msgstr "לבחור מספר מחלקות?"
 msgid "Select:"
 msgstr "בחירה:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr "שליחה"
@@ -3903,7 +3971,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3912,11 +3980,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3954,7 +4022,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3965,7 +4033,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -3990,8 +4058,8 @@ msgstr "להציג את השם לקהל הרחב?"
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4002,7 +4070,7 @@ msgstr "הצגת תמונה"
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "הצגת נעצים"
 
@@ -4062,7 +4130,7 @@ msgid "Some photos of recent reports"
 msgstr "כל מיני תמונות של דיווחים אחרונים"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4071,12 +4139,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4094,9 +4161,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -4106,13 +4173,13 @@ msgstr ""
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4126,11 +4193,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4139,11 +4206,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4167,18 +4234,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4187,31 +4254,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr ""
 
@@ -4229,7 +4293,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4248,50 +4312,48 @@ msgstr ""
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4303,7 +4365,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4317,20 +4379,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr ""
 
@@ -4341,14 +4402,19 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4366,13 +4432,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr ""
@@ -4393,6 +4463,10 @@ msgstr ""
 msgid "Text:"
 msgstr ""
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+msgid "Textarea"
+msgstr ""
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4422,7 +4496,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4434,27 +4508,29 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
@@ -4500,8 +4576,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4555,7 +4631,7 @@ msgstr ""
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4617,8 +4693,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4651,7 +4727,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4669,12 +4745,12 @@ msgstr ""
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -4682,7 +4758,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -4758,10 +4834,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr ""
 
@@ -4778,19 +4854,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4803,26 +4883,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4830,15 +4910,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4862,6 +4945,10 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4887,7 +4974,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4912,11 +4999,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4939,16 +5021,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4958,7 +5040,7 @@ msgstr ""
 msgid "Type"
 msgstr "סוג"
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -4988,10 +5070,10 @@ msgstr "שגיאה לא ידועה"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "מזהה התקלה לא ידוע"
 
@@ -5003,13 +5085,13 @@ msgstr "מזהה העדכון לא ידוע"
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "עדכון"
 
@@ -5059,29 +5141,27 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr ""
 
@@ -5092,7 +5172,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5122,6 +5202,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5135,8 +5223,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5154,7 +5242,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5167,27 +5255,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5195,9 +5281,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr ""
 
@@ -5223,7 +5309,7 @@ msgstr ""
 msgid "View report on site"
 msgstr ""
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5231,7 +5317,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5249,7 +5335,7 @@ msgstr ""
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -5319,7 +5405,7 @@ msgstr "מתי נשלח"
 msgid "Which problems do you want alerts about?"
 msgstr "באילו תקלות מעניין אותך להתעדכן?"
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr "הדיווח הזה הוא כפיל של איזה דיווח?"
 
@@ -5339,7 +5425,7 @@ msgstr "במסגרת הזמן שצוינה:"
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr ""
 
@@ -5351,7 +5437,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5362,12 +5447,12 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "כן"
 
@@ -5380,7 +5465,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5393,7 +5478,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5402,7 +5487,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5432,7 +5517,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5442,7 +5527,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5450,7 +5535,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5459,8 +5544,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5524,9 +5608,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "החשבון שלך"
@@ -5535,13 +5619,14 @@ msgstr "החשבון שלך"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5570,16 +5655,16 @@ msgstr "השם שלך"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr "השם שלך מוסתר בכל הדיווחים והעדכונים שלך."
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr "השם שלך הוסתר."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr "הדיווחים הבלתי מקוונים שלך"
 
@@ -5599,8 +5684,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr "על הססמה שלך להכיל %d תווים או יותר."
@@ -5633,7 +5718,7 @@ msgid "Your update"
 msgstr "העדכון שלך"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr "העדכון שלך נשמר באופן בלתי מקוון להגשה בעת חידוש החיבור לאינטרנט."
 
@@ -5664,19 +5749,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "הכול"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5684,8 +5769,8 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr ""
 
@@ -5716,6 +5801,10 @@ msgstr "עריכת משתמש"
 msgid "from %s different users"
 msgstr "מ־%s משתמשים שונים"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5733,7 +5822,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5813,12 +5902,12 @@ msgid "today"
 msgstr "היום"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr "עדכון"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr "עדכונים"
 
@@ -5843,7 +5932,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "מחלקה"
 
@@ -5919,7 +6008,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5946,7 +6035,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5973,7 +6062,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
@@ -5982,7 +6071,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
@@ -5991,7 +6080,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6036,7 +6125,7 @@ msgstr[1] "עדכון אחרון שלשום (%d)"
 msgstr[2] "עדכון אחרון לפני %d ימים"
 msgstr[3] "עדכון אחרון לפני %d  ימים"
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
@@ -6045,7 +6134,7 @@ msgstr[1] "חודשיים"
 msgstr[2] "חודשים"
 msgstr[3] "חודשים"
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
@@ -6053,3 +6142,6 @@ msgstr[0] "דיווח"
 msgstr[1] "דיווחים"
 msgstr[2] "דיווחים"
 msgstr[3] "דיווחים"
+
+#~ msgid "Current token:"
+#~ msgstr "אסימון נוכחי:"
diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
index b41439aa3..70c53843c 100644
--- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Croatian (https://www.transifex.com/mysociety/teams/12067/hr/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "i"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Sažetak prijava"
 
@@ -111,7 +111,7 @@ msgstr "%s Upitnici poslani &ndash; %s odgovoreno (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> suradnici"
 
@@ -157,6 +157,8 @@ msgstr "(više ne postoji)"
 msgid "(not sent to council)"
 msgstr "(nije poslano odgovornom tijelu)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(poslano na obje adrese)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr "(također omogućavamo pretplate na RSS izvore za probleme unutar %s)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Izaberite kategoriju --"
@@ -205,17 +207,18 @@ msgstr ""
 "             Pokušajte dodati neke <code>MAPIT_TYPES</code> svom konfiguracijskom dokumentu?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr "<h2>Broj prijava, akcija i općih statistika za</h2> <h1>%s</h1>"
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Prikaži</label> %s prijave <label for=\"filter_categories\">u vezi:</label>  %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> spremljeno."
 
@@ -245,7 +248,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Da</strong> Imam svoju lozinku."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -262,7 +265,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr "Uključite dvo-stupanjsku provjeru za prijavu u sustav"
 
@@ -282,7 +285,7 @@ msgstr "Dodajte <strong>tijelo</strong> za svako tijelo javne vlasti, poput jedi
 msgid "Add a contact using the form below."
 msgstr "Dodajte podatke za kontakt koristeći obrazac koji se nalazi ispod."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Dodaj novu kategoriju"
@@ -315,7 +318,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Dodaj novu kategoriju"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "Dodajte opciju"
 
@@ -324,8 +327,8 @@ msgstr "Dodajte opciju"
 msgid "Add phone number"
 msgstr "Dodajte telefonski broj"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -333,21 +336,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Dodajte korisnika"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Dodajte ili uredite kategorije problema"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Dodajte ili uredite prioritete za odgovor"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Dodajte ili uredite predloške za odgovor"
 
@@ -363,6 +365,12 @@ msgstr ""
 msgid "Admin"
 msgstr "Administrator"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Još jednom:"
@@ -375,8 +383,8 @@ msgstr "Upozorenje %d kreirano za %s, tip %s, parametri%s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Upozorenje %d onemogućeno (kreirano%s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Javi mi buduće promjene"
 
@@ -388,10 +396,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Sve"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Sve Prijave"
@@ -431,6 +441,11 @@ msgstr "Sve prijave između %s i %s"
 msgid "All time"
 msgstr "Sva vremena"
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Prijavljeno u kategoriji %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -467,7 +482,7 @@ msgstr "Anonimno"
 msgid "Anonymous user"
 msgstr "Anonimni korisnik"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -480,7 +495,7 @@ msgid "Another user"
 msgstr "Drugi korisnik"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Jeste li sigurni da želite otkazati ovo slanje?"
 
@@ -489,8 +504,8 @@ msgstr "Jeste li sigurni da želite otkazati ovo slanje?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Jeste li sigurni?"
@@ -501,7 +516,7 @@ msgstr "Jeste li sigurni?"
 msgid "Area covered"
 msgstr "Područje pokrivenosti"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Područje:"
 
@@ -515,27 +530,32 @@ msgstr "Budući da je ovo probno-eksperimentalna stranica i %sne važi, prijave
 msgid "Assign selected to role:"
 msgstr "Pridodajte korisnike određenom području:"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Dodijelite nadležnom tijelu:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Promijenite kategoriju:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Dodijelite vanjskom tijelu:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Dodijelite radnoj jedinici:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "Pridodajte korisnike određenom području:"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Dostupne kategorije"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Dodijeljeno %s"
@@ -548,7 +568,7 @@ msgstr "Većinom %d su zahtjevi vraćeni na query.  Vraćeni zahtjevi poredani s
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Trenutačno radi samo pretraživanje i pregledavanje prijava."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr "Autorizirani korisnici mogu biti povezani s kategorijama u kojima djeluju."
 
@@ -556,11 +576,11 @@ msgstr "Autorizirani korisnici mogu biti povezani s kategorijama u kojima djeluj
 msgid "Auto Response"
 msgstr "Automatski odgovor"
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Automatski odgovor:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -572,12 +592,13 @@ msgstr "Prosječno vrijeme između dojave i rješenja problema (za posljednjih 1
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Izbjegavajte objavu osobnih informacija i registarske tablice vozila"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Čeka odluku moderatora"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Povratak"
@@ -598,14 +619,12 @@ msgstr "Zabranite korisniku pristup"
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Tijela"
 
@@ -618,11 +637,13 @@ msgstr "Tijela"
 msgid "Body"
 msgstr "Tijelo"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Tijelo"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -634,8 +655,7 @@ msgstr "Ne možete pronaći našu e-mail adresu u svom pretincu? Provjerite svoj
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Ne možete vidjeti mapu? <em>Preskoči ovaj korak</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -651,15 +671,13 @@ msgstr "Kategorije: "
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -669,7 +687,7 @@ msgstr "Kategorija"
 msgid "Category and State"
 msgstr "Kategorija i stanje"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Kategorija promijenjena iz \"%s\" u \"%s\""
 
@@ -692,6 +710,11 @@ msgstr "Kategorija:"
 msgid "Change"
 msgstr "Promijenite"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Promijenite lozinku"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -708,7 +731,7 @@ msgstr "Promijenite lozinku"
 msgid "Change phone number"
 msgstr "Promijenite telefonski broj"
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 #, fuzzy
 msgid "Change two-factor authentication"
 msgstr "Uključite dvo-stupanjsku provjeru za prijavu u sustav"
@@ -719,12 +742,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr "Odaberite ime kategorije koje ima smisla za javnost (\"rupa na cesti\", \"javna rasvjeta\" i slično), a korisno je i za nadležno tijelo koje bi trebalo riješiti problem. Ovi nazivi kategorija pojavit će se u padajućem izborniku na stranici za prijavu problema."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr "Odaberite iduće"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr "Izbrišite preuzete podatke (offline data)"
 
@@ -761,8 +784,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -772,11 +795,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Zatvorene"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Zatvorilo je odgovorno tijelo"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -809,13 +828,12 @@ msgid "Code"
 msgstr "Kod / šifra (code)"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr "Umanjite prikaz karte"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Konfiguracija"
@@ -932,7 +950,7 @@ msgstr "Kreiraj izvješće"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Kreiraj kategoriju"
@@ -942,27 +960,25 @@ msgstr "Kreiraj kategoriju"
 msgid "Create priority"
 msgstr "Izradite prioritet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr "Izradite izvještaj ili ažurirajte problem kao anonimni korisnik"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "Izradite izvještaj ili ažurirajte problem kao tijelo javne vlasti"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "Izradite izvještaj ili ažurirajte problem u ime korisnika"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Izradite predložak"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Kreirano"
@@ -971,6 +987,17 @@ msgstr "Kreirano"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Kreirano"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Kreirano"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -982,10 +1009,6 @@ msgstr "Kreirano:"
 msgid "Current password:"
 msgstr "Trenutno važeća lozinka:"
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr "Trenutni token:"
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr "Trenutno grupirano prema %s"
@@ -995,19 +1018,21 @@ msgstr "Trenutno grupirano prema %s"
 msgid "Currently no bodies have been created."
 msgstr "Trenutno nema izrađenih profila tijela javnih vlasti."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Ne možemo kontaktirati mušteriju"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Nadzorna ploča"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr "Isključite dvo-stupanjsku autentikaciju"
 
@@ -1019,7 +1044,7 @@ msgstr "Riješeno unutar 5 radnih dana"
 msgid "Default"
 msgstr "Zadano"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1029,7 +1054,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Izbrišite predložak"
@@ -1051,9 +1076,7 @@ msgid "Describe why you are moderating this"
 msgstr "Opišite zašto ste odlučili moderirati ovo"
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Opis"
 
@@ -1062,7 +1085,7 @@ msgstr "Opis"
 msgid "Destination"
 msgstr "Opis"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr "Detaljni opis ograničen je na %dznakova."
 
@@ -1098,7 +1121,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1106,6 +1129,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Prijavljeno u kategoriji %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Prijavljeno u kategoriji %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1140,25 +1173,25 @@ msgstr "Ne&rsquo;znam"
 msgid "Don't like forms?"
 msgstr "Ne dopadaju Vam se obrasci?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr "Jedan manje"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Povucite i postavite fotografije ovamo ili <u>kliknite za slanje sa svog računala</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr "Duplikat s"
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr "Duplikati"
 
@@ -1173,7 +1206,7 @@ msgstr ""
 "Različite kateogrije <strong>mogu imati istu kontakt adresu</strong>.\n"
 "To znači da možete imati niz različitih kategorija iako imate samo jednu kontakt-adresu nadležnog tijela javne vlasti."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1185,7 +1218,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Uredi"
@@ -1196,12 +1229,11 @@ msgstr "Uredi"
 msgid "Edit body details"
 msgstr "Uredite podatke o tijelu javne vlasti"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "Uredite ovlaštenja drugih korisnika"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Uredite kategoriju kojoj pripada prijava"
 
@@ -1209,17 +1241,15 @@ msgstr "Uredite kategoriju kojoj pripada prijava"
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Uredite razinu prioriteta ove prijave"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Uredite prijave"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1256,8 +1286,9 @@ msgstr "Urednik"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1266,15 +1297,14 @@ msgstr "Urednik"
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Uredite adresu"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr "E-mail adresa (neobavezno)"
 
@@ -1294,12 +1324,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "Potvrđena e-mail adresa:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "E-mail:"
@@ -1362,12 +1393,12 @@ msgstr "Zaključni datum"
 msgid "Endpoint"
 msgstr "Krajnja točka"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Unesite ime ulice"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Unesite obližnji poštanski broj ili ime ulice i kvarta"
 
@@ -1394,10 +1425,10 @@ msgstr "Unesite detalje o problemu"
 msgid "Error"
 msgstr "Greška"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Sve"
 
@@ -1410,7 +1441,7 @@ msgstr "Primjer poštanskog broja %s"
 msgid "Examples:"
 msgstr "Primjeri:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Postojeća kategorija"
 
@@ -1419,7 +1450,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr "Proširite prikaz karte"
 
@@ -1444,7 +1475,7 @@ msgid "External body"
 msgstr "Vanjsko tijelo javne vlasti"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1456,20 +1487,20 @@ msgstr ""
 msgid "External team"
 msgstr "Vanjska ekipa"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "Dodatna polja"
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Dodatni podaci:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1502,20 +1533,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filtriranje popisa prijava"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Prvi put"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Fotografije posljednjih obližnjih prijava"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nove prijave"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Popravite ovo tako da odaberete <strong>područje pokrivenosti</strong> u obrascu za <em>uređenje podataka za tijelo javne vlasti</em> ispod."
@@ -1545,7 +1581,7 @@ msgstr "Zastavica je izbrisana"
 msgid "Flag user"
 msgstr "Označi korisnika"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Označen"
@@ -1554,7 +1590,7 @@ msgstr "Označen"
 msgid "Flagged reports and users"
 msgstr "Označene prijave i korisnici"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Označeni korisnici su izlistani na zasebnoj stranici."
 
@@ -1562,8 +1598,8 @@ msgstr "Označeni korisnici su izlistani na zasebnoj stranici."
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Označeni korisnici nisu ograničeni ni na koji način. To je samo popis korisnika na koje treba obratiti pozornost."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Označen:"
 
@@ -1589,11 +1625,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Zaboravili ste šifru?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Proslijeđeno vanjskom tijelu."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Proslijeđeno vanjskom tijelu."
 
@@ -1603,12 +1639,20 @@ msgstr "Proslijeđeno vanjskom tijelu."
 msgid "Frequently Asked Questions"
 msgstr "Često postavljana pitanja"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr "Izradite token"
 
@@ -1630,7 +1674,7 @@ msgstr "Primite ažuriranja %s problema"
 msgid "Get updates of problems in this %s"
 msgstr "Primite ažuriranja problema u ovom %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Pretplatite se na RSS izvor"
 
@@ -1646,15 +1690,15 @@ msgstr "Drago nam je čuti da je stvar riješena!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1664,7 +1708,7 @@ msgstr "Idi"
 msgid "Going to send questionnaire?"
 msgstr "Pošalji upitnik?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr "Odobri pristup adminu"
 
@@ -1690,6 +1734,7 @@ msgstr "Jeste li prije prijavljivali problem odgovornom tijelu ili je ovo prvi p
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1724,7 +1769,8 @@ msgstr "Skriveno"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr "Sakriti sve prijave i novosti"
 
@@ -1752,7 +1798,7 @@ msgstr "Sakrijte svoje ime u ovoj prijavi"
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Sakrij pinove"
 
@@ -1806,11 +1852,9 @@ msgstr "Nažalost, ne možemo locirati Vaš problem u bazi podataka.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1829,15 +1873,15 @@ msgstr "Ako postoji korisnik povezan s adresom koju ste unijeli, poslali smo na
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr "Ako je ova postavka uključena, ovaj predložak će biti korišten za ažuriranja u vezi Open311 !!!"
 
@@ -1851,7 +1895,7 @@ msgstr "Ako više tijela javne vlasti ima nadležnost na istom prostoru, @Poprav
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr "Ako generirate novi token, onda će postojeći prestati raditi."
 
@@ -1875,7 +1919,7 @@ msgstr "Ako želite da ovaj predložak bude opcija samo za pojedine kategorije,
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "Ako prijavite problem ovdje, on <strong>neće</strong>biti prijavljen tijelu javne vlasti."
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1912,7 +1956,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1936,6 +1980,17 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "Nadalje, sljedeća svojstva koja nisu dio Open311 v2 specifikacija su vraćena: agencijski _poslano_datum-vrijeme, naslov (također vraćen kao dio opisa), sučelje_korišteno, brojač_komentara, ime_pretražitelja(prisutno samo ako je tražitelj dopustio  prikaz imena na ovoj stranici)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "5 najboljih JLS"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1945,20 +2000,20 @@ msgstr "Neaktivno"
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Uključite osobne podatke prijavitelja"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Pogrešno ima_foto vrijednost\"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr "Provjerite prijavu"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "Izdajte nalog izvođačima da riješe prijavljene probleme"
 
@@ -1975,16 +2030,12 @@ msgstr "Interne bilješke"
 msgid "Internal notes"
 msgstr "Interne bilješke"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Nevažeća odgovorna_vrijednost agencije %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Naveden nevažeći %s format."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Neispravna lokacija. Nova lokacija treba biti unutar područja pokrivenosti tijela javne vlasti."
 
@@ -2036,13 +2087,13 @@ msgstr "Posljednje ažuriranje"
 msgid "Last&nbsp;update:"
 msgstr "Posljednje&nbsp;ažuriranje:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Geografska širina / duljina"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Najdavnije uređeno"
@@ -2059,7 +2110,7 @@ msgstr "Izlistaj sve prijavljene probleme"
 msgid "Loading reports…"
 msgstr "Dohvaćanje prijava iz baze..."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Dohvaćanje..."
@@ -2097,17 +2148,18 @@ msgid "Log in with Twitter"
 msgstr "Prijavite se Twitter računom"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "Prijavite se e-mail računom"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr "Prijavite se e-mailom ili SMS-om"
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr "Odjavite se s cijele stranice"
 
@@ -2126,19 +2178,20 @@ msgstr "Potražite"
 msgid "MAP"
 msgstr "KARTA !!!"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr "Anonimizirajte korisnika !!! kod svih prijava i ažuriranja novosti"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr "Ručni poredak"
@@ -2152,24 +2205,24 @@ msgstr "Karta"
 msgid "Mark as sent"
 msgstr "Označite kao poslano"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "<strong>Označite</strong> korisnike na čije ponašanje želite obratiti pažnju."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Poruka"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Poruka nadležnom tijelu:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Poruka vanjskom tijelu:"
 
@@ -2182,7 +2235,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr "Nedostajuća tijela:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Nedostaje nadležni_ID"
 
@@ -2190,8 +2243,7 @@ msgstr "Nedostaje nadležni_ID"
 msgid "Moderate"
 msgstr "Moderirajte"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Moderirajte detalje prijave"
 
@@ -2214,7 +2266,7 @@ msgstr "Moderirao/la %s u %s"
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2224,14 +2276,14 @@ msgstr ""
 msgid "Month"
 msgstr "Mjesec"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Najviše komentara"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2259,9 +2311,10 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Ime:"
@@ -2279,7 +2332,7 @@ msgstr "Pogledajte ovaj problem"
 msgid "Nearest calculated address:"
 msgstr "Najbliža procijenjena adresa:"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Najbliža imenovana cesta smještena pokraj oznake na karti (automatski generirano pomoću OpenStreetMap): %s%s"
 
@@ -2287,12 +2340,12 @@ msgstr "Najbliža imenovana cesta smještena pokraj oznake na karti (automatski
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Najbliži poštanski broj pokraj oznake na karti (automatski generiran): %s (%sm udaljenosti)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Najbliža cesta smještena pokraj oznake na karti (automatski generirano pomoću Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2317,7 +2370,7 @@ msgstr "Skoro gotovo! Sada pogledajte svoj telefon..."
 msgid "New body added"
 msgstr "Dodano novo tijelo javne vlasti"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Novi kontakt dodan u kategoriju"
 
@@ -2331,8 +2384,8 @@ msgstr "Nova e-mail adresa"
 msgid "New field"
 msgstr "Dodajte polja"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nova interna poruka:"
 
@@ -2340,13 +2393,13 @@ msgstr "Nova interna poruka:"
 msgid "New local problems on FixMyStreet"
 msgstr "Novi lokalni problemi na Popravi.to"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Nova poruka za DM-a:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Nova lozinka:"
 
@@ -2423,7 +2476,7 @@ msgstr "Novi predložak"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Najnovije"
@@ -2436,7 +2489,6 @@ msgstr "Sljedeće"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2445,11 +2497,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Ne"
 
@@ -2461,11 +2513,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Nema tijela javne vlasti"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Nije odabrano odgovorno tijelo"
 
@@ -2481,8 +2534,8 @@ msgstr "Nisu pronađeni posebno označeni problemi."
 msgid "No flagged users found."
 msgstr "Nisu pronađeni posebno označeni korisnici."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Nema novosti"
 
@@ -2518,15 +2571,15 @@ msgstr "Bez podrške"
 msgid "None"
 msgstr "Nijedan"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2534,10 +2587,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Nije za ovaj odjel !!!"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Nije prethodno prijavljeno"
@@ -2586,12 +2643,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr "Preuzeti podaci su izbrisani"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr "Preuzeti podaci su sačuvani"
 
@@ -2599,12 +2656,12 @@ msgstr "Preuzeti podaci su sačuvani"
 msgid "Old state"
 msgstr "Staro stanje"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Najstarije"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr "U ime %s"
 
@@ -2613,7 +2670,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2644,7 +2701,7 @@ msgstr "Open311 prvotna web stranica"
 msgid "Open311 specification"
 msgstr "Open311 specifikacija"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr "Postavke"
 
@@ -2656,7 +2713,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr "Ili se pretplatite na RSS izvor"
 
@@ -2664,16 +2721,16 @@ msgstr "Ili se pretplatite na RSS izvor"
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2705,7 +2762,7 @@ msgstr "Stranica nije pronađena"
 msgid "Parent"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Ostale kategorije"
@@ -2714,13 +2771,13 @@ msgstr "Ostale kategorije"
 msgid "Partial"
 msgstr "Djelomično"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Lozinka (neobvezno)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Vaša lozinka je promijenjena"
@@ -2735,7 +2792,7 @@ msgstr "Lozinka (neobvezno)"
 msgid "Permissions"
 msgstr "Ovlaštenja:"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Ovlaštenja:"
 
@@ -2743,19 +2800,24 @@ msgstr "Ovlaštenja:"
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefon:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr "Telefonski prijavitelj"
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Broj telefona"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Telefonski broj (neobavezan)"
 
@@ -2763,30 +2825,26 @@ msgstr "Telefonski broj (neobavezan)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr "Provjeren broj telefona:"
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefon:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2806,9 +2864,8 @@ msgstr "Potrebna je fotografija"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Fotografije:"
@@ -2817,7 +2874,7 @@ msgstr "Fotografije:"
 msgid "Photos of recent nearby reports"
 msgstr "Fotografije posljednjih obližnjih prijava"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2831,6 +2888,11 @@ msgstr "Odaberite svoje tijelo javne vlasti"
 msgid "Pick your ward"
 msgstr "Odaberite svoju jedinicu lokalne samouprave"
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Postavite zastavicu na kartu"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2858,27 +2920,26 @@ msgid "Please check your email address is correct"
 msgstr "Provjerite je li vaša e-mail adresa točna"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr "Molimo da provjerite je li ispravno unesen broj telefona"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Izaberite kategoriju"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr "Molimo Vas da odaberete neku rjeđe korištenu lozinku koju je teže \"hakirati\""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2900,27 +2961,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Molimo Vas da budete pristojni; vrijeđanje službenika u tijelu javne vlasti nanosi štetu svim budućim korisnicima ovog sustava."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Unesite poruku"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr "Molimo da ostavite broj telefona"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Molimo da unesete ime"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "Molimo da unesete ime ovog tijela javne vlasti"
 
@@ -2933,16 +2994,16 @@ msgstr "Unesite lozinku"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Unesite predmet (naslov)"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2953,20 +3014,20 @@ msgstr "Unesite valjanu e-mail adresu"
 msgid "Please enter a valid email address"
 msgstr "Unesite valjanu e-mail adresu"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr "Molimo da unesete valjanu e-mail adresu ili broj telefona"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Unesite detalje"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2982,7 +3043,7 @@ msgid "Please enter your first name"
 msgstr "Unesite svoje ime"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Molimo unesite svoje puno ime, odgovorno tijelo treba ovu informaciju – ako ne želite da vaše ime bude prikazano na stranici, odznačite kvadratić ispod"
@@ -2994,9 +3055,9 @@ msgstr "Unesite svoje ime"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Unesite svoje ime"
@@ -3037,19 +3098,19 @@ msgstr "Popunite detalje o problemu u nastavku i opišite lokaciju što precizni
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Molimo navedite želite li primiti novi upitnik"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Unesite valjanu e-mail adresu"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr "Molimo da provjerite sastoji li se Vaša lozinka od najmanje %dznakova"
@@ -3076,24 +3137,28 @@ msgstr "Molimo da imate na umu da Vaša prijava <strong>još nije objavljena</st
 msgid "Please note:"
 msgstr "Napominjemo:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Molimo navedite obrazloženje ponovnog otvaranja ove prijave"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Molimo unesite tekst i fotografiju "
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Jeste li do sada ikada prijavljivali problem odgovoronom tijelu"
 
@@ -3101,7 +3166,7 @@ msgstr "Jeste li do sada ikada prijavljivali problem odgovoronom tijelu"
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3113,7 +3178,7 @@ msgstr "Izaberite izvor koji želite"
 msgid "Please select the type of alert you want"
 msgstr "Izaberite tip upozorenja koja želite primati"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Navedite je li problem rješen  "
 
@@ -3121,12 +3186,12 @@ msgstr "Navedite je li problem rješen  "
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Molimo da pošaljete samo fotografiju"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr "Molimo da autorizirate barem jedan telefonski broj ili e-mail adresu"
 
@@ -3134,27 +3199,23 @@ msgstr "Molimo da autorizirate barem jedan telefonski broj ili e-mail adresu"
 msgid "Please write a message"
 msgstr "Napiši poruku"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Objavi"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Objavljeno anonimno na %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Objavio %s na %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Objavio <strong>%s</strong> (%s) na %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Objavio <strong>%s</strong> na %s"
 
@@ -3170,7 +3231,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3178,11 +3239,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Prethodno"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Prioriteti"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Prioritet"
@@ -3198,9 +3259,9 @@ msgid "Privacy and cookies"
 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/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privatno"
 
@@ -3249,7 +3310,7 @@ msgstr "Problem %s poslan odgovornom tijelu %s"
 msgid "Problem breakdown by state"
 msgstr "Analiza problema prema stanju"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problem označen kao otvoren."
 
@@ -3257,8 +3318,7 @@ msgstr "Problem označen kao otvoren."
 msgid "Problem state change based on survey results"
 msgstr "Stanje problema izmijenjeno na temelju rezultata ankete"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemi"
@@ -3283,18 +3343,18 @@ msgstr "Problemi nedavno prijavljeni kao popravljeni na Popravi.to"
 msgid "Problems within %.1fkm of %s"
 msgstr "Problemi unutar radijusa %.1f km od %s"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemi unutar %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemi unutar %s ward"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr "Problemi unutar %s JLS, %s"
 
@@ -3302,7 +3362,7 @@ msgstr "Problemi unutar %s JLS, %s"
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Problemi unutar %s, %s"
 
@@ -3310,11 +3370,15 @@ msgstr "Problemi unutar %s, %s"
 msgid "Property address:"
 msgstr "Adresa objekta:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3328,11 +3392,11 @@ msgstr "Ažuriranje"
 msgid "Provide update as"
 msgstr "Pošaljite novosti kao: "
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Lozinka nije obvezna, ali će vam omogućiti lakše prijavljivanje problema, ažuriranja i upravljanje vašim izvješćima."
 
@@ -3340,12 +3404,12 @@ msgstr "Lozinka nije obvezna, ali će vam omogućiti lakše prijavljivanje probl
 msgid "Public details"
 msgstr "Javni detalji:"
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Javni odgovor:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Javno ažuriranje novosti:"
 
@@ -3388,11 +3452,11 @@ msgstr "Upitnik popunila osoba koja je prijavila problem"
 msgid "RSS feed"
 msgstr "RSS izvor"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS izvor za %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS izvor za %s JLS, %s"
 
@@ -3400,11 +3464,11 @@ msgstr "RSS izvor za %s JLS, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS izvor za %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS izvor za %s, unutar %s JLS"
 
@@ -3412,13 +3476,13 @@ msgstr "RSS izvor za %s, unutar %s JLS"
 msgid "RSS feed of nearby problems"
 msgstr "RSS izvor za okolne probleme"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS izvor za probleme unutar %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS izvor za probleme unutar %s JLS"
 
@@ -3432,11 +3496,11 @@ msgstr "RSS izvor za nedavne lokalne probleme"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS izvor za novosti u vezi ovog problema"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3449,7 +3513,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Primite e-mail s ažuriranjima ovog problema"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr "Pristiglo kod %s malo kasnije"
 
@@ -3463,7 +3527,7 @@ msgstr "Nedavni lokalni problemi, %s"
 msgid "Recently reported problems"
 msgstr "Nedavno prijavljeni problemi"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Nedavno dodano"
@@ -3476,7 +3540,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Popravi.to prvenstveno služi za prijavljivanje fizičkih problema koji se mogu popraviti. Ako Vaš problem nije prikladan za prijavljivanje preko ove stranice, uvijek se možete obratiti direktno svojoj lokalnoj samoupravi preko njihove web stranice."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr "Uklonite detalje računa"
 
@@ -3488,8 +3553,8 @@ msgstr "Uklonite polje"
 msgid "Remove flag"
 msgstr "Ukloni oznaku"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3505,17 +3570,22 @@ msgstr "Uklonite sa stranice"
 msgid "Remove option"
 msgstr "Uklonite polje"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Ukloni fotografiju (nije moguće poništiti!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Uredite ovlaštenja drugih korisnika"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr "Zamijenite token"
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Odgovor za korisnika:"
 
@@ -3523,14 +3593,14 @@ msgstr "Odgovor za korisnika:"
 msgid "Report"
 msgstr "Prijava"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3539,7 +3609,7 @@ msgid "Report a problem"
 msgstr "Prijavite problem"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3555,7 +3625,7 @@ msgid "Report anonymously"
 msgstr "Prijavljeno anonimno %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3591,7 +3661,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Prijavite, pregledajte ili raspravljajte o lokalnim problemima"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Prijavljeno anonimno %s"
@@ -3602,7 +3672,7 @@ msgstr "Prijavljeno anonimno %s"
 msgid "Reported before"
 msgstr "Prije prijavljeno"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Prijavio %s za %s"
@@ -3616,27 +3686,27 @@ msgstr "Prijava od strane: "
 msgid "Reported in the %s category"
 msgstr "Prijavljeno u kategoriji %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Prijavljeno %s u kategoriju anonimno u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Prijavio %s u kategoriju %s u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Prijavio %s anonimno %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Prijavio %s %s u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Prijavio %s u kategoriju %s anonimno u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Prijavio %s u %s kategoriju %s u %s"
 
@@ -3655,17 +3725,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr "Prijavljivanje problema"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Prijave"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3693,15 +3761,15 @@ msgid "Reports published"
 msgstr "Prijave objavljene"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr "Prijave sačuvane offline"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr "Prijave poslane na adresu %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3714,7 +3782,7 @@ msgstr "Prijave koje čekaju slanje "
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3767,39 +3835,45 @@ msgstr ""
 msgid "Right place?"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Cestovni operater za ovu imenovanu cestu (izveden iz cestovnog referentnog broja i tipa): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Cestovni operater za ovu imenovanu cestu  (sa OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3815,20 +3889,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3845,13 +3919,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Pretraži prijave"
 
@@ -3864,7 +3937,7 @@ msgstr "Pretraži korisnike"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr ""
 
@@ -3879,12 +3952,12 @@ msgstr "Pretraži:"
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3894,8 +3967,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3905,7 +3977,7 @@ msgid "Select a body"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr ""
@@ -3926,7 +3998,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3939,7 +4011,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3948,11 +4020,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Pošalji %s %s naknadno"
 
@@ -3990,7 +4062,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4001,7 +4073,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4026,8 +4098,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4038,7 +4110,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Prikaži pinove"
 
@@ -4098,7 +4170,7 @@ msgid "Some photos of recent reports"
 msgstr "Fotografije nedavnih prijava"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Tekst za lakšu lokalizaciju"
 
@@ -4107,12 +4179,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Žao nam je,ne pokrivamo područje na kojem se nalazi taj problem."
 
@@ -4130,9 +4201,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Žao nam je, došlo je do greške pri potvrđivanju 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/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Žao nam je, ne možemo pronaći tu lokaciju."
 
@@ -4142,13 +4213,13 @@ msgstr "Žao nam je, ne možemo pronaći tu lokaciju."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokušajte ponovno."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4163,11 +4234,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Kriterij sortiranja"
@@ -4176,11 +4247,11 @@ msgstr "Kriterij sortiranja"
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4204,18 +4275,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Stanje"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4224,31 +4295,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Stanje:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Statistika"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr ""
 
@@ -4266,7 +4334,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4285,50 +4353,48 @@ msgstr "Predmet:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Pošalji"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Pošalji promjene"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Pošalji upitnik"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Pretplati se"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4341,7 +4407,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Prijave su ograničene na broj od %s znakova duljine. Molimo da skratite svoju prijavu."
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4355,20 +4421,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr "Ukratko opišite svoj problem:"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Ukratko opišite unesene izmjene"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Sažetak"
 
@@ -4379,14 +4444,19 @@ msgstr "Sažetak prijava"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "Super-korisnici imaju ovlasti da poduzimaju sve radnje u administratorskom sučelju."
 
@@ -4404,13 +4474,18 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Predlošci"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Najdavnije uređeno"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Tekst"
@@ -4432,6 +4507,11 @@ msgstr "Tekst samo verzija"
 msgid "Text:"
 msgstr "Tekst:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Tekst"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Hvala Vam na prijavi ovog problema!"
@@ -4461,7 +4541,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Hvala, drago nam je čuti da je Vaš problem riješen! Htjeli bismo Vass još samo upitati jeste li do sada prijavljivali problem odgovornom tijelu?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4473,27 +4553,29 @@ msgstr "Slika nije ispravno učitana (%s), molimo pokušajte ponovno."
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Odgovorno tijelo ne pokriva navedenu lokaciju, možda je riječ o obalnom dijelu  ili je izvan zemlje. Molimo pokušajte ponovno."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Lokacija se ne nalazi u Hrvatskoj. Molimo pokušajte ponovno."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Žao nam je, poštanski broj nije prepoznat."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Ovaj problem ima oznaku da je poslan nadležnom tijelu na postupanje."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Navedeni problem će biti ponovno poslan"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Navedena prijava je uklonjena s Popravi.to"
 
@@ -4539,8 +4621,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4595,7 +4677,7 @@ msgstr "Greška je: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "Informacija o najbližoj cesti može biti netočna ili irelevantna u slučaju da je problem u blizini više prometnica ili u neposrednoj blizini neimenovane ceste u OpenStreetMap"
 
@@ -4657,8 +4739,8 @@ msgstr "Korisnik nije mogao locirati problem na karti, ali možete vidjeti podru
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4692,7 +4774,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr "Već postoji predložak za automatsko odgovaranje za ovu kategoriju ili stanje."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr "Već postoji predložak za automatsko odgovaranje za ovu kategoriju ili stanje."
 
@@ -4710,13 +4792,13 @@ msgstr "Došlo je do problema pri učitavanju ove stranice. Molimo pokušajte po
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 #, fuzzy
 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 "Pojavio se neki problem u vezi s Vašim podacima za prijavu. Ako se ne možete prisjetiti svoje lozinke, ili ju niti nemate, molimo Vas da popunite &lsquo;No&rsquo; dio obrasca."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Došlo je do problema pri ažuriranju. Molimo pokušajte ponovno."
 
@@ -4724,7 +4806,7 @@ msgstr "Došlo je do problema pri ažuriranju. Molimo pokušajte ponovno."
 msgid "There were problems with your report. Please see below."
 msgstr "Došlo je do problema pri prijavi. Detalje pogledajte u nastavku."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Došlo je do problema pri ažuriranju. Detalje pogledajte u nastavku."
 
@@ -4800,10 +4882,10 @@ msgstr "Kako korisnik nije kategorizirao problem, ovaj e-mail je automatski posl
 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 "Kako je odabrana kategorija predviđena za više odgovornih tijela, ovaj e-mail poslan je na adrese nekoliko ureda koje prekrivaju mjesto problema. Molimo Vas da zanemarite e-mail ako problem ne ulazi u Vašu nadležnost ili nam se povratno javite kako bismo u svom sustavu mogli ispravno kategorizirati prijavu."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Potrebna informacija"
 
@@ -4820,19 +4902,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Problem je riješen."
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Problem još nije riješen."
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4845,26 +4931,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Ova prijava je trenutno označena kao zatvorena."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Prijava je trenutno označena kao popravljena."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Prijava je trenutno označena kao otvorena."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4872,15 +4958,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Stranica sadrži i fotografiju problem, dodanu od strane korisnika."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4904,6 +4993,10 @@ msgstr "Naslov"
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4929,7 +5022,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "Karta točne lokacije ovog problema"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4954,11 +5047,6 @@ msgstr "5 najboljih JLS"
 msgid "Total"
 msgstr "Ukupno"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4981,17 +5069,17 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 #, fuzzy
 msgid "Two-factor authentication"
 msgstr "Uključite dvo-stupanjsku provjeru za prijavu u sustav"
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5001,7 +5089,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5031,10 +5119,10 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "Nepoznat IB problema"
 
@@ -5046,13 +5134,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Ažuriranje"
 
@@ -5103,29 +5191,27 @@ msgstr "Ažuriranjem je problem ponovno otvoren"
 msgid "Update statuses"
 msgstr "Status ažuriranja"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Ažurirano!"
 
@@ -5136,7 +5222,7 @@ msgstr "Ažurirano!"
 msgid "Updates"
 msgstr "Ažuriranja"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5166,6 +5252,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5179,8 +5273,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr "Korisnik je dodan na popis zloupotreba."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5198,7 +5292,7 @@ msgid "User flagged"
 msgstr "Korisnik označen"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5211,27 +5305,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Korisnici"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5239,9 +5331,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Vrijednosti ažurirane"
 
@@ -5267,7 +5359,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Pogledaj prijave na stranici"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Pregled prijava za ward"
 
@@ -5275,7 +5367,7 @@ msgstr "Pregled prijava za ward"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5293,7 +5385,7 @@ msgstr "Prikaz problema"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Općine ove županije"
 
@@ -5363,7 +5455,7 @@ msgstr "Prilikom slanja"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5383,7 +5475,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Želite li za 4 tjedna primiti još jedan upitnik koji bi Vas podsjetio da provjerite status?"
 
@@ -5395,7 +5487,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Podsjećamo, pisanje velikim tiskanim slovima i bez interpunkcijskih znakova čini poruku teško čitljivom."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5406,12 +5497,12 @@ msgstr "Podsjećamo, pisanje velikim tiskanim slovima i bez interpunkcijskih zna
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Da"
 
@@ -5424,7 +5515,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5437,7 +5528,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Sljedeće ažuriranje prijavljujete jer je uvredljivo, sadrži osobne podatke ili slično:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5446,7 +5537,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5476,7 +5567,7 @@ msgstr "Možete nam pomoći u pronalaženju kontakt e-mail adresa za lokalne pro
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5486,7 +5577,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5494,7 +5585,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Već ste ogovorili na upitnik. Ako imate nekih pitanja, molimo da nam<a href='%s'>se javite</a>, ili<a href='%s'>pregledate problem koji vas zanima</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5503,8 +5594,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5568,9 +5658,9 @@ msgstr "Vaše prijave"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Vaš profil"
@@ -5580,13 +5670,14 @@ msgstr "Vaš profil"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr "Isključite dvo-stupanjsku autentikaciju"
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5615,16 +5706,16 @@ msgstr "Ime"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr "Vaše ime je sakriveno u svim Vašim prijavama i poslanim novostima"
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5644,8 +5735,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5678,7 +5769,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5709,19 +5800,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5729,8 +5820,8 @@ msgstr ""
 msgid "by %s"
 msgstr "od %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "odgovorno tijelo"
 
@@ -5761,6 +5852,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr "od %s različitih korisnika"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5778,7 +5873,7 @@ msgstr "n/a"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5861,12 +5956,12 @@ msgid "today"
 msgstr "danas"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5891,7 +5986,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr ""
 
@@ -5959,7 +6054,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5983,7 +6078,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6007,7 +6102,7 @@ msgstr[0] "<big>%s</big> popravljeno u posljednjih mjesec dana"
 msgstr[1] "<big>%s</big> popravljeno u posljednjih mjesec dana"
 msgstr[2] "<big>%s</big> popravaka u posljednjih mjesec dana"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
@@ -6015,7 +6110,7 @@ msgstr[0] "<big>%s</big> prijava u prošlom tjednu"
 msgstr[1] "<big>%s</big> prijave u prošlom tjednu"
 msgstr[2] "<big>%s</big> prijava u prošlom tjednu"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
@@ -6023,7 +6118,7 @@ msgstr[0] "<big>%s</big> novija prijava"
 msgstr[1] "<big>%s</big> novije prijave"
 msgstr[2] "<big>%s</big> novih prijava"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6063,7 +6158,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
@@ -6071,7 +6166,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
@@ -6079,6 +6174,21 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Zatvorilo je odgovorno tijelo"
+
+#~ msgid "Current token:"
+#~ msgstr "Trenutni token:"
+
+#~ msgid "Filter report list"
+#~ msgstr "Filtriranje popisa prijava"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Nevažeća odgovorna_vrijednost agencije %s"
+
+#~ msgid "Post"
+#~ msgstr "Objavi"
+
 #~ msgid "(ignored if type is \"String\")"
 #~ msgstr "(zanemaruje se ako je tip podatka \"String\")"
 
@@ -6088,9 +6198,6 @@ msgstr[2] ""
 #~ msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 #~ msgstr "<strong>Pažnja:</strong> Ovaj prijavak još nije poslan nadležnima na rješavanje. Naknadne izmjene možda neće biti automatski proslijeđene. "
 
-#~ msgid "Available categories"
-#~ msgstr "Dostupne kategorije"
-
 #~ msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (<code>meta.datatype_description</code>), you must add it in <code>category_extras_fields.html</code>"
 #~ msgstr "Može se koristiti da prikaže dodatni tekst korisniku uz polje. Osnovni predložak to ne prikazuje (<code>meta.datatype_description</code>). Morate to dodati u <code> category_extras_fields.html</code>."
 
diff --git a/locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po
index 98daa0555..de9988722 100644
--- a/locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2020-03-05 09:59+0000\n"
 "Last-Translator: Gyula Rácz <gyula_racz25@hotmail.com>, 2020\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/mysociety/teams/12067/hu_HU/)\n"
@@ -22,8 +22,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " és "
@@ -58,7 +58,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "%s ref:&nbsp;%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> közreműködők"
 
@@ -159,6 +159,8 @@ msgstr "(nem létezik többé)"
 msgid "(not sent to council)"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -177,8 +179,8 @@ msgstr ""
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Válassz kategóriát --"
@@ -204,17 +206,18 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> elmentve."
 
@@ -244,7 +247,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Igen</strong> van jelszavam"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -261,7 +264,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr "Kétfaktoros azonosítás aktiválása"
 
@@ -281,7 +284,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 msgid "Add another parent category"
 msgstr ""
 
@@ -313,7 +316,7 @@ msgstr ""
 msgid "Add new category"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -322,8 +325,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -331,21 +334,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -361,6 +363,12 @@ msgstr ""
 msgid "Admin"
 msgstr "Admin"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Újra:"
@@ -373,8 +381,8 @@ msgstr ""
 msgid "Alert %d disabled (created %s)"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr ""
 
@@ -386,10 +394,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Mind"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr ""
@@ -429,6 +439,10 @@ msgstr ""
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+msgid "Allow anonymous reports on this category"
+msgstr ""
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -464,7 +478,7 @@ msgstr "Anonymous"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -477,7 +491,7 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -486,8 +500,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -498,7 +512,7 @@ msgstr ""
 msgid "Area covered"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Terület:"
 
@@ -511,27 +525,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Mindegyik kategória"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr ""
@@ -544,7 +563,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -552,11 +571,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -568,12 +587,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr ""
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Vissza"
@@ -594,14 +614,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr ""
 
@@ -614,11 +632,13 @@ msgstr ""
 msgid "Body"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr ""
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -630,8 +650,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -647,15 +666,13 @@ msgstr "Kategóriák:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -665,7 +682,7 @@ msgstr "Kategória"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -688,6 +705,11 @@ msgstr "Kategória"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Jelszó megváltoztatása"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -704,7 +726,7 @@ msgstr "Jelszó megváltoztatása"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -714,12 +736,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -756,8 +778,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -767,11 +789,7 @@ msgstr ""
 msgid "Closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr ""
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -804,13 +822,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr ""
@@ -927,7 +944,7 @@ msgstr ""
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr ""
@@ -937,27 +954,25 @@ msgstr ""
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr ""
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr ""
@@ -966,6 +981,15 @@ msgstr ""
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Created Body"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+msgid "Created By"
+msgstr ""
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -977,10 +1001,6 @@ msgstr ""
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -990,19 +1010,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1014,7 +1036,7 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1024,7 +1046,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr ""
@@ -1045,9 +1067,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr ""
 
@@ -1055,7 +1075,7 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1091,7 +1111,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1099,6 +1119,14 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+msgid "Disable reopening of reports in this category"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+msgid "Disable updates on reports in this category"
+msgstr ""
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1133,24 +1161,24 @@ msgstr ""
 msgid "Don't like forms?"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1162,7 +1190,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1174,7 +1202,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr ""
@@ -1185,12 +1213,11 @@ msgstr ""
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1198,17 +1225,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1245,8 +1270,9 @@ msgstr ""
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1255,15 +1281,14 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1283,12 +1308,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr ""
@@ -1351,11 +1377,11 @@ msgstr ""
 msgid "Endpoint"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1382,10 +1408,10 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1398,7 +1424,7 @@ msgstr ""
 msgid "Examples:"
 msgstr ""
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1407,7 +1433,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1432,7 +1458,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1444,20 +1470,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1490,20 +1516,23 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr ""
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+msgid "Five most recent commented reports"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+msgid "Five newest reports"
+msgstr ""
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1533,7 +1562,7 @@ msgstr ""
 msgid "Flag user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr ""
@@ -1542,7 +1571,7 @@ msgstr ""
 msgid "Flagged reports and users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1550,8 +1579,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr ""
 
@@ -1577,11 +1606,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1591,12 +1620,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1618,7 +1655,7 @@ msgstr ""
 msgid "Get updates of problems in this %s"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr ""
 
@@ -1634,15 +1671,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1652,7 +1689,7 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1678,6 +1715,7 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1712,7 +1750,8 @@ msgstr ""
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1740,7 +1779,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr ""
 
@@ -1793,11 +1832,9 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr ""
 
@@ -1816,15 +1853,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1838,7 +1875,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1862,7 +1899,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1899,7 +1936,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1923,6 +1960,17 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "kerület"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1932,20 +1980,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1961,16 +2009,12 @@ msgstr ""
 msgid "Internal notes"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2021,13 +2065,13 @@ msgstr ""
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2044,7 +2088,7 @@ msgstr ""
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr ""
@@ -2082,17 +2126,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2110,19 +2155,20 @@ msgstr ""
 msgid "MAP"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2136,24 +2182,24 @@ msgstr ""
 msgid "Mark as sent"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2166,7 +2212,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -2174,8 +2220,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2198,7 +2243,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2208,14 +2253,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2243,9 +2288,10 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr ""
@@ -2263,7 +2309,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -2271,12 +2317,12 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2299,7 +2345,7 @@ msgstr ""
 msgid "New body added"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr ""
 
@@ -2312,8 +2358,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr ""
 
@@ -2321,13 +2367,13 @@ msgstr ""
 msgid "New local problems on FixMyStreet"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2404,7 +2450,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2417,7 +2463,6 @@ msgstr ""
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2426,11 +2471,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr ""
 
@@ -2442,11 +2487,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr ""
 
@@ -2462,8 +2508,8 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr ""
 
@@ -2499,15 +2545,15 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2515,10 +2561,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr ""
@@ -2566,12 +2616,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2579,12 +2629,12 @@ msgstr ""
 msgid "Old state"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2593,7 +2643,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2624,7 +2674,7 @@ msgstr ""
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2636,7 +2686,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2644,16 +2694,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2685,7 +2735,7 @@ msgstr ""
 msgid "Parent"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 msgid "Parent categories"
 msgstr ""
 
@@ -2693,13 +2743,13 @@ msgstr ""
 msgid "Partial"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
 msgstr ""
 
@@ -2711,7 +2761,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2719,19 +2769,23 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+msgid "Phone"
+msgstr ""
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr ""
 
@@ -2739,30 +2793,26 @@ msgstr ""
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr ""
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2782,9 +2832,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2793,7 +2842,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2807,6 +2856,10 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+msgid "Pin map"
+msgstr ""
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2834,27 +2887,26 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2873,27 +2925,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2906,16 +2958,16 @@ msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2926,20 +2978,20 @@ msgstr ""
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2955,7 +3007,7 @@ msgid "Please enter your first name"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr ""
@@ -2966,9 +3018,9 @@ msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr ""
@@ -3009,18 +3061,18 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 msgid "Please make sure you are not including an email address"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3047,24 +3099,28 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -3072,7 +3128,7 @@ msgstr ""
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3084,7 +3140,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -3092,12 +3148,12 @@ msgstr ""
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3105,27 +3161,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr ""
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr ""
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -3141,7 +3193,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3149,11 +3201,11 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3169,9 +3221,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr ""
 
@@ -3217,7 +3269,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr ""
 
@@ -3225,8 +3277,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr ""
@@ -3251,18 +3302,18 @@ msgstr ""
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3270,7 +3321,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3278,11 +3329,15 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3296,11 +3351,11 @@ msgstr ""
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr ""
 
@@ -3308,12 +3363,12 @@ msgstr ""
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3355,11 +3410,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -3367,11 +3422,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -3379,13 +3434,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -3399,11 +3454,11 @@ msgstr ""
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3416,7 +3471,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3430,7 +3485,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3443,7 +3498,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3455,8 +3511,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3471,17 +3527,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3489,14 +3549,14 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3505,7 +3565,7 @@ msgid "Report a problem"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3520,7 +3580,7 @@ msgid "Report anonymously"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3555,7 +3615,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -3566,7 +3626,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr ""
@@ -3580,27 +3640,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -3619,17 +3679,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3657,15 +3715,15 @@ msgid "Reports published"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3678,7 +3736,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3731,39 +3789,45 @@ msgstr ""
 msgid "Right place?"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3779,20 +3843,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3809,13 +3873,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr ""
 
@@ -3828,7 +3891,7 @@ msgstr ""
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr ""
 
@@ -3843,12 +3906,12 @@ msgstr ""
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3858,8 +3921,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3869,7 +3931,7 @@ msgid "Select a body"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr ""
@@ -3890,7 +3952,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3903,7 +3965,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3912,11 +3974,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3954,7 +4016,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3965,7 +4027,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -3990,8 +4052,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4002,7 +4064,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr ""
 
@@ -4062,7 +4124,7 @@ msgid "Some photos of recent reports"
 msgstr ""
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4071,12 +4133,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4094,9 +4155,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -4106,13 +4167,13 @@ msgstr ""
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4126,11 +4187,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4139,11 +4200,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4167,18 +4228,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4187,31 +4248,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr ""
 
@@ -4229,7 +4287,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4248,50 +4306,48 @@ msgstr ""
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4303,7 +4359,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4317,20 +4373,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr ""
 
@@ -4341,14 +4396,19 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4366,13 +4426,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr ""
@@ -4393,6 +4457,10 @@ msgstr ""
 msgid "Text:"
 msgstr ""
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+msgid "Textarea"
+msgstr ""
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4422,7 +4490,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4434,27 +4502,29 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
@@ -4500,8 +4570,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4555,7 +4625,7 @@ msgstr ""
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4617,8 +4687,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4651,7 +4721,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4669,12 +4739,12 @@ msgstr ""
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -4682,7 +4752,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -4758,10 +4828,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr ""
 
@@ -4778,19 +4848,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4803,26 +4877,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4830,15 +4904,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4862,6 +4939,10 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4887,7 +4968,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4912,11 +4993,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4939,16 +5015,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4958,7 +5034,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -4988,10 +5064,10 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5003,13 +5079,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr ""
 
@@ -5059,29 +5135,27 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr ""
 
@@ -5092,7 +5166,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5122,6 +5196,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5135,8 +5217,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5154,7 +5236,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5167,27 +5249,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5195,9 +5275,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr ""
 
@@ -5223,7 +5303,7 @@ msgstr ""
 msgid "View report on site"
 msgstr ""
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5231,7 +5311,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5249,7 +5329,7 @@ msgstr ""
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -5319,7 +5399,7 @@ msgstr ""
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5339,7 +5419,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr ""
 
@@ -5351,7 +5431,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5362,12 +5441,12 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr ""
 
@@ -5380,7 +5459,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5393,7 +5472,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5402,7 +5481,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5432,7 +5511,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5442,7 +5521,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5450,7 +5529,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5459,8 +5538,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5524,9 +5602,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5535,13 +5613,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5570,16 +5649,16 @@ msgstr ""
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5599,8 +5678,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5633,7 +5712,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5664,19 +5743,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5684,8 +5763,8 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr ""
 
@@ -5716,6 +5795,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5733,7 +5816,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5813,12 +5896,12 @@ msgid "today"
 msgstr "ma"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5843,7 +5926,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "kerület"
 
@@ -5903,7 +5986,7 @@ msgid_plural "%d years"
 msgstr[0] "%d év"
 msgstr[1] "%d év"
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5924,7 +6007,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5945,21 +6028,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -5994,14 +6077,14 @@ msgid_plural "last updated %d days ago"
 msgstr[0] "legutóbb %d napja frissítve"
 msgstr[1] "legutóbb %d napja frissítve"
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] "hónap"
 msgstr[1] "hónapok"
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
diff --git a/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po
index 9e9dfe8de..9c438762e 100644
--- a/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Indonesian (Indonesia) (https://www.transifex.com/mysociety/teams/12067/id_ID/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "dan"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Laporan ringkasan"
 
@@ -117,7 +117,7 @@ msgstr "%s kuesioner dikirim &ndash; %s dijawab (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "Kontributor &copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>"
 
@@ -163,6 +163,8 @@ msgstr "(tidak ada lagi)"
 msgid "(not sent to council)"
 msgstr "(tidak dikirim ke dewan)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -181,8 +183,8 @@ msgstr "(dikirim ke dua-duanya)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Pilih kategori --"
@@ -212,17 +214,18 @@ msgstr ""
 "              Mungkin Anda dapat menambahkan <code>MAPIT_TYPES</code> ke berkas konfigurasi?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr "<h2>Laporan, Statistik, dan Tindakan untuk</h2> <h1>%s</h1>"
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> disimpan."
 
@@ -252,7 +255,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ya</strong> Saya punya kata sandi"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -269,7 +272,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -292,7 +295,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Tambahkan kontak dengan menggunakan formulir di bawah ini."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Tambahkan kategori baru"
@@ -325,7 +328,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Tambahkan kategori baru"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -334,8 +337,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -343,21 +346,20 @@ msgid "Add to shortlist"
 msgstr "Tambahkan ke daftar pendek"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Tambahkan pengguna"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Tambah/sunting kategori masalah"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Tambah/sunting prioritas tanggapan"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Tambah/sunting template tanggapan"
 
@@ -373,6 +375,12 @@ msgstr "Menambahkan laporan ini ke daftar pendek Anda akan menghapusnya dari daf
 msgid "Admin"
 msgstr "Admin"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Lagi:"
@@ -385,8 +393,8 @@ msgstr "Peringatan %d dibuat untuk %s, tipe %s, parameter %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Peringatan %d dinonaktifkan (dibuat %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Beri tahu saya tentang pembaruan mendatang"
 
@@ -398,10 +406,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Semua"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Semua Laporan"
@@ -441,6 +451,11 @@ msgstr "Semua laporan di antara %sdan %s"
 msgid "All time"
 msgstr "Sepanjang waktu"
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Dilaporkan dalam kategori %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -477,7 +492,7 @@ msgstr "Anonim"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -490,7 +505,7 @@ msgid "Another user"
 msgstr "Pengguna lain"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Apakah Anda yakin ingin membatalkan unggahan ini?"
 
@@ -499,8 +514,8 @@ msgstr "Apakah Anda yakin ingin membatalkan unggahan ini?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Apakah Anda yakin?"
@@ -511,7 +526,7 @@ msgstr "Apakah Anda yakin?"
 msgid "Area covered"
 msgstr "Area cakupan"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Area:"
 
@@ -525,27 +540,32 @@ msgstr "Karena ini adalah situs persiapan dan %s keliru, laporan yang dibuat di
 msgid "Assign selected to role:"
 msgstr "Tetapkan pengguna pada area"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Tetapkan ke badan kompeten:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Tetapkan ke kategori lain:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Tetapkan ke badan eksternal:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Tetapkan ke subdivisi:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "Tetapkan pengguna pada area"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Kategori yang tersedia"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Ditetapkan ke %s"
@@ -558,7 +578,7 @@ msgstr "Sebagian besar permintaan %d dikembalikan ke setiap kueri. Permintaan ya
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Untuk saat ini fungsi yang dapat digunakan hanya mencari dan menampilkan laporan."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr "Staf pengguna yang berwenang dapat dihubungkan dengan kategori yang dioperasikannya."
 
@@ -566,11 +586,11 @@ msgstr "Staf pengguna yang berwenang dapat dihubungkan dengan kategori yang diop
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Tanggapan otomatis:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -582,12 +602,13 @@ msgstr "Waktu rata-rata antara pelaporan masalah dan penyelesaian masalah, 100 l
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Hindari informasi pribadi dan pelat nomor kendaraan"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Menunggu moderasi"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Kembali"
@@ -608,14 +629,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Badan"
 
@@ -628,11 +647,13 @@ msgstr "Badan"
 msgid "Body"
 msgstr "Badan"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Badan:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -644,8 +665,7 @@ msgstr "Tidak dapat menemukan surel kami? Periksa folder spam Anda &nbsp;&ndash;
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Tidak dapat melihat peta? <em>Lewati langkah ini</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -661,15 +681,13 @@ msgstr "Kategori:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -679,7 +697,7 @@ msgstr "Kategori"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Kategori diubah dari ‘%s’ menjadi ‘%s’"
 
@@ -702,6 +720,11 @@ msgstr "Kategori:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Ubah kata sandi"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -718,7 +741,7 @@ msgstr "Ubah kata sandi"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -730,12 +753,12 @@ msgstr ""
 "Pilih nama <strong>kategori</strong> yang dapat dipahami oleh publik (misal, \"Lubang jalan\", \"Lampu jalan\") tetapi juga berguna\n"
 "                  bagi badan. Ini akan ditampilkan pada menu dropdown di halaman laporkan-masalah."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr "Pilih lainnya"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr "Hapus data offline"
 
@@ -772,8 +795,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -783,11 +806,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Ditutup"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Ditutup oleh dewan"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -820,13 +839,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr "Ciutkan peta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Konfigurasi"
@@ -943,7 +961,7 @@ msgstr "Buat laporan"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Buat kategori"
@@ -953,27 +971,25 @@ msgstr "Buat kategori"
 msgid "Create priority"
 msgstr "Buat prioritas"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "Buat laporan/pembaruan sebagai dewan"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "Buat laporan/pembaruan mewakili pengguna"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Buat template"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Dibuat"
@@ -982,6 +998,17 @@ msgstr "Dibuat"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Dibuat"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Dibuat"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -993,10 +1020,6 @@ msgstr "Dibuat:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -1006,19 +1029,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "Saat ini belum ada badan dibuat."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Pelanggan tidak dapat dihubungi"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Dasbor"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1030,7 +1055,7 @@ msgstr "Diatasi oleh subdivisi dalam 5 hari kerja"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1040,7 +1065,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Hapus template"
@@ -1062,9 +1087,7 @@ msgid "Describe why you are moderating this"
 msgstr "Jelaskan mengapa Anda memoderasi ini"
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Deskripsi"
 
@@ -1073,7 +1096,7 @@ msgstr "Deskripsi"
 msgid "Destination"
 msgstr "Deskripsi"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1109,7 +1132,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1117,6 +1140,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Dilaporkan dalam kategori %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Dilaporkan dalam kategori %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1151,25 +1184,25 @@ msgstr "Tidak tahu"
 msgid "Don't like forms?"
 msgstr "Tidak suka formulir?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr "Turun satu tingkat"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Tarik dan lepaskan foto di sini atau <u>klik untuk mengunggah</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr "Duplikat dari"
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr "Duplikat"
 
@@ -1184,7 +1217,7 @@ msgstr ""
 "Kategori yang berbeda <strong>dapat berisi kontak yang sama</strong> (alamat surel).\n"
 "Ini berarti Anda dapat menambahkan banyak kategori sekalipun Anda hanya memiliki satu kontak untuk badan."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr "Ketimuran/Keutaraan:"
@@ -1196,7 +1229,7 @@ msgstr "Ketimuran/Keutaraan:"
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Sunting"
@@ -1207,12 +1240,11 @@ msgstr "Sunting"
 msgid "Edit body details"
 msgstr "Sunting detail badan"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "Sunting perizinan pengguna lain"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Sunting kategori laporan"
 
@@ -1220,17 +1252,15 @@ msgstr "Sunting kategori laporan"
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Sunting prioritas laporan"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Sunting laporan"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1267,8 +1297,9 @@ msgstr "Penyunting"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1277,15 +1308,14 @@ msgstr "Penyunting"
 msgid "Email"
 msgstr "Surel"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Alamat surel"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1305,12 +1335,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Surel:"
@@ -1380,12 +1411,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Titik Akhir"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Masukkan sebuah nama jalan di Zurich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Masukkan kode pos UK, atau nama jalan dan kawasan di sekitar"
 
@@ -1412,10 +1443,10 @@ msgstr "Masukkan detail masalah"
 msgid "Error"
 msgstr "Galat"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Semuanya"
 
@@ -1428,7 +1459,7 @@ msgstr "Contoh kode pos %s"
 msgid "Examples:"
 msgstr "Contoh:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Kategori yang ada"
 
@@ -1437,7 +1468,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr "Perluas peta"
 
@@ -1462,7 +1493,7 @@ msgid "External body"
 msgstr "Badan eksternal"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1474,20 +1505,20 @@ msgstr ""
 msgid "External team"
 msgstr "Tim eksternal"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Data tambahan:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1520,20 +1551,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filter daftar laporan"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Pertama kali"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Foto dari laporan baru-baru ini di sekitar"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Laporan baru"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Atasi ini dengan memilih sebuah <strong>area cakupan</strong> pada formulir <em>Sunting detail badan</em> di bawah ini."
@@ -1563,7 +1599,7 @@ msgstr "Tandai dihapus"
 msgid "Flag user"
 msgstr "Tandai pengguna"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Ditandai"
@@ -1572,7 +1608,7 @@ msgstr "Ditandai"
 msgid "Flagged reports and users"
 msgstr "Laporan dan pengguna ditandai"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Pengguna yang ditandai ditampilkan pada halaman <a href='%s'>ditandai</a>."
 
@@ -1580,8 +1616,8 @@ msgstr "Pengguna yang ditandai ditampilkan pada halaman <a href='%s'>ditandai</a
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Pengguna yang ditandai sama sekali tidak dikenakan batasan. Ini hanyalah daftar pengguna yang telah ditandai untuk dipantau."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Ditandai:"
 
@@ -1607,11 +1643,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Lupa kata sandi Anda?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Diteruskan ke badan eksternal"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Meneruskan permohonan ke badan eksternal"
 
@@ -1621,12 +1657,20 @@ msgstr "Meneruskan permohonan ke badan eksternal"
 msgid "Frequently Asked Questions"
 msgstr "Tanya Jawab Umum"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1648,7 +1692,7 @@ msgstr "Dapatkan pembaruan atas %s masalah"
 msgid "Get updates of problems in this %s"
 msgstr "Dapatkan pembaruan masalah dalam %s ini"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Beri saya umpan RSS"
 
@@ -1664,15 +1708,15 @@ msgstr "Senang mengetahui masalah telah diatasi!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1682,7 +1726,7 @@ msgstr "Mulai"
 msgid "Going to send questionnaire?"
 msgstr "Akan mengirim kuesioner?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr "Berikan izin akses untuk admin"
 
@@ -1708,6 +1752,7 @@ msgstr "Pernahkah Anda melaporkan masalah kepada dewan sebelumnya, atau apakah i
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1742,7 +1787,8 @@ msgstr "Tersembunyi"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1770,7 +1816,7 @@ msgstr "Sembunyikan nama saya dalam laporan ini"
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Sembunyikan pin"
 
@@ -1824,11 +1870,9 @@ msgstr "Saya khawatir kami tidak dapat melacak masalah Anda di basis data.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1849,15 +1893,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr "Jika prioritas ini diteruskan ke layanan eksternal (mis. Exor/Confirm) masukkan kode prioritas untuk digunakan dengan layanan tersebut di sini."
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1873,7 +1917,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1897,7 +1941,7 @@ msgstr "Jika Anda hanya ingin template ini menjadi opsi untuk kategori tertentu,
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "Jika Anda memasukkan masalah di sini, masalah tersebut <strong>tidak</strong> akan dilaporkan kepada dewan."
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1936,7 +1980,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1960,6 +2004,17 @@ msgstr "Pada tabel penyalahgunaan?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "Sebagai tambahan, atribut berikut yang bukan merupakan bagian dari spesifikasi Open311 v2 dikembalikan: agency_sent_datetime, judul (juga dikembalikan sebagai bagian dari deskripsi), interface_used, comment_count, requestor_name (hanya tersedia jika pemohon mengizinkan namanya ditampilkan di situs ini)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "kelurahan"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1969,20 +2024,20 @@ msgstr "Tidak aktif"
 msgid "Inbox zero, here we come!"
 msgstr "Kotak masuk kosong, tunggulah kami!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Sertakan detail pribadi pelapor"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Nilai has_photo keliru \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr "Inspeksi laporan"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "Instruksikan kontraktor untuk mengatasi masalah"
 
@@ -1999,16 +2054,12 @@ msgstr "Catatan internal"
 msgid "Internal notes"
 msgstr "Catatan internal"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Nilai agency_responsible keliru %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Format %s yang disebutkan keliru."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Lokasi keliru. Lokasi baru harus dicakup oleh dewan yang sama."
 
@@ -2060,13 +2111,13 @@ msgstr "Pembaruan terakhir:"
 msgid "Last&nbsp;update:"
 msgstr "Pembaruan terakhir:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Lintang/Bujur:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Terlama dari yang baru-baru ini diperbarui"
@@ -2083,7 +2134,7 @@ msgstr "Tampilkan semua masalah yang dilaporkan"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Memuat..."
@@ -2121,17 +2172,18 @@ msgid "Log in with Twitter"
 msgstr "Masuk dengan Twitter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "Masuk dengan surel"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2150,19 +2202,20 @@ msgstr "Cari"
 msgid "MAP"
 msgstr "PETA"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr "Kelola daftar pendek"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr "Permintaan manual"
@@ -2176,24 +2229,24 @@ msgstr "Peta"
 msgid "Mark as sent"
 msgstr "Tandai sebagai dikirim"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "<strong>Tandai</strong> pengguna yang perilakunya ingin Anda pantau."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr "Detail masalah penggelembungan"
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Pesan"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Kirim pesan ke badan kompeten:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Kirim pesan ke badan eksternal:"
 
@@ -2206,7 +2259,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr "Badan tidak ditemukan:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "jurisdiction_id tidak ditemukan"
 
@@ -2214,8 +2267,7 @@ msgstr "jurisdiction_id tidak ditemukan"
 msgid "Moderate"
 msgstr "Moderasi"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Detail laporan moderasi"
 
@@ -2238,7 +2290,7 @@ msgstr "Dimoderasi oleh %s pada %s"
 msgid "Moderated by division within one working day"
 msgstr "Dimoderasi oleh divisi dalam satu hari kerja"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2248,14 +2300,14 @@ msgstr ""
 msgid "Month"
 msgstr "Bulan"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Komentar terbanyak"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2283,9 +2335,10 @@ msgstr ""
 msgid "Name"
 msgstr "Nama"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Nama:"
@@ -2303,7 +2356,7 @@ msgstr "Beralih ke masalah ini"
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Jalan bernama terdekat dengan pin yang dipasang di peta (dibuat otomatis dengan OpenStreetMap): %s %s"
 
@@ -2311,12 +2364,12 @@ msgstr "Jalan bernama terdekat dengan pin yang dipasang di peta (dibuat otomatis
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Kode pos terdekat dengan pin yang dipasang di peta (dibuat otomatis): %s (%s m jauhnya)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Jalan terdekat dengan pin yang dipasang di peta (dibuat otomatis dengan Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2341,7 +2394,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Badan baru ditambahkan"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Kontak kategori baru ditambahkan"
 
@@ -2354,8 +2407,8 @@ msgstr "Alamat surel baru:"
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Catatan internal baru:"
 
@@ -2363,13 +2416,13 @@ msgstr "Catatan internal baru:"
 msgid "New local problems on FixMyStreet"
 msgstr "Masalah lokal baru di FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Catatan baru untuk DM:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Kata sandi baru:"
 
@@ -2446,7 +2499,7 @@ msgstr "Template baru"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Terbaru"
@@ -2459,7 +2512,6 @@ msgstr "Selanjutnya"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2468,11 +2520,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Tidak"
 
@@ -2484,11 +2536,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Tidak ada badan"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Tidak ada dewan dipilih"
 
@@ -2504,8 +2557,8 @@ msgstr "Tidak ditemukan masalah ditandai."
 msgid "No flagged users found."
 msgstr "Tidak ditemukan pengguna ditandai."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Tidak ada pembaruan lebih lanjut"
 
@@ -2543,8 +2596,8 @@ msgstr "Tidak ada pendukung"
 msgid "None"
 msgstr "Tidak Ada"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
@@ -2552,8 +2605,8 @@ msgstr ""
 "Pengguna normal (publik) tidak boleh dihubungkan dengan <strong>area</strong> mana pun.<br>\n"
 "                  Staf pengguna berwenang dapat dihubungkan dengan area yang dioperasikannya."
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2565,10 +2618,14 @@ msgstr ""
 "                Tergantung kepada implementasinya, staf pengguna dapat memiliki akses ke dasbor (ringkasan\n"
 "                aktivitas di seluruh badan), kemampuan untuk menyembunyikan laporan atau mengatur status laporan khusus."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Bukan untuk subdivisi saya"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Tidak dilaporkan sebelumnya"
@@ -2616,12 +2673,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr "Data offline dihapus"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr "Data pembaruan offline disimpan"
 
@@ -2629,12 +2686,12 @@ msgstr "Data pembaruan offline disimpan"
 msgid "Old state"
 msgstr "Wilayah lama"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Terlama"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2643,7 +2700,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2674,7 +2731,7 @@ msgstr "Halaman web inisiatif Open311"
 msgid "Open311 specification"
 msgstr "Spesifikasi Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2686,7 +2743,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2694,16 +2751,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2735,7 +2792,7 @@ msgstr "Halaman Tidak Ditemukan"
 msgid "Parent"
 msgstr "Induk"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Kategori lainnya"
@@ -2744,13 +2801,13 @@ msgstr "Kategori lainnya"
 msgid "Partial"
 msgstr "Parsial"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Kata sandi (opsional)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Kata sandi Anda telah diubah"
@@ -2765,7 +2822,7 @@ msgstr "Kata sandi (opsional)"
 msgid "Permissions"
 msgstr "Perizinan:"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Perizinan:"
 
@@ -2773,19 +2830,24 @@ msgstr "Perizinan:"
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telepon:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Nomor telepon"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Nomor telepon (opsional)"
 
@@ -2793,30 +2855,26 @@ msgstr "Nomor telepon (opsional)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telepon:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2836,9 +2894,8 @@ msgstr "Foto diperlukan"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Foto"
@@ -2847,7 +2904,7 @@ msgstr "Foto"
 msgid "Photos of recent nearby reports"
 msgstr "Foto dari laporan baru-baru ini di sekitar"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2861,6 +2918,11 @@ msgstr "Pilih dewan Anda"
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Pasang pin di peta"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2888,27 +2950,26 @@ msgid "Please check your email address is correct"
 msgstr "Silakan periksa apakah alamat surel Anda benar"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Silakan pilih kategori"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2930,27 +2991,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Mohon untuk tidak menggunakan bahasa yang kasar&nbsp;&mdash; menggunakan bahasa yang kasar terhadap dewan Anda akan menurunkan mutu layanan bagi semua pengguna."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Silakan masukkan pesan"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Silakan masukkan nama baru"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "Silakan masukkan nama untuk badan ini"
 
@@ -2963,16 +3024,16 @@ msgstr "Silakan masukkan kata sandi"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Silakan masukkan subjek"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2983,20 +3044,20 @@ msgstr "Silakan masukkan surel yang valid"
 msgid "Please enter a valid email address"
 msgstr "Silakan masukkan alamat surel yang valid"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Silakan masukkan detail"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -3012,7 +3073,7 @@ msgid "Please enter your first name"
 msgstr "Silakan masukkan nama depan Anda"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Silakan masukkan nama lengkap Anda, dewan membutuhkan informasi ini – jika Anda tidak ingin nama Anda ditampilkan di situs, hapus centang pada kotak di bawah"
@@ -3024,9 +3085,9 @@ msgstr "Silakan masukkan nama Anda"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Silakan masukkan nama Anda"
@@ -3067,19 +3128,19 @@ msgstr "Silakan isi formulir di bawah dengan detail masalah, dan jelaskan lokasi
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Mohon beri tahukan apakah Anda ingin menerima kuesioner lainnya"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Silakan masukkan alamat surel yang valid"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3106,24 +3167,28 @@ msgstr "Harap perhatikan bahwa pembaruan Anda <strong>belum terkirim</strong>."
 msgid "Please note:"
 msgstr "Harap perhatikan:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr "Mohon berikan pembaruan publik untuk laporan ini."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Mohon jelaskan mengapa Anda membuka kembali laporan ini"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Mohon berikan teks dan juga foto"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Mohon beri tahu apakah Anda pernah melaporkan masalah kepada dewan Anda sebelumnya"
 
@@ -3131,7 +3196,7 @@ msgstr "Mohon beri tahu apakah Anda pernah melaporkan masalah kepada dewan Anda
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Silakan pilih badan."
 
@@ -3143,7 +3208,7 @@ msgstr "Silakan pilih umpan yang Anda inginkan"
 msgid "Please select the type of alert you want"
 msgstr "Silakan pilih tipe peringatan yang Anda inginkan"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Mohon beri tahu apakah masalah telah diatasi atau belum"
 
@@ -3151,12 +3216,12 @@ msgstr "Mohon beri tahu apakah masalah telah diatasi atau belum"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Mohon untuk hanya mengunggah gambar"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3164,27 +3229,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Silakan tuliskan pesan"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Kirim"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Dikirim secara anonim pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Dikirim oleh %s pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Dikirim oleh <strong>%s</strong> (%s) pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Dikirim oleh <strong>%s</strong> pada %s"
 
@@ -3200,7 +3261,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3208,11 +3269,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Prioritas"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Prioritas"
@@ -3228,9 +3289,9 @@ msgid "Privacy and cookies"
 msgstr "Privasi dan kuki"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Pribadi"
 
@@ -3280,7 +3341,7 @@ msgstr "Masalah %s dikirim ke dewan %s"
 msgid "Problem breakdown by state"
 msgstr "Uraian masalah berdasarkan wilayah"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Masalah ditandai terbuka."
 
@@ -3288,8 +3349,7 @@ msgstr "Masalah ditandai terbuka."
 msgid "Problem state change based on survey results"
 msgstr "Perubahan wilayah masalah berdasarkan hasil survei"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Masalah"
@@ -3314,18 +3374,18 @@ msgstr "Masalah yang baru-baru ini dilaporkan diatasi di FixMyStreet"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Masalah dalam %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Masalah di kelurahan %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3333,7 +3393,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Masalah dalam %s, %s"
 
@@ -3341,11 +3401,15 @@ msgstr "Masalah dalam %s, %s"
 msgid "Property address:"
 msgstr "Alamat properti:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3359,11 +3423,11 @@ msgstr "Berikan pembaruan"
 msgid "Provide update as"
 msgstr "Berikan pembaruan sebagai"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Memberikan kata sandi adalah opsional, tetapi dengan begitu Anda akan lebih mudah melaporkan masalah, menambahkan pembaruan, dan mengelola laporan Anda."
 
@@ -3371,12 +3435,12 @@ msgstr "Memberikan kata sandi adalah opsional, tetapi dengan begitu Anda akan le
 msgid "Public details"
 msgstr "Detail publik"
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Tanggapan publik:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Pembaruan publik:"
 
@@ -3419,11 +3483,11 @@ msgstr "Kuesioner diisi oleh pelapor masalah"
 msgid "RSS feed"
 msgstr "Umpan RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "Umpan RSS untuk %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "Umpan RSS untuk kelurahan %s, %s"
 
@@ -3431,11 +3495,11 @@ msgstr "Umpan RSS untuk kelurahan %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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "Umpan RSS dari %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "Umpan RSS dari %s, di kelurahan %s"
 
@@ -3443,13 +3507,13 @@ msgstr "Umpan RSS dari %s, di kelurahan %s"
 msgid "RSS feed of nearby problems"
 msgstr "Umpan RSS dari masalah di sekitar"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "Umpan RSS dari masalah dalam %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "Umpan RSS dari masalah di kelurahan  %s"
 
@@ -3463,11 +3527,11 @@ msgstr "Umpan RSS dari masalah lokal baru-baru ini"
 msgid "RSS feed of updates to this problem"
 msgstr "Umpan RSS dari pembaruan terhadap masalah ini"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3480,7 +3544,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Terima surel saat pembaruan ditambahkan pada masalah ini."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr "Diterima oleh %s beberapa saat kemudian"
 
@@ -3494,7 +3558,7 @@ msgstr "Masalah lokal baru-baru ini, %s"
 msgid "Recently reported problems"
 msgstr "Masalah yang baru saja dilaporkan"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Baru saja diperbarui"
@@ -3507,7 +3571,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Ingatlah bahwa FixMyStreet terutama bertujuan untuk melaporkan masalah fisik yang dapat diperbaiki. Jika masalah Anda tidak sesuai untuk dikirimkan ke situs ini, harap ingat bahwa Anda dapat langsung menghubungi dewan Anda melalui situs web mereka."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3519,8 +3584,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Hapus tanda"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3536,17 +3601,22 @@ msgstr "Hapus dari situs"
 msgid "Remove option"
 msgstr "Hapus dari situs"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Hapus foto (tidak dapat dibatalkan!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Sunting perizinan pengguna lain"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Balas pengguna:"
 
@@ -3554,14 +3624,14 @@ msgstr "Balas pengguna:"
 msgid "Report"
 msgstr "Laporan"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "ID Laporan:"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3570,7 +3640,7 @@ msgid "Report a problem"
 msgstr "Laporkan masalah"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3586,7 +3656,7 @@ msgid "Report anonymously"
 msgstr "Dilaporkan secara anonim pada %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3622,7 +3692,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Laporkan, tampilkan, atau diskusikan masalah lokal"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Dilaporkan secara anonim pada %s"
@@ -3633,7 +3703,7 @@ msgstr "Dilaporkan secara anonim pada %s"
 msgid "Reported before"
 msgstr "Telah dilaporkan sebelumnya"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Dilaporkan oleh %s pada %s"
@@ -3647,27 +3717,27 @@ msgstr "Dilaporkan oleh:"
 msgid "Reported in the %s category"
 msgstr "Dilaporkan dalam kategori %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Dilaporkan dalam kategori %s secara anonim pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Dilaporkan dalam kategori %s oleh %s pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Dilaporkan melalui %s secara anonim pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Dilaporkan melalui %s oleh %s pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Dilaporkan melalui %s dalam kategori %s secara anonim pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Dilaporkan melalui %s dalam kategori %s oleh %s pada %s"
 
@@ -3686,17 +3756,15 @@ msgstr "Dilaporkan:"
 msgid "Reporting a problem"
 msgstr "Melaporkan masalah"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Laporan"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3724,15 +3792,15 @@ msgid "Reports published"
 msgstr "Laporan diterbitkan"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr "Laporan disimpan secara offline."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3745,7 +3813,7 @@ msgstr "Laporan menunggu untuk dikirim"
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3798,39 +3866,45 @@ msgstr "Kembalikan ke judul awal"
 msgid "Right place?"
 msgstr "Tempat yang benar?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Operator jalan untuk jalan bernama ini (diambil dari tipe dan nomor referensi jalan): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operator jalan untuk jalan bernama ini (dari OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Putar Kiri"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3846,20 +3920,20 @@ msgstr "Memutar foto ini akan membuang perubahan yang belum disimpan pada lapora
 msgid "Satellite"
 msgstr "Satelit"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr "Simpan + tutup sebagai duplikat"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3876,13 +3950,12 @@ msgid "Save with a public update"
 msgstr "Simpan dengan pembaruan publik"
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr "Bagikan laporan offline"
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Cari Laporan"
 
@@ -3895,7 +3968,7 @@ msgstr "Cari Pengguna"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Cari laporan"
 
@@ -3910,12 +3983,12 @@ msgstr "Cari:"
 msgid "Searching found no reports."
 msgstr "Tidak ditemukan laporan."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Tidak ditemukan pengguna."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3925,8 +3998,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr "Lihat kebijakan privasi kami."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr "Lihat detail pengguna untuk laporan yang dibuat sebagai dewan"
 
@@ -3936,7 +4008,7 @@ msgid "Select a body"
 msgstr "Pilih badan"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Pilih area"
@@ -3957,7 +4029,7 @@ msgstr ""
 msgid "Select:"
 msgstr "Pilih:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr "Kirim"
@@ -3970,7 +4042,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr "Kirim status Open311 yang ditambahkan dengan pembaruan permintaan layanan"
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3979,11 +4051,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "Laporan dikirim kembali"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Dikirimkan ke %s %s kemudian"
 
@@ -4021,7 +4093,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr "Daftar Pendek"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr "Tampilkan semua dalam daftar pendek"
 
@@ -4032,7 +4104,7 @@ msgstr "Tampilkan semua dalam daftar pendek"
 msgid "Shortlisted"
 msgstr "Dimasukkan ke daftar pendek"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr "Dimasukkan ke daftar pendek oleh %s"
@@ -4057,8 +4129,8 @@ msgstr "Tampilkan nama ke publik?"
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4069,7 +4141,7 @@ msgstr "Tampilkan foto"
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Tampilkan pin"
 
@@ -4131,7 +4203,7 @@ msgid "Some photos of recent reports"
 msgstr "Beberapa foto dari laporan terbaru"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Sejumlah teks untuk dilokalisasikan"
 
@@ -4140,12 +4212,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Maaf, tampaknya ini adalah kode pos Dependensi Kerajaan, yang tidak dicakup oleh layanan kami."
 
@@ -4163,9 +4234,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Maaf, terjadi kesalahan saat mengonfirmasikan masalah Anda."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Maaf, kami tidak dapat menemukan lokasi tersebut."
 
@@ -4175,13 +4246,13 @@ msgstr "Maaf, kami tidak dapat menemukan lokasi tersebut."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr "Maaf, kami tidak dapat memasukkan Anda ke akun. Silakan isi formulir di bawah ini."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Maaf, kami tidak dapat mengurai lokasi tersebut. Silakan coba lagi."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4199,11 +4270,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr "Maaf, Anda tidak memiliki izin untuk melakukannya."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Sortir berdasarkan"
@@ -4213,11 +4284,11 @@ msgstr "Sortir berdasarkan"
 msgid "Staff only"
 msgstr "Staf:"
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr "Staf pengguna memiliki izin untuk masuk sebagai admin."
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr "Staf:"
 
@@ -4241,18 +4312,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Wilayah"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4261,31 +4332,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Wilayah:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Statistik"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Status"
 
@@ -4303,7 +4371,7 @@ msgstr "Tampilan Jalan"
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Subdivisi/Badan"
 
@@ -4322,50 +4390,48 @@ msgstr "Subjek:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Masukkan"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Masukkan perubahan"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Masukkan kuesioner"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Dimasukkan"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Berlangganan"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4378,7 +4444,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Panjang pembaruan dibatasi hingga %s karakter. Mohon persingkat pembaruan Anda."
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4392,20 +4458,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr "Buat ringkasan masalah"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Buat ringkasan tentang perubahan Anda"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Ringkasan"
 
@@ -4416,14 +4481,20 @@ msgstr "Laporan ringkasan"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Superuser"
+msgstr "Pengguna Super:"
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr "Pengguna Super:"
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "Pengguna Super memiliki izin untuk melakukan <strong>semua tindakan</strong> sebagai admin."
 
@@ -4441,13 +4512,18 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr "Template &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Template"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Terlama dari yang baru-baru ini diperbarui"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Teks"
@@ -4468,6 +4544,11 @@ msgstr "Versi teks saja"
 msgid "Text:"
 msgstr "Teks:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Teks"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Terima kasih telah melaporkan masalah ini!"
@@ -4497,7 +4578,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Terima kasih, kami senang mendengar masalahnya telah diatasi! Dapatkah kami bertanya apakah Anda sudah pernah melaporkan sebuah masalah kepada dewan sebelumnya?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4509,27 +4590,29 @@ msgstr "Gambar tersebut tampaknya tidak terunggah dengan benar (%s), silakan cob
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Lokasi tersebut tampaknya tidak dicakup oleh dewan; mungkin lokasinya terletak di lepas pantai atau di luar negeri. Silakan coba lagi."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Lokasi tersebut tampaknya bukan di UK; silakan coba lagi."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Maaf, kode pos tersebut tidak dikenali."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Masalah tersebut telah ditandai sebagai terkirim."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Masalah tersebut sekarang akan dikirim ulang."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Laporan tersebut telah dihapus dari FixMyStreet."
 
@@ -4579,8 +4662,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4639,7 +4722,7 @@ msgstr "Kesalahannya adalah: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "Atribut Open311 v2 berikut ini dikembalikan untuk setiap permintaan:: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code dan service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "Informasi berikut ini mengenai jalan terdekat mungkin tidak akurat atau tidak relevan, jika lokasi masalah dekat dengan beberapa jalan atau dekat dengan jalan tanpa nama yang terdaftar di OpenStreetMap."
 
@@ -4701,8 +4784,8 @@ msgstr "Pengguna tidak dapat melacak masalah pada peta, tetapi untuk melihat are
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4737,7 +4820,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4755,12 +4838,12 @@ msgstr "Terdapat masalah saat menampilkan halaman ini. Silakan coba lagi nanti."
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Terdapat masalah dengan pembaruan Anda. Silakan coba lagi."
 
@@ -4768,7 +4851,7 @@ msgstr "Terdapat masalah dengan pembaruan Anda. Silakan coba lagi."
 msgid "There were problems with your report. Please see below."
 msgstr "Terdapat masalah dengan laporan Anda. Silakan lihat di bawah ini."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Terdapat masalah dengan pembaruan Anda. Silakan lihat di bawah ini."
 
@@ -4854,10 +4937,10 @@ msgstr "Surel ini telah dikirimkan kepada kedua dewan yang mencakup lokasi masal
 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 "Surel ini telah dikirimkan kepada beberapa dewan yang mencakup lokasi masalah, karena kategori yang dipilih tersedia untuk semua dewan ini; silakan abaikan jika Anda bukan dewan yang tepat untuk menangani masalah ini."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Informasi ini diperlukan"
 
@@ -4874,19 +4957,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Masalah ini telah diatasi"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Masalah ini belum diatasi"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr "Masalah ini masih berlangsung"
 
@@ -4899,26 +4986,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr "Laporan ini adalah duplikat. Silakan tambahkan pembaruan pada laporan asli:"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Laporan ini menunggu moderasi."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Laporan ini saat ini ditandai sebagai ditutup."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Laporan ini saat ini ditandai sebagai diatasi."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Laporan ini saat ini ditandai sebagai terbuka."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4926,15 +5013,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Halaman web ini juga berisi foto masalah yang disediakan oleh pengguna."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Waktu yang dihabiskan (dalam menit):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4958,6 +5048,10 @@ msgstr "Judul"
 msgid "Title:"
 msgstr "Judul:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "Untuk mencari tahu peringatan lokal apa saja yang tersedia untuk Anda, silakan masukkan %s kode pos atau nama jalan dan kawasan Anda:"
@@ -4983,7 +5077,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "Untuk melihat peta dari lokasi tepat dari masalah ini"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -5008,11 +5102,6 @@ msgstr ""
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr "Perlu manajemen lalu lintas?"
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -5035,16 +5124,16 @@ msgstr "Cobalah mengirimkan surel langsung kepada kami:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5054,7 +5143,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5084,10 +5173,10 @@ msgstr "Kesalahan tidak diketahui"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "ID masalah tidak diketahui"
 
@@ -5099,13 +5188,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr "Dihapus dari daftar pendek"
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr "Naik satu tingkat"
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Pembaruan"
 
@@ -5156,29 +5245,27 @@ msgstr "Pembaruan membuka kembali masalah"
 msgid "Update statuses"
 msgstr "Perbarui status"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Diperbarui"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Diperbarui!"
 
@@ -5189,7 +5276,7 @@ msgstr "Diperbarui!"
 msgid "Updates"
 msgstr "Pembaruan"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Panjang pembaruan dibatasi hingga %s karakter. Mohon persingkat pembaruan Anda."
 
@@ -5219,6 +5306,14 @@ msgstr "Gunakan ekstensi pengiriman pembaruan Open311"
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr "ID Pengguna untuk dikaitkan dengan komentar yang diambil"
@@ -5232,8 +5327,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5251,7 +5346,7 @@ msgid "User flagged"
 msgstr "Pengguna ditandai"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5264,27 +5359,25 @@ msgstr "Pencarian pengguna menemukan kecocokan pada nama pengguna dan alamat sur
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Pengguna"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr "Pengguna dapat melakukan tindakan berikut ini dalam badan atau area yang ditetapkan untuknya."
 
@@ -5293,9 +5386,9 @@ msgstr "Pengguna dapat melakukan tindakan berikut ini dalam badan atau area yang
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr "Pengguna dapat melakukan tindakan berikut ini dalam badan atau area yang ditetapkan untuknya."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Nilai diperbarui"
 
@@ -5321,7 +5414,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Tampilkan laporan di situs"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Tampilkan laporan berdasarkan kelurahan"
 
@@ -5329,7 +5422,7 @@ msgstr "Tampilkan laporan berdasarkan kelurahan"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5347,7 +5440,7 @@ msgstr "Menampilkan masalah"
 msgid "Ward:"
 msgstr "Kelurahan:"
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Kelurahan di dewan ini"
 
@@ -5417,7 +5510,7 @@ msgstr "Saat dikirim"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr "Duplikat dari laporan yang manakah ini?"
 
@@ -5437,7 +5530,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "Inginkah Anda berkontribusi di FixMyStreet? Kode kami adalah sumber terbuka dan <a href=\"https://fixmystreet.org\">tersedia di fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Inginkah Anda menerima kuesioner lain dalam 4 minggu, mengingatkan Anda untuk memeriksa statusnya?"
 
@@ -5449,7 +5542,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Menuliskan pesan Anda seluruhnya dalam huruf kapital membuatnya sulit dibaca, begitu juga dengan kurangnya tanda baca."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5460,12 +5552,12 @@ msgstr "Menuliskan pesan Anda seluruhnya dalam huruf kapital membuatnya sulit di
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Ya"
 
@@ -5478,7 +5570,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr "Anda sedang offline"
 
@@ -5491,7 +5583,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Anda melaporkan pembaruan berikut ini karena menggunakan kata-kata kasar, berisi informasi pribadi, atau yang serupa;"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5500,7 +5592,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Anda dapat <a href=\"%s%s\">menampilkan masalah di situs ini</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Anda dapat menambahkan surel pengguna yang melanggar aturan ke daftar penyalahgunaan, yang akan otomatis menyembunyikan (dan tidak pernah mengirimkan) laporan yang dibuatnya."
 
@@ -5533,7 +5625,7 @@ msgstr "Anda dapat membantu kami dengan menemukan alamat surel kontak untuk masa
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Anda dapat menandai sebuah badan sebagai dihapus jika Anda tidak ingin badan ini aktif di situs."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5543,7 +5635,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Anda menolak; mohon isi kotak di atas"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr "Anda punya <a id=\"oFN\" href=\"\"><span>%s</span> yang disimpan untuk dikirim</a>."
 
@@ -5551,7 +5643,7 @@ msgstr "Anda punya <a id=\"oFN\" href=\"\"><span>%s</span> yang disimpan untuk d
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Anda sudah menjawab kuesioner ini. Jika Anda punya pertanyaan, silakan <a href='%s'>hubungi kami</a>, atau <a href='%s'>tampilkan masalah Anda</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 #, fuzzy
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Anda sudah melampirkan foto pada laporan ini. Harap perhatikan bahwa Anda dapat melampirkan maksimal 3 foto pada laporan ini (jika Anda mencoba untuk mengunggah lebih banyak, foto terlama akan dihapus)."
@@ -5561,8 +5653,7 @@ msgstr "Anda sudah melampirkan foto pada laporan ini. Harap perhatikan bahwa And
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Anda sudah melampirkan foto pada laporan ini. Harap perhatikan bahwa Anda dapat melampirkan maksimal 3 foto pada laporan ini (jika Anda mencoba untuk mengunggah lebih banyak, foto terlama akan dihapus)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr "Anda sudah melampirkan foto pada pembaruan ini. Harap perhatikan bahwa Anda dapat melampirkan maksimal 3 foto pada pembaruan ini (jika Anda mencoba untuk mengunggah lebih banyak, foto terlama akan dihapus)."
 
@@ -5628,9 +5719,9 @@ msgstr "Laporan Anda"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Akun Anda"
@@ -5639,13 +5730,14 @@ msgstr "Akun Anda"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5674,16 +5766,16 @@ msgstr "Nama Anda"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr "Nama Anda sudah dikirim ke %s, tetapi kami dapat menyembunyikannya di halaman ini:"
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr "Nama Anda telah disembunyikan pada semua laporan dan pembaruan Anda."
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr "Nama Anda telah disembunyikan"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr "Laporan offline Anda"
 
@@ -5704,8 +5796,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr "Sebaliknya, masuk dengan surel dan berikan kata sandi baru. Saat Anda mengeklik tautan di surel Anda, kata sandi Anda akan diperbarui."
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5738,7 +5830,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr "Pembaruan Anda telah disimpan secara offline untuk dikirim saat Anda kembali online."
 
@@ -5769,19 +5861,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "semua"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5789,8 +5881,8 @@ msgstr ""
 msgid "by %s"
 msgstr "oleh %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "dewan"
 
@@ -5821,6 +5913,10 @@ msgstr "sunting pengguna"
 msgid "from %s different users"
 msgstr "dari %s pengguna berbeda"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5838,7 +5934,7 @@ msgstr "n/a"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr "tidak ada"
 
@@ -5921,12 +6017,12 @@ msgid "today"
 msgstr "hari ini"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr "pembaruan"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr "pembaruan"
 
@@ -5951,7 +6047,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "kelurahan"
 
@@ -6003,7 +6099,7 @@ msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d tahun"
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6021,7 +6117,7 @@ msgid "%s problem reported"
 msgid_plural "%s problems reported"
 msgstr[0] "%s masalah dilaporkan"
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6039,19 +6135,19 @@ msgid "<big>%s</big> fixed in past month"
 msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> diatasi dalam bulan terakhir"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> laporan dalam minggu terakhir"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> laporan baru-baru ini"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6081,27 +6177,39 @@ msgid "last updated %d day ago"
 msgid_plural "last updated %d days ago"
 msgstr[0] "terakhir diperbarui %d hari yang lalu"
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] "laporan"
 
+#~ msgid "Closed by council"
+#~ msgstr "Ditutup oleh dewan"
+
+#~ msgid "Filter report list"
+#~ msgstr "Filter daftar laporan"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Nilai agency_responsible keliru %s"
+
+#~ msgid "Post"
+#~ msgstr "Kirim"
+
+#~ msgid "Traffic management required?"
+#~ msgstr "Perlu manajemen lalu lintas?"
+
 #~ msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 #~ msgstr "<strong>Catatan:</strong> Laporan ini telah diteruskan untuk ditindaki. Perubahan apa pun yang dibuat tidak akan diteruskan."
 
 #~ msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 #~ msgstr "<strong>Catatan:</strong> Laporan ini belum diteruskan untuk ditindaki. Perubahan apa pun yang dibuat tidak akan diteruskan."
 
-#~ msgid "Available categories"
-#~ msgstr "Kategori yang tersedia"
-
 #~ msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent."
 #~ msgstr "Beri centang pada <strong>inspeksi diperlukan</strong> jika laporan dalam kategori ini<strong>harus diinspeksi</strong> sebelum dikirim."
 
diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
index 7be3434c1..031439387 100644
--- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -4,15 +4,17 @@
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
 # Translators:
-# mySociety <transifex@mysociety.org>, 2019
+# mySociety <transifex@mysociety.org>, 2020
+# Carmine Rosamilia <carmine.rosamilia24@gmail.com>, 2020
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
-"PO-Revision-Date: 2019-04-29 18:03+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
+"PO-Revision-Date: 2020-03-05 09:59+0000\n"
+"Last-Translator: Carmine Rosamilia <carmine.rosamilia24@gmail.com>, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/mysociety/teams/12067/it/)\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +22,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "e"
@@ -56,14 +58,14 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Riassunto sulle segnalazioni"
 
 #. ("%s here is the site name")
 #: templates/web/base/admin/navigation.html:3
 msgid "%s admin:"
-msgstr ""
+msgstr "%s amministratore:"
 
 #: templates/web/base/status/stats.html:26
 msgid "%s bodies"
@@ -111,7 +113,7 @@ msgstr "%s questionari inviati &ndash; %s compilati (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -157,6 +159,8 @@ msgstr "(non esiste più)"
 msgid "(not sent to council)"
 msgstr "(non inviato al Comune)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -164,7 +168,7 @@ msgstr "(opzionale)"
 
 #: templates/web/base/report/_item_small.html:28
 msgid "(sent to all)"
-msgstr ""
+msgstr "(inviato a tutti)"
 
 #: templates/web/base/report/_item_small.html:29
 msgid "(sent to both)"
@@ -175,8 +179,8 @@ msgstr "(inviato ad entrambi)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Scegli una categoria --"
@@ -187,7 +191,7 @@ msgstr "-- Scegli un'opzione --"
 
 #: templates/web/base/contact/enquiry/index.html:35
 msgid "-- Please select --"
-msgstr ""
+msgstr "-- Si prega di selezionare -- "
 
 #: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
@@ -202,17 +206,18 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> salvati."
 
@@ -242,13 +247,13 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Si</strong> Ho già la password"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
-msgstr ""
+msgstr "<u>Scatta o scegli una foto esistente </u>"
 
 #: templates/web/base/admin/bodies/contact-form.html:12
 msgid "A service ID (Open311 or similar)."
-msgstr ""
+msgstr "Un ID di servizio (Open311 o simile)."
 
 #: templates/web/base/report/new/form_user.html:8
 msgid "About the problem"
@@ -256,10 +261,10 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Root.pm:128
 msgid "Access denied"
-msgstr ""
+msgstr "Accesso negato"
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr "Attiva l'autenticazione a due fattori"
 
@@ -279,10 +284,9 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:108
-#, fuzzy
+#: templates/web/base/admin/bodies/contact-form.html:140
 msgid "Add another parent category"
-msgstr "Aggiungi una nuova categoria"
+msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:139
 #: templates/web/base/admin/bodies/index.html:78
@@ -312,7 +316,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Aggiungi una nuova categoria"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "Aggiungi opzione"
 
@@ -321,8 +325,8 @@ msgstr "Aggiungi opzione"
 msgid "Add phone number"
 msgstr "Aggiungi numero telefonico"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -330,23 +334,22 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Aggiungi un'utente"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Aggiungi/modifica categorie di problemi"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Aggiungi/modifica priorità risposta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
-msgstr ""
+msgstr "Aggiungere/modificare i modelli di risposta"
 
 #: templates/web/base/my/my.html:119
 msgid "Added %s"
@@ -358,6 +361,12 @@ msgstr ""
 
 #: templates/web/base/main_nav_items.html:31
 msgid "Admin"
+msgstr "Amministratore"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:51
@@ -372,23 +381,25 @@ msgstr "Segnalazione %d creata per %s tipo %s, parametri %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Segnalazione %d disabilitata (creata %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Avvisami su futuri aggiornamenti"
 
 #: templates/web/base/admin/reports/edit.html:96
 msgid "Alerts:"
-msgstr ""
+msgstr "Avvisi:"
 
 #: templates/web/base/dashboard/index.html:40
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Tutte"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Tutte le segnalazioni"
@@ -428,9 +439,13 @@ msgstr "Tutte le segnalazioni tra %s e %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+msgid "Allow anonymous reports on this category"
+msgstr ""
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
-msgstr ""
+msgstr "È già stato segnalato?"
 
 #: templates/web/base/my/anonymize.html:20
 msgid "Alternatively, we can hide your name on <strong>all of your reports and updates</strong> across the site:"
@@ -446,9 +461,8 @@ msgid "An email address or service ID (Open311 or similar)."
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:14
-#, fuzzy
 msgid "An email address."
-msgstr "Aggiungi un indirizzo email"
+msgstr "Un indirizzo e-mail."
 
 #: templates/web/base/questionnaire/index.html:33
 msgid "An update marked this problem as fixed."
@@ -464,7 +478,7 @@ msgstr "Anonimo"
 msgid "Anonymous user"
 msgstr "Utente anonimo"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -474,20 +488,20 @@ msgstr "Anonimo:"
 #: templates/web/base/report/new/form_user_loggedin.html:25
 #: templates/web/base/report/update/form_user_loggedin.html:16
 msgid "Another user"
-msgstr ""
+msgstr "Un altro utente"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
-msgstr ""
+msgstr "Sei sicuro di voler cancellare questo caricamento?"
 
 #. ("JS")
 #: templates/web/base/admin/manifesttheme/form.html:62
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Sei sicuro?"
@@ -498,7 +512,7 @@ msgstr "Sei sicuro?"
 msgid "Area covered"
 msgstr "Area coperta"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -508,30 +522,34 @@ msgid "As this is a staging site and %s is false, reports made on this site will
 msgstr ""
 
 #: templates/web/base/admin/users/index.html:73
-#, fuzzy
 msgid "Assign selected to role:"
-msgstr "Assegnato a %s"
+msgstr "Assegnare il ruolo selezionato:"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
-msgstr ""
+msgstr "Assegnare al corpo competente:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Assegna ad una categoria differente:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Assegna ad un corpo esterno:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Assegna ad una subdivisione:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
-msgstr ""
+msgstr "Assegnare gli utenti alle aree"
+
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Tutte le categorie"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
@@ -545,47 +563,48 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Al momento funziona solo la ricerca e la visualizzazione delle segnalazioni."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
-msgstr ""
+msgstr "Gli utenti del personale autorizzato possono essere associati alle categorie in cui operano."
 
 #: templates/web/base/admin/templates/view.html:9
 msgid "Auto Response"
 msgstr "Rispondi automaticamente"
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Risposta automatica:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
-msgstr ""
+msgstr "Automatically populate report subject/detail"
 
 #: templates/web/base/reports/index.html:112
 msgid "Average time between a problem being reported and being fixed, last 100 reports."
-msgstr ""
+msgstr "Tempo medio tra la segnalazione di un problema e la sua risoluzione, ultime 100 segnalazioni."
 
 #: templates/web/base/report/new/after_photo.html:7
 msgid "Avoid personal information and vehicle number plates"
-msgstr ""
+msgstr "Evitare le informazioni personali e le targhe dei veicoli"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "In attesa di moderazione"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Indietro"
 
 #: templates/web/base/report/_main.html:8
 msgid "Back to all reports"
-msgstr ""
+msgstr "Torna a tutti i rapporti"
 
 #: templates/web/base/admin/manifesttheme/index.html:9
 msgid "Background Colour"
-msgstr ""
+msgstr "Colore di sfondo "
 
 #: templates/web/base/admin/report_blocks.html:18
 msgid "Ban user"
@@ -593,16 +612,14 @@ msgstr "Segnala utente"
 
 #: templates/web/base/admin/extra-metadata-item.html:35
 msgid "Behaviour"
-msgstr ""
+msgstr "Comportamento"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Corpi"
 
@@ -615,11 +632,13 @@ msgstr "Corpi"
 msgid "Body"
 msgstr "Corpo"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Corpo:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr "File CSV"
 
@@ -631,8 +650,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Non riesci a vedere la mappa? <em>Salta questo passaggio</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -648,15 +666,13 @@ msgstr "Categorie:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -664,11 +680,11 @@ msgstr "Categoria"
 
 #: templates/web/base/dashboard/index.html:104
 msgid "Category and State"
-msgstr ""
+msgstr "Categoria e Stato"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr ""
+msgstr "La categoria è cambiata da '%s' ad '%s'"
 
 #: templates/web/base/admin/stats/fix_rate.html:1
 #: templates/web/base/admin/stats/index.html:14
@@ -689,6 +705,11 @@ msgstr "Categoria:"
 msgid "Change"
 msgstr "Modifica"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Cambia la password"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -705,10 +726,9 @@ msgstr "Cambia la password"
 msgid "Change phone number"
 msgstr "Cambia il numero telefonico"
 
-#: templates/web/base/auth/generate_token.html:56
-#, fuzzy
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
-msgstr "Attiva l'autenticazione a due fattori"
+msgstr "Modifica l'autenticazione a due fattori"
 
 #: templates/web/base/admin/bodies/_category_field.html:3
 msgid ""
@@ -716,12 +736,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
-msgstr ""
+msgstr "Scegliere un altro"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr "Cancella dati offline"
 
@@ -731,35 +751,35 @@ msgstr "Fai click sulla mappa per segnalare un problema"
 
 #: templates/web/base/email_sent.html:13
 msgid "Click the link in our confirmation email to activate your alert."
-msgstr ""
+msgstr "Clicca il link nella nostra e-mail di conferma per attivare il tuo avviso."
 
 #: templates/web/base/email_sent.html:9
 msgid "Click the link in our confirmation email to publish your problem."
-msgstr ""
+msgstr "Clicca il link nella nostra e-mail di conferma per pubblicare il tuo problema."
 
 #: templates/web/base/email_sent.html:11
 msgid "Click the link in our confirmation email to publish your update."
-msgstr ""
+msgstr "Clicca il link nella nostra e-mail di conferma per pubblicare il tuo aggiornamento."
 
 #: templates/web/base/auth/token.html:23
 msgid "Click the link in our confirmation email to sign in."
-msgstr ""
+msgstr "Clicca il link nella nostra e-mail di conferma per accedere."
 
 #: templates/web/base/auth/token.html:20
 msgid "Click the link in that email to sign in."
-msgstr ""
+msgstr "Clicca il link in quella e-mail per accedere."
 
 #: templates/web/base/report/new/fill_in_details_form.html:7
 msgid "Click the map or drag the pin to adjust the location"
-msgstr ""
+msgstr "Fare clic sulla mappa o trascinare il pin per regolare la posizione"
 
 #: templates/web/base/report/new/duplicate_suggestions.html:6
 msgid "Close"
-msgstr ""
+msgstr "Chiudi"
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -769,13 +789,9 @@ msgstr ""
 msgid "Closed"
 msgstr "Chiuso"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Chiuso dal comune"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
-msgstr ""
+msgstr "Chiuso agli aggiornamenti"
 
 #: templates/web/base/admin/reports/edit.html:38
 msgid "Co-ordinates:"
@@ -806,13 +822,12 @@ msgid "Code"
 msgstr "Codice"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Configurazione"
@@ -828,7 +843,7 @@ msgstr "Conferma l'account"
 
 #: templates/web/base/report/form/user_loggedout_password.html:26
 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated."
-msgstr ""
+msgstr "Confermare via e-mail invece, fornendo una nuova password a quel punto. Quando confermerai, la tua password sarà aggiornata."
 
 #: templates/web/base/questionnaire/creator_fixed.html:1
 #: templates/web/base/tokens/confirm_problem.html:1
@@ -874,11 +889,11 @@ msgstr "Continua"
 
 #: templates/web/base/report/new/duplicate_suggestions.html:17
 msgid "Continue – report a new problem"
-msgstr ""
+msgstr "Continua - segnala un nuovo problema"
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:151
 msgid "Convert location from Easting/Northing"
-msgstr ""
+msgstr "Convert location from Easting/Northing"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:723
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:753
@@ -927,9 +942,9 @@ msgstr "Crea una segnalazione"
 
 #: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:7
 msgid "Create an account"
-msgstr ""
+msgstr "Crea un account"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Crea una categoria"
@@ -939,34 +954,43 @@ msgstr "Crea una categoria"
 msgid "Create priority"
 msgstr "Crea una priorità"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
-msgstr ""
+msgstr "Crea segnalazioni/aggiornamenti come utente anonimo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
-msgstr ""
+msgstr "Creare rapporti/aggiornamenti per conto di un utente"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Crea template"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Creato"
 
 #: templates/web/base/admin/users/import.html:20
 msgid "Created %d new users"
-msgstr ""
+msgstr "Creato %d nuovi utenti"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Creato"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Creato"
 
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
@@ -979,10 +1003,6 @@ msgstr "Creato:"
 msgid "Current password:"
 msgstr "Password attuale:"
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr "Token attuale:"
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -992,19 +1012,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
-msgstr ""
+msgstr "Cliente non contattabile"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Pannello di controllo"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr "Disattiva l'autenticazione a due fattori"
 
@@ -1016,7 +1038,7 @@ msgstr ""
 msgid "Default"
 msgstr "Default"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1026,15 +1048,14 @@ msgid "Delete"
 msgstr "Elimina"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
-msgstr ""
+msgstr "Cancellare il modello"
 
 #: templates/web/base/admin/manifesttheme/form.html:62
-#, fuzzy
 msgid "Delete theme"
-msgstr "Elimina"
+msgstr "Cancellare il tema"
 
 #: templates/web/base/admin/bodies/contact-form.html:40
 #: templates/web/base/admin/bodies/index.html:31
@@ -1045,21 +1066,18 @@ msgstr "Eliminato"
 #: templates/web/base/report/_main.html:125
 #: templates/web/base/report/update.html:56
 msgid "Describe why you are moderating this"
-msgstr ""
+msgstr "Descrivete il motivo per cui state moderando questo"
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Descrizione"
 
 #: templates/web/base/admin/bodies/contact-form.html:7
-#, fuzzy
 msgid "Destination"
-msgstr "Descrizione"
+msgstr "Destinazione"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr "Le informazioni dettagliate sono limitate a %d caratteri."
 
@@ -1080,7 +1098,7 @@ msgstr "Dettagli:"
 
 #: templates/web/base/dashboard/index.html:105
 msgid "Device and Site"
-msgstr ""
+msgstr "Dispositivo e sito"
 
 #: templates/web/base/admin/bodies/body.html:94
 msgid "Devolved"
@@ -1088,24 +1106,34 @@ msgstr "Devoluto:"
 
 #: templates/web/base/admin/bodies/edit-league.html:8
 msgid "Diligency prize league table"
-msgstr ""
+msgstr "Classifica dei premi di diligenza"
 
 #: templates/web/base/admin/users/alerts.html:14
 msgid "Disable"
-msgstr ""
+msgstr "Disabilita"
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
-msgstr ""
+msgstr "Disabilitare il modulo quando questa categoria è selezionata"
 
 #: templates/web/base/admin/extra-metadata-option.html:18
 msgid "Disable form when this option is selected"
-msgstr ""
+msgstr "Disabilitare il modello quando questa opzione è selezionata"
+
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Disabilitare il modulo quando questa categoria è selezionata"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Ottieni gli aggiornamenti dei problemi in questo %s"
 
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
-msgstr ""
+msgstr "Disabilitato:"
 
 #: templates/web/base/report/_main.html:130
 #: templates/web/base/report/update.html:59
@@ -1114,7 +1142,7 @@ msgstr "Non salvare modifiche"
 
 #: templates/web/base/admin/extra-metadata-item.html:67
 msgid "Display as"
-msgstr ""
+msgstr "Visualizzare come:"
 
 #: templates/web/base/admin/extra-metadata-option.html:10
 msgid "Displayed label"
@@ -1122,7 +1150,7 @@ msgstr ""
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:107
 msgid "Do not send email alerts on fetched comments to problem creator"
-msgstr ""
+msgstr "Non inviare avvisi via e-mail sui commenti ricevuti al creatore del problema"
 
 #. ("%s is the site name")
 #: templates/web/base/report/form/user_loggedout.html:5
@@ -1135,26 +1163,26 @@ msgstr "Non lo so"
 
 #: templates/web/base/contact/index.html:128
 msgid "Don't like forms?"
-msgstr ""
+msgstr "Non ti piacciono i moduli?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
-msgstr ""
+msgstr "Elenco a discesa"
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr "Duplicato di"
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr "Duplicati"
 
@@ -1166,7 +1194,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1178,7 +1206,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Modifica"
@@ -1189,12 +1217,11 @@ msgstr "Modifica"
 msgid "Edit body details"
 msgstr "Modifica dettagli corpo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1202,17 +1229,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Modifica segnalazioni"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1249,8 +1274,9 @@ msgstr "Editor"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1259,15 +1285,14 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Email"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Indirizzo email"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr "Indirizzo email (opzionale)"
 
@@ -1287,12 +1312,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "Email verificata:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Email:"
@@ -1355,12 +1381,11 @@ msgstr "Data di fine"
 msgid "Endpoint"
 msgstr "Punto finale"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
-#, fuzzy
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
-msgstr "Inserisci il nome di una strada nelle vicinanze e una città o solo in nome della città "
+msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Inserisci il piu vicino codice postale UK, o il nome di una strada e una città "
 
@@ -1387,10 +1412,10 @@ msgstr "Inserisci i dettagli del problema"
 msgid "Error"
 msgstr "Errore"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1403,7 +1428,7 @@ msgstr "Esempio codice postale %s"
 msgid "Examples:"
 msgstr "Esempi:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1412,7 +1437,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr "Ingrandisci mappa"
 
@@ -1437,7 +1462,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1449,20 +1474,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "Campi extra"
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Dati extra:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1495,20 +1520,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr ""
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Prima volta"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Foto delle piu vicine e recenti segnalazioni"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nuove segnalazioni"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1538,7 +1568,7 @@ msgstr "Segna come cancellato"
 msgid "Flag user"
 msgstr "Utente segnalato"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Segnalato"
@@ -1547,7 +1577,7 @@ msgstr "Segnalato"
 msgid "Flagged reports and users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1555,8 +1585,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Segnalato:"
 
@@ -1582,11 +1612,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Hai dimenticato la tua password?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1596,12 +1626,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Domande Frequenti"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr "Genera token"
 
@@ -1623,7 +1661,7 @@ msgstr "Ottieni gli aggiornamenti di %s problemi"
 msgid "Get updates of problems in this %s"
 msgstr "Ottieni gli aggiornamenti dei problemi in questo %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Dammi un' RSS feed"
 
@@ -1639,15 +1677,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1657,7 +1695,7 @@ msgstr "Vai"
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1683,6 +1721,7 @@ msgstr "Avevi mai segnalato un problema ad un comune precedentemente, o questa 
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1717,7 +1756,8 @@ msgstr "Nascosto"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1745,14 +1785,13 @@ msgstr "Nascondi il mio nome in questa segnalazione"
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:52
-#, fuzzy
 msgid "Hide reports made in this category"
-msgstr "Riportato nella categoria %s"
+msgstr ""
 
 #: templates/web/base/report/update.html:18
 msgid "Hide update completely?"
@@ -1799,11 +1838,9 @@ msgstr "Mi spiace non possiamo localizzare il tuo problema nel database.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1822,15 +1859,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1844,7 +1881,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1868,7 +1905,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1905,7 +1942,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1929,6 +1966,16 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+msgid "In wards"
+msgstr ""
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1938,20 +1985,20 @@ msgstr "Non attivo"
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1960,24 +2007,19 @@ msgid "Internal data set by Open311"
 msgstr ""
 
 #: templates/web/base/admin/extra-metadata-option.html:6
-#, fuzzy
 msgid "Internal key"
-msgstr "Note interne"
+msgstr ""
 
 #: templates/web/zurich/admin/list_updates.html:35
 msgid "Internal notes"
 msgstr "Note interne"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2013,9 +2055,8 @@ msgid "Last editor"
 msgstr "Ultima modifica"
 
 #: templates/web/base/admin/reports/edit.html:92
-#, fuzzy
 msgid "Last failure:"
-msgstr "Ultimo aggiornamento:"
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:55
 msgid "Last update"
@@ -2029,13 +2070,13 @@ msgstr "Ultimo aggiornamento:"
 msgid "Last&nbsp;update:"
 msgstr "Ultimo&nbsp;aggiornamento:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Latitudine/Longitudine:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2052,7 +2093,7 @@ msgstr "Lista di tutti i problemi segnalati"
 msgid "Loading reports…"
 msgstr "Caricamento segnalazioni in corso..."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Caricamento in corso..."
@@ -2090,25 +2131,25 @@ msgid "Log in with Twitter"
 msgstr "Login via Twitter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "Login tramite email"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr "Login tramite email/testo"
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr "Logout di tutte le sessioni"
 
 #: templates/web/base/auth/general.html:36
 #: templates/web/base/report/form/user.html:18
-#, fuzzy
 msgid "Login with %s"
-msgstr "Login tramite email"
+msgstr ""
 
 #: templates/web/base/dashboard/index.html:83
 msgid "Look up"
@@ -2119,19 +2160,20 @@ msgstr ""
 msgid "MAP"
 msgstr "MAPPA"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr "Ordinamento manuale"
@@ -2145,24 +2187,24 @@ msgstr "Mappa"
 msgid "Mark as sent"
 msgstr "Segna come inviato"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Messaggio"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2175,7 +2217,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -2183,8 +2225,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2207,7 +2248,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2217,14 +2258,14 @@ msgstr ""
 msgid "Month"
 msgstr "Mese"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2252,9 +2293,10 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Nome:"
@@ -2272,7 +2314,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Il più vicino nome della strada al segno posizionato sulla mappa (automaticamente generato usando OpenStreetMap): %s%s"
 
@@ -2280,12 +2322,12 @@ msgstr "Il più vicino nome della strada al segno posizionato sulla mappa (autom
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2308,7 +2350,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Nuovo corpo aggiunto"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Nuova categoria contatto aggiunta"
 
@@ -2318,12 +2360,11 @@ msgstr "Nuovo indirizzo email:"
 
 #: templates/web/base/admin/extra-metadata-item.html:14
 #: templates/web/base/admin/extra-metadata-item.html:20
-#, fuzzy
 msgid "New field"
-msgstr "Aggiungi campo"
+msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr ""
 
@@ -2331,13 +2372,13 @@ msgstr ""
 msgid "New local problems on FixMyStreet"
 msgstr "Nuovi problemi locali su FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Nuova password:"
 
@@ -2414,7 +2455,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Più recenti"
@@ -2427,7 +2468,6 @@ msgstr "Prossimo"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2436,11 +2476,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "No"
 
@@ -2452,11 +2492,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Nessun corpo"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Nessun comune selezionato"
 
@@ -2472,8 +2513,8 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Nessun ulteriore aggiornamento"
 
@@ -2509,15 +2550,15 @@ msgstr "Nessun sostenitore"
 msgid "None"
 msgstr "Nessuno"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2525,10 +2566,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Non segnalato precedente"
@@ -2560,9 +2605,8 @@ msgid "Notice shown to user"
 msgstr ""
 
 #: templates/web/base/admin/extra-metadata-item.html:61
-#, fuzzy
 msgid "Notice text"
-msgstr "Avviso"
+msgstr ""
 
 #: templates/web/base/reports/index.html:127
 msgid "Number of problems reported in each category, in the last 7 days."
@@ -2577,12 +2621,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2590,12 +2634,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Vecchio stato"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Più vecchi"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2604,7 +2648,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2635,7 +2679,7 @@ msgstr ""
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr "Opzioni"
 
@@ -2647,7 +2691,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2655,16 +2699,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2696,36 +2740,33 @@ msgstr "Pagina non trovata"
 msgid "Parent"
 msgstr "Parente"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
-#, fuzzy
+#: templates/web/base/admin/bodies/contact-form.html:130
 msgid "Parent categories"
-msgstr "Altre categorie"
+msgstr ""
 
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:66
 msgid "Partial"
 msgstr "Parziale"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Password (opzionale)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
-#, fuzzy
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
-msgstr "La tua password è stata cambiata"
+msgstr ""
 
 #: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:5
-#, fuzzy
 msgid "Password expired"
-msgstr "Password (opzionale)"
+msgstr ""
 
 #: templates/web/base/admin/roles/index.html:6
 msgid "Permissions"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2733,19 +2774,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefono:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Numero di telefono"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Numero di telefono (opzionale)"
 
@@ -2753,30 +2799,26 @@ msgstr "Numero di telefono (opzionale)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr "Telefono verificato:"
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefono:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2796,9 +2838,8 @@ msgstr "Fotografia richiesta"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Fotografie"
@@ -2807,7 +2848,7 @@ msgstr "Fotografie"
 msgid "Photos of recent nearby reports"
 msgstr "Foto delle piu vicine e recenti segnalazioni"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2821,6 +2862,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Inserisci il cursore sulla mappa"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2848,27 +2894,26 @@ msgid "Please check your email address is correct"
 msgstr "Per favore controlla che il tuo indirizzo email è corretto"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr "Assicurati che il tuo numero di telefono sia esatto"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Per favore scegli una categoria"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2887,27 +2932,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Per favore non abusarne&nbsp;&mdash; abusandone il comune svaluterà il servizio per tutti gli utenti."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Per favore inserisci un messaggio"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr "Inserisci un numero di cellulare"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Inserire un nome"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2920,16 +2965,16 @@ msgstr "Per favore inserisci la password"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Per favore inserisci il soggetto"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2940,20 +2985,20 @@ msgstr "Per favore inserire un email valida"
 msgid "Please enter a valid email address"
 msgstr "Per favore inserire un indirizzo email valido"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr "Inserire un numero di telefono oppure un'email valida"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Per favore inserire qualche dettaglio "
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2969,21 +3014,20 @@ msgid "Please enter your first name"
 msgstr "Per favore inserisci il tuo nome"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Per favore inserisci il tuo nome completo, i comuni hanno bisogno di questa informazione - Se non vuoi che il tuo nome venga mostrato sul sito, deseleziona il box qui sotto"
 
 #: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:35
-#, fuzzy
 msgid "Please enter your full name."
-msgstr "Per favore inserisci il tuo nome"
+msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Per favore inserisci il tuo nome"
@@ -3024,19 +3068,18 @@ msgstr "Si prega di compilare il modulo sottostante con i dettagli del problema,
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Per favore indicare se si vuole ricevere un altro questionario"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
-#, fuzzy
 msgid "Please make sure you are not including an email address"
-msgstr "Per favore inserire un indirizzo email valido"
+msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3063,24 +3106,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Attenzione:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Per favore provvedi ad alcune spiegazioni perché stai riaprendo questa segnalazione"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Per favore provvedi a del testo come ad una foto"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Per favore dicci se hai mai precedentemente riportato un problema al tuo comune "
 
@@ -3088,7 +3135,7 @@ msgstr "Per favore dicci se hai mai precedentemente riportato un problema al tuo
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3100,7 +3147,7 @@ msgstr "Si prega di selezionare il feed che si vuole"
 msgid "Please select the type of alert you want"
 msgstr "Per favore seleziona il tipo di avvertimento che desideri"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Si prega di indicare se il problema è stato risolto"
 
@@ -3108,12 +3155,12 @@ msgstr "Si prega di indicare se il problema è stato risolto"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Invia un'unica fotografia"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3121,27 +3168,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Per favore scrivi un messaggio"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Posta"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Postato anonimamente al %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Postato da %s al %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Postato da <strong>%s</strong> (%s) al %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Postato da <strong>%s</strong> al %s"
 
@@ -3157,7 +3200,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3165,11 +3208,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Precedente"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Priorità"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Priorità"
@@ -3185,9 +3228,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privato"
 
@@ -3204,23 +3247,20 @@ msgid "Problem %d created"
 msgstr "Problema %d creato"
 
 #: templates/web/base/admin/users/log.html:54
-#, fuzzy
 msgid "Problem %s added to shortlist"
-msgstr "Problema %s inviato al comune %s"
+msgstr ""
 
 #: templates/web/base/admin/timeline.html:24
 msgid "Problem %s confirmed"
 msgstr "Problema %s confermato"
 
 #: templates/web/base/admin/users/log.html:47
-#, fuzzy
 msgid "Problem %s created"
-msgstr "Problema %d creato"
+msgstr ""
 
 #: templates/web/base/admin/users/log.html:49
-#, fuzzy
 msgid "Problem %s created on behalf of %s"
-msgstr "Problema %d creato"
+msgstr ""
 
 #: templates/web/base/admin/users/log.html:56
 msgid "Problem %s removed from shortlist"
@@ -3236,7 +3276,7 @@ msgstr "Problema %s inviato al comune %s"
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problema marcato come aperto."
 
@@ -3244,8 +3284,7 @@ msgstr "Problema marcato come aperto."
 msgid "Problem state change based on survey results"
 msgstr "Il cambio di stato del problema è basato sui risultati del sondaggio"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemi"
@@ -3270,18 +3309,18 @@ msgstr "Problemi recentemente segnalati e risolti su FIxMyStreet"
 msgid "Problems within %.1fkm of %s"
 msgstr "Problemi entro %.1fkm da %s"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemi dentro %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemi dentro %s quartiere"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3289,7 +3328,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3297,11 +3336,15 @@ msgstr ""
 msgid "Property address:"
 msgstr "L'indirizzo della proprietà:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3315,11 +3358,11 @@ msgstr "Fornisci un'aggiornamento"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Scegliere una password è opzionale, ma farlo ti acconsentirà di riportare più facilmente le future segnalazioni, di aggiungere degli aggiornamenti e gestire le tue segnalazioni."
 
@@ -3327,12 +3370,12 @@ msgstr "Scegliere una password è opzionale, ma farlo ti acconsentirà di riport
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Risposte pubbliche:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3342,9 +3385,8 @@ msgid "Publish photo"
 msgstr "Pubblica la foto"
 
 #: templates/web/base/admin/extra-metadata-item.html:60
-#, fuzzy
 msgid "Question text"
-msgstr "Questionario"
+msgstr ""
 
 #: templates/web/base/questionnaire/completed.html:1
 #: templates/web/base/questionnaire/index.html:0
@@ -3375,11 +3417,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS feed per %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -3387,11 +3429,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS feed di %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS feed di %s, dentro al quartiere %s "
 
@@ -3399,13 +3441,13 @@ msgstr "RSS feed di %s, dentro al quartiere %s "
 msgid "RSS feed of nearby problems"
 msgstr "RSS feed dei problemi vicino"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS feed dei problemi dentro %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS feed di problemi dentro al quartiere %s "
 
@@ -3419,11 +3461,11 @@ msgstr "RSS feed dei recenti problemi locali"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS feed degli aggiornamenti su questa segnalazione"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3436,7 +3478,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Ricevi un'email quando gli aggiornamenti sono aggiunti su questa segnalazione."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3450,7 +3492,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Problemi segnalati di recente"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3463,7 +3505,8 @@ msgstr "Segnalazione rifiutata"
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Ricorda che FIxMyStreet serve per segnalare problemi materiali che possono essere risolti. Se il tuo non è un problema appropriato, da segnalare attraverso questo sito, ti ricordiamo che puoi sempre contattare tu direttamente il comune attraverso il suo sito internet."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3475,8 +3518,8 @@ msgstr "Rimuovi campo"
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3488,21 +3531,24 @@ msgid "Remove from site"
 msgstr ""
 
 #: templates/web/base/admin/extra-metadata-option.html:26
-#, fuzzy
 msgid "Remove option"
-msgstr "Rimuovi campo"
+msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3510,14 +3556,14 @@ msgstr ""
 msgid "Report"
 msgstr "Segnalazione"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "ID segnalazione:"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3526,7 +3572,7 @@ msgid "Report a problem"
 msgstr "Segnala un problema"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr "Segnala un problema qui"
@@ -3537,12 +3583,11 @@ msgstr "Segnala un abuso"
 
 #: templates/web/base/report/form/user.html:32
 #: templates/web/base/report/form/user.html:39
-#, fuzzy
 msgid "Report anonymously"
-msgstr "Segnalato anonimamente al %s"
+msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3553,9 +3598,8 @@ msgid "Report as"
 msgstr ""
 
 #: templates/web/base/report/new/form_public_councils_text.html:3
-#, fuzzy
 msgid "Report details"
-msgstr "Segnala un abuso"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:306
 msgid "Report on %s"
@@ -3578,7 +3622,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Segnala, conosci e discuti sui problemi della tua città "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Segnalato anonimamente al %s"
@@ -3589,7 +3633,7 @@ msgstr "Segnalato anonimamente al %s"
 msgid "Reported before"
 msgstr "Segnalati prima"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Segnalato da %s al %s"
@@ -3603,27 +3647,27 @@ msgstr "Segnalato da:"
 msgid "Reported in the %s category"
 msgstr "Riportato nella categoria %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Riportato nella categoria %s anonimamente alle %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Riportato nella categoria %s da %s alle %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Segnalato via %s in modo anonimo il %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Segnalato via %s da %s il %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -3642,17 +3686,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr "Stai segnalando un problema"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Segnalazioni"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3680,15 +3722,15 @@ msgid "Reports published"
 msgstr "Segnalazioni pubblicate"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr "Segnalazioni salvate offline."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr "Segnalazione inviata a %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3701,7 +3743,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3754,39 +3796,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "E' il posto giusto?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Ruota a sinistra"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3802,20 +3850,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3832,13 +3880,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Ricerca Segnalazioni"
 
@@ -3851,7 +3898,7 @@ msgstr "Ricerca Utenti"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Ricerca segnalazioni"
 
@@ -3866,12 +3913,12 @@ msgstr "Cerca:"
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3881,8 +3928,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3892,7 +3938,7 @@ msgid "Select a body"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Seleziona un'area"
@@ -3913,7 +3959,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3926,7 +3972,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3935,11 +3981,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3977,7 +4023,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3988,7 +4034,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4013,8 +4059,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4025,7 +4071,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr ""
 
@@ -4085,7 +4131,7 @@ msgid "Some photos of recent reports"
 msgstr "Qualche foto di segnalazioni recenti"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4094,12 +4140,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4117,9 +4162,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Ci scusiamo, non possiamo trovare questa zona."
 
@@ -4129,18 +4174,17 @@ msgstr "Ci scusiamo, non possiamo trovare questa zona."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancora."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
-#, fuzzy
 msgid "Sorry, we couldn't save your file(s), please try again."
-msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancora."
+msgstr ""
 
 #: templates/web/base/offline/fallback.html:6
 msgid "Sorry, we don’t have a good enough connection to fetch that page."
@@ -4150,11 +4194,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4163,11 +4207,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4191,18 +4235,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Stato"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4211,31 +4255,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Stato:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Stati"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Status"
 
@@ -4253,7 +4294,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr "Sottocategoria"
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Sottodivisione/Corpo"
 
@@ -4272,50 +4313,48 @@ msgstr "Soggetto:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Invia"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Invia modifiche"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Invia questionario"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Inviato"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Sottoscrivi"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4327,7 +4366,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4341,20 +4380,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Sommario"
 
@@ -4365,14 +4403,19 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4390,21 +4433,24 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Testo"
 
 #: templates/web/base/admin/extra-metadata-item.html:69
-#, fuzzy
 msgid "Text field"
-msgstr "Aggiungi campi extra"
+msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:33
 msgid "Text only version"
@@ -4418,6 +4464,11 @@ msgstr "Solo versione testuale"
 msgid "Text:"
 msgstr "Testo:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Testo"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4447,7 +4498,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Grazie, è fantastico sapere che è stato risolto! Possiamo soltanto chiederti se avevi gia segnalato altri problemi al tuo comune precedentemente?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4459,27 +4510,29 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Questa posizione non sembra essere coperta da un comune; forse è in mare aperto o all'esterno del paese. Riprova."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Questa posizione non sembra essere nel Regno Unito, si prega di riprovare."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Quella segnalazione è stata rimossa da FixMyStreet"
 
@@ -4525,8 +4578,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4580,7 +4633,7 @@ msgstr "L'errore era: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4642,8 +4695,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4676,7 +4729,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4694,12 +4747,12 @@ msgstr "E' accaduto un problema visualizzando questa pagine. Per favore riprova
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "C'è stato un problema con il tuo aggiornamento. Per favore prova ancora."
 
@@ -4707,7 +4760,7 @@ msgstr "C'è stato un problema con il tuo aggiornamento. Per favore prova ancora
 msgid "There were problems with your report. Please see below."
 msgstr "Ci sono stati dei problemi con la tua segnalazione. Per favore guarda qui sotto."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -4783,10 +4836,10 @@ msgstr "Questa email è stata inviata ad entrambi i comuni che coprono la zona d
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Questa informazione è richiesta"
 
@@ -4803,19 +4856,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Questo problema è stato risolto"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Questo problema non è stato risolto"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4828,26 +4885,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4855,15 +4912,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4887,6 +4947,10 @@ msgstr "Titolo"
 msgid "Title:"
 msgstr "Titolo:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4912,7 +4976,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4937,11 +5001,6 @@ msgstr ""
 msgid "Total"
 msgstr "Totale"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr "Traduzione"
@@ -4964,17 +5023,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
-#, fuzzy
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
-msgstr "Attiva l'autenticazione a due fattori"
+msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4984,7 +5042,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5014,10 +5072,10 @@ msgstr "Errore sconosciuto"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5029,20 +5087,19 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr ""
 
 #: templates/web/base/admin/users/log.html:51
-#, fuzzy
 msgid "Update %s created for problem %d"
-msgstr "Questionario %d inviato per il problema %d"
+msgstr ""
 
 #: templates/web/base/admin/timeline.html:33
 msgid "Update %s created for problem %d; by %s"
@@ -5086,29 +5143,27 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Aggiornato!"
 
@@ -5119,7 +5174,7 @@ msgstr "Aggiornato!"
 msgid "Updates"
 msgstr "Aggiornamenti"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5149,6 +5204,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5162,8 +5225,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5181,7 +5244,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5194,27 +5257,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Utenti"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5222,9 +5283,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr ""
 
@@ -5250,7 +5311,7 @@ msgstr "Verifica numero telefonico"
 msgid "View report on site"
 msgstr ""
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5258,7 +5319,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5276,7 +5337,7 @@ msgstr ""
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -5346,7 +5407,7 @@ msgstr ""
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5366,7 +5427,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr ""
 
@@ -5378,7 +5439,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Scrivere il tuo messaggio interamente con lettere maiuscole diventa di difficile lettura, come anche una mancanza di punteggiatura."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5389,12 +5449,12 @@ msgstr "Scrivere il tuo messaggio interamente con lettere maiuscole diventa di d
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Si"
 
@@ -5407,7 +5467,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5420,7 +5480,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5429,7 +5489,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5459,7 +5519,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5469,7 +5529,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Hai rifiutato; Per favore riempi il box qui sopra "
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5477,7 +5537,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5486,8 +5546,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5551,25 +5610,25 @@ msgstr "Tue segnalazioni"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:18
-#, fuzzy
 msgid "Your account requires two-factor authentication to be set up."
-msgstr "Disattiva l'autenticazione a due fattori"
+msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5598,16 +5657,16 @@ msgstr "Il tuo nome"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5627,8 +5686,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5661,7 +5720,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5692,19 +5751,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5712,8 +5771,8 @@ msgstr ""
 msgid "by %s"
 msgstr "da %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "comune"
 
@@ -5744,6 +5803,10 @@ msgstr "Modifica utente"
 msgid "from %s different users"
 msgstr "da %s utenti differenti"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5761,7 +5824,7 @@ msgstr "non disponibile"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5771,15 +5834,13 @@ msgstr ""
 
 #: templates/web/base/contact/enquiry/index.html:26
 #: templates/web/base/contact/index.html:99
-#, fuzzy
 msgid "optional"
-msgstr "(opzionale)"
+msgstr ""
 
 #: templates/web/base/report/form/user.html:31
 #: templates/web/base/report/form/user.html:41
-#, fuzzy
 msgid "or"
-msgstr "o"
+msgstr ""
 
 #: templates/web/base/auth/general.html:6
 msgid "or <a href=\"%s\">create an account</a>"
@@ -5843,12 +5904,12 @@ msgid "today"
 msgstr "oggi"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5873,7 +5934,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr ""
 
@@ -5933,7 +5994,7 @@ msgid_plural "%d years"
 msgstr[0] "%d anno"
 msgstr[1] "%d anni"
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5954,7 +6015,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5975,21 +6036,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> risolti nel mese passato"
 msgstr[1] "<big>%s</big> risolti nel mese passato"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> Segnalazione nell'ultima settimana"
 msgstr[1] "<big>%s</big> Segnalazioni nelle ultime settimane"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> segnalazione recente"
 msgstr[1] "<big>%s</big> segnalazioni recenti"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6024,52 +6085,25 @@ msgid_plural "last updated %d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mese"
 msgstr[1] "mesi"
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] "segnalazione"
 msgstr[1] "segnalazioni"
 
-#~ msgid "Available categories"
-#~ msgstr "Categorie disponibili"
-
-#~ msgid "Coordinates:"
-#~ msgstr "Coordinate:"
-
-#~ msgid "Default priority"
-#~ msgstr "Priorità predefinita"
-
-#~ msgid "Description:"
-#~ msgstr "Descrizione:"
-
-#~ msgid "Hidden Field"
-#~ msgstr "Campo non visibile"
-
-#~ msgid "Hint"
-#~ msgstr "Consiglio"
-
-#~ msgid "Inspection required"
-#~ msgstr "Richiesta ispezione"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Remove"
-#~ msgstr "Rimuovi"
-
-#~ msgid "That report cannot be viewed on %s."
-#~ msgstr "La segnalazione non può essere vista su %s."
+#~ msgid "Closed by council"
+#~ msgstr "Chiuso dal comune"
 
-#~ msgid "There was a problem with your email/password combination. Please try again."
-#~ msgstr "E' accaduto un problema con la tua combinazione email/password. Per favore prova ancora."
+#~ msgid "Current token:"
+#~ msgstr "Token attuale:"
 
-#~ msgid "or locate me automatically"
-#~ msgstr "oppure fatti localizzare automaticamente"
+#~ msgid "Post"
+#~ msgstr "Posta"
diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po
index 8da021680..6d7269b26 100644
--- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/mysociety/teams/12067/lt_LT/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "ir"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Suvestinės ataskaitos"
 
@@ -111,7 +111,7 @@ msgstr "%s klausimynai išsiųsti &ndash; %s atsakyti (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -157,6 +157,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(neišsiųsta tarybai)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(išsiųsta į abu)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Išsirinktite kategorija --"
@@ -205,17 +207,18 @@ msgstr ""
 "Galbūt pridėkite <code>MAPIT_TYPES</code> į savo config failą?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -245,7 +248,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Taip</strong> Aš turiu slaptažodį"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -262,7 +265,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -285,7 +288,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Pridėkite kontaktą naudodami žemiau pateikta anketa"
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Pridėti naują kategoriją"
@@ -318,7 +321,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Pridėti naują kategoriją"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -327,8 +330,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -336,21 +339,20 @@ msgid "Add to shortlist"
 msgstr "Įdėti į trumpajį sąrašą"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Pridėti vartotoją"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Pridėti/redaguoti problemų kategorijas"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Pridėti/redaguoti atsakymų prioritetus"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Pridėti/redaguoti atsakymo šablonus"
 
@@ -366,6 +368,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Dar kartą:"
@@ -378,8 +386,8 @@ msgstr ""
 msgid "Alert %d disabled (created %s)"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Įspėti mane apie atnaujinimus"
 
@@ -391,10 +399,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Visi Pranešimai"
@@ -434,6 +444,10 @@ msgstr "Visi pranešimai nuo %s ir %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+msgid "Allow anonymous reports on this category"
+msgstr ""
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -469,7 +483,7 @@ msgstr "Anoniminis"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -482,7 +496,7 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -491,8 +505,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -503,7 +517,7 @@ msgstr ""
 msgid "Area covered"
 msgstr "Vietovė pažymėta"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -517,27 +531,32 @@ msgstr "Šiuo metu puslapis ir %s yra neveikiantis, sukurti pranešimai bus išs
 msgid "Assign selected to role:"
 msgstr "Priskirta to %s"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Priskirti kitai kategorijai:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Priskirti išoriniai institucijai:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Priskirti padaliniui:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Priskirta to %s"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Priskirta to %s"
@@ -550,7 +569,7 @@ msgstr " %d prašymai yra grąžinami kiekvienai užklausai. Grąžinti prašyma
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Šiuo metu veikia tiktai pranešimų peržiūra ir paieška."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -558,11 +577,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -574,12 +593,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Laukiama "
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Atgal"
@@ -600,14 +620,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Institucijos"
 
@@ -620,11 +638,13 @@ msgstr "Institucijos"
 msgid "Body"
 msgstr "Institucija"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Institucija:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -636,8 +656,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Nematote žemėlapio? <em>Praleiskite šitą žingsnį</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -653,15 +672,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -671,7 +688,7 @@ msgstr "Kategorija"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -694,6 +711,11 @@ msgstr "Kategorija:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Pakeisti slaptažodį"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -710,7 +732,7 @@ msgstr "Pakeisti slaptažodį"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -722,12 +744,12 @@ msgstr ""
 "Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n"
 "to the body too. These will appear in the drop-down menu on the report-a-problem page."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -764,8 +786,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -775,11 +797,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Uždaryta"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Uždaryta "
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -812,13 +830,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Nustatymai"
@@ -935,7 +952,7 @@ msgstr "Sukurti pranešimą"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Sukurti kategoriją"
@@ -945,27 +962,25 @@ msgstr "Sukurti kategoriją"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Sukurti šabloną"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Sukurta"
@@ -974,6 +989,17 @@ msgstr "Sukurta"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Sukurta"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Sukurta"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -985,10 +1011,6 @@ msgstr "Sukurta:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -998,19 +1020,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "Šiuo metu ne viena institucija nėra sukurta."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Įrankių juosta"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1022,7 +1046,7 @@ msgstr "Padalinys atliko per 5 darbo dienas"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1032,7 +1056,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Pašalinti šabloną"
@@ -1054,9 +1078,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Aprašymas"
 
@@ -1065,7 +1087,7 @@ msgstr "Aprašymas"
 msgid "Destination"
 msgstr "Aprašymas"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1101,7 +1123,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1109,6 +1131,15 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+msgid "Disable reopening of reports in this category"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Gauti problemų atnaujinimus iš %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1143,24 +1174,24 @@ msgstr "Don&rsquo;t nežinau"
 msgid "Don't like forms?"
 msgstr "Nepatinka anketos?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1175,7 +1206,7 @@ msgstr ""
 "Different categories <strong>can have the same contact</strong> (email address).\n"
 "This means you can add many categories even if you only have one contact for the body."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1187,7 +1218,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Redaguoti"
@@ -1198,12 +1229,11 @@ msgstr "Redaguoti"
 msgid "Edit body details"
 msgstr "Redaguoti institucijos informaciją"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1211,17 +1241,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1258,8 +1286,9 @@ msgstr "Redaktorius"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1268,15 +1297,14 @@ msgstr "Redaktorius"
 msgid "Email"
 msgstr "El. paštas"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1296,12 +1324,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "El. paštas:"
@@ -1371,12 +1400,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Pabaigos taškas"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Įveskite Z&uuml;rich gatvės pavadinimą"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Įveskite artimiausia pašto kodą arba gatvės pavadinimą ir rajoną"
 
@@ -1403,10 +1432,10 @@ msgstr "įveskite problemos detales"
 msgid "Error"
 msgstr "Klaida"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1419,7 +1448,7 @@ msgstr "Pašto kodo pavyzdys %s"
 msgid "Examples:"
 msgstr "Pavyzdžiai:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1428,7 +1457,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1453,7 +1482,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1465,20 +1494,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Papildoma informacija:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1511,20 +1540,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filtruoti pranešimo sąraša"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Pirmas kartas"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Naujausios gretimų pranešimų nuotraukos"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nauji pranešimai"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Suvarkyti tai pasirenkant <strong>pažymėta vietovę</strong>  <em>Redaguoti informaciją</em>formą."
@@ -1554,7 +1588,7 @@ msgstr "Pažymeti kaip ištrinta"
 msgid "Flag user"
 msgstr "Pažymėti vartotoją"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Pažymėta"
@@ -1563,7 +1597,7 @@ msgstr "Pažymėta"
 msgid "Flagged reports and users"
 msgstr "Flagged reports and users"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Flagged users are listed on the <a href='%s'>flagged</a> page."
 
@@ -1571,8 +1605,8 @@ msgstr "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Pažymėta:"
 
@@ -1598,11 +1632,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Pamiršote slaptažodį?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1612,12 +1646,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Dažniausiai Užduodami Klausimai"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1639,7 +1681,7 @@ msgstr "Gauti šių problemų %s atnaujinimus"
 msgid "Get updates of problems in this %s"
 msgstr "Gauti problemų atnaujinimus iš %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Suteikti man RSS srautą"
 
@@ -1655,15 +1697,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1673,7 +1715,7 @@ msgstr "Pirmyn"
 msgid "Going to send questionnaire?"
 msgstr "Ar ruošiates išsiųsti klausimyną?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1699,6 +1741,7 @@ msgstr "Ar esate pranešęs apie problema anksčiau, o gal tai pirmas kartas?"
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1733,7 +1776,8 @@ msgstr "Paslėpta"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1761,7 +1805,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Paslėpti smeigtukus"
 
@@ -1814,11 +1858,9 @@ msgstr "Apgailestaujame, bet jūsų problema nebuvo rasta duomenų bazėje.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1839,15 +1881,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1863,7 +1905,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1887,7 +1929,7 @@ msgstr "Jei norite, kad šis šablonas būtų naudojamas tik tam tikroms kategor
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1924,7 +1966,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1948,6 +1990,16 @@ msgstr "į piknaudžiavimo lentelę?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+msgid "In wards"
+msgstr ""
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1957,20 +2009,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Pridėti siuntėjo asmeninę informacija"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Incorrect has_photo value \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1987,16 +2039,12 @@ msgstr "Internal notes"
 msgid "Internal notes"
 msgstr "Internal notes"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Invalid agency_responsible value %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Pasirinktas klaidingas formatas %s."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2048,13 +2096,13 @@ msgstr "Paskutinis atnaujinimas:"
 msgid "Last&nbsp;update:"
 msgstr "Last&nbsp;update:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2071,7 +2119,7 @@ msgstr "Pateikti visas praneštas problemas"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Kraunama..."
@@ -2109,17 +2157,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2137,19 +2186,20 @@ msgstr ""
 msgid "MAP"
 msgstr "MAP"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2163,24 +2213,24 @@ msgstr "Žemėlapis"
 msgid "Mark as sent"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Žinutė"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2193,7 +2243,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Missing jurisdiction_id"
 
@@ -2201,8 +2251,7 @@ msgstr "Missing jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2225,7 +2274,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "Moderated by division within one working day"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2235,14 +2284,14 @@ msgstr ""
 msgid "Month"
 msgstr "Mėnuo"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2270,9 +2319,10 @@ msgstr ""
 msgid "Name"
 msgstr "Vardas"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Vardas:"
@@ -2290,7 +2340,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Artimiausia gatvė esanti šalia smeigtuko (automatiškai sugeneruota naudojant OpenStreetMap): %s%s"
 
@@ -2298,12 +2348,12 @@ msgstr "Artimiausia gatvė esanti šalia smeigtuko (automatiškai sugeneruota na
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Artimiausias pašto kodas esantis šalia smeigtuko žemėlapyje (sugeneruota automatiškai): %s (%sm toliau)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Artimiausia gavtė esanti šalia smeigtuko žemėlapyje (sugeneruota automatiškai naudojant Bing Maps): %s "
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2328,7 +2378,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Nauja dalis pridėta"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Naujas kategorijos kontaktas pridetas"
 
@@ -2341,8 +2391,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "New internal note:"
 
@@ -2350,13 +2400,13 @@ msgstr "New internal note:"
 msgid "New local problems on FixMyStreet"
 msgstr "Naujos vietinės problemos FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2433,7 +2483,7 @@ msgstr "Naujas šablonas"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2446,7 +2496,6 @@ msgstr "Kitas"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2455,11 +2504,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Ne"
 
@@ -2471,11 +2520,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Nėra institucijos"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Nepasirinkta savivaldybė"
 
@@ -2491,8 +2541,8 @@ msgstr "Pažymėtos problemos nerastos"
 msgid "No flagged users found."
 msgstr "Pažymėti vartotojai nerasti."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Jokių kitų atnaujinimai"
 
@@ -2530,15 +2580,15 @@ msgstr "Jokių rėmėjų"
 msgid "None"
 msgstr "Nė vienas"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2550,10 +2600,14 @@ msgstr ""
 "                Depending on the implementation, staff users may have access to the dashboard (summary of\n"
 "                activity across their body), the ability to hide reports or set special report statuses."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Ne mano padaliniui"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Nebuvo pranešta anksčiau"
@@ -2601,12 +2655,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2614,12 +2668,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Sena būklė"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2628,7 +2682,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2659,7 +2713,7 @@ msgstr "Open311 initiative web page"
 msgid "Open311 specification"
 msgstr "Open311 specification"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2671,7 +2725,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2679,16 +2733,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2720,7 +2774,7 @@ msgstr "Puslapis nerastas"
 msgid "Parent"
 msgstr "Parent"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Sukurti kategoriją"
@@ -2729,13 +2783,13 @@ msgstr "Sukurti kategoriją"
 msgid "Partial"
 msgstr "Dalinis"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Slaptažodis (nebūtina)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
 msgstr ""
 
@@ -2749,7 +2803,7 @@ msgstr "Slaptažodis (nebūtina)"
 msgid "Permissions"
 msgstr "Permalink"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2757,19 +2811,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefonas:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Telefono numeris"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Telefono numeris (nebūtina)"
 
@@ -2777,30 +2836,26 @@ msgstr "Telefono numeris (nebūtina)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefonas:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2820,9 +2875,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2831,7 +2885,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr "Naujausios gretimų pranešimų nuotraukos"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2845,6 +2899,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Padėkite smeigtuką ant žemėlapio"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2872,27 +2931,26 @@ msgid "Please check your email address is correct"
 msgstr "Prašome patikrinti ar jūsų el. pašto adresas teisingas "
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Prašome pasirinkti kategoriją"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2911,27 +2969,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Prašome neįžeidinėti&nbsp;&mdash; įžeidinėjimai nuvertina paslaugą visiems vartotojams."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Prašome įvesti žinutę"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2944,16 +3002,16 @@ msgstr "Prašome įvesti slaptažodį"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Prašome įvesti temą"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2964,20 +3022,20 @@ msgstr "Prašome įvesti galiojantį el. paštą"
 msgid "Please enter a valid email address"
 msgstr "Prašome įvesti galiojantį el. pašto adresą"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Prašome įvesti daugiau informacijos"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2993,7 +3051,7 @@ msgid "Please enter your first name"
 msgstr "Prašome įvesti savo vardą"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Prašome įvesti savo vardą ir pavardę, savivalldybei reikalinga jūsų informacija - jeigu pageidaujate, kad jūsų vardas nebūtu pateiktas puslapyje nužymėkite langelį apačioje"
@@ -3005,9 +3063,9 @@ msgstr "Prašome įvesti savo vardą"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Prašome įvesti savo vardą"
@@ -3048,19 +3106,19 @@ msgstr "Prašome pateikti problemos detales žemiau esančioje anketoje ir kuo t
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Prašome nurodyti, ar norite gauti kitą klausimyną."
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Prašome įvesti galiojantį el. pašto adresą"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3087,24 +3145,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Atkreipkite dėmėsį:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Prašome pateikti priežastis, kodėl jūs naujinate šį pranešimą"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Prašome pateikti šiek tiek teksto, taip pat nuotrauką"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Prašome pasakyti ar esate pranešęs apie problemą savo savivaldybei anksčiau"
 
@@ -3112,7 +3174,7 @@ msgstr "Prašome pasakyti ar esate pranešęs apie problemą savo savivaldybei a
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3124,7 +3186,7 @@ msgstr "Prašome pasirinkti jūsų pageidaujama srautą"
 msgid "Please select the type of alert you want"
 msgstr "Prašome pasirinkti pageidaujama įspėjimo tipą"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Prašome nurodyti, ar problema buvo sutvarkyta"
 
@@ -3132,12 +3194,12 @@ msgstr "Prašome nurodyti, ar problema buvo sutvarkyta"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3145,27 +3207,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Prašome įvesti žinutę"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Įkelti"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Pateikta anonimiškai %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -3181,7 +3239,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3189,11 +3247,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Ankstesnis"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3209,9 +3267,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privatus"
 
@@ -3260,7 +3318,7 @@ msgstr "Problema %s išsiųsta savivaldybei %s"
 msgid "Problem breakdown by state"
 msgstr "Problemos pasiskirstymas pagal valstybės"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problema pažymėta kaip atidaryta"
 
@@ -3268,8 +3326,7 @@ msgstr "Problema pažymėta kaip atidaryta"
 msgid "Problem state change based on survey results"
 msgstr "Problemos būklės pakeitimas remiantis tyrimo rezultatais"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemos"
@@ -3294,18 +3351,18 @@ msgstr "Neseniai praneštos problemos FixMyStreet"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemos viduje %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemos %s rajone"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3313,7 +3370,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3321,11 +3378,15 @@ msgstr ""
 msgid "Property address:"
 msgstr "Nuosavybės adresas:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3339,11 +3400,11 @@ msgstr "Pateikti naujinimą"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Pateikti slaptažodį yra nebūtina, tačiau pateiktus bus jums papraščiau pranešti problemas, pateikti naujinimus ir tvarkyti savo pranešimus."
 
@@ -3351,12 +3412,12 @@ msgstr "Pateikti slaptažodį yra nebūtina, tačiau pateiktus bus jums papraš
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Viešas atsakymas:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3399,11 +3460,11 @@ msgstr "Questionnaire filled in by problem reporter"
 msgid "RSS feed"
 msgstr "RSS srautas"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS srautas skirtas %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS srautas skirtas %s rajonui, %s"
 
@@ -3411,11 +3472,11 @@ msgstr "RSS srautas skirtas %s rajonui, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS srautas %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS srautas %s, viduje %s rajono"
 
@@ -3423,13 +3484,13 @@ msgstr "RSS srautas %s, viduje %s rajono"
 msgid "RSS feed of nearby problems"
 msgstr "Šalia esančių problemų RSS srautas"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -3443,11 +3504,11 @@ msgstr ""
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3460,7 +3521,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3474,7 +3535,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3487,7 +3548,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3499,8 +3561,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3515,17 +3577,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3533,14 +3599,14 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3549,7 +3615,7 @@ msgid "Report a problem"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3565,7 +3631,7 @@ msgid "Report anonymously"
 msgstr "Pateikta anonimiškai %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3600,7 +3666,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Praneškite, pamatykite arba diskutuokite apie vietines problemas"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -3611,7 +3677,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr ""
@@ -3625,27 +3691,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -3664,17 +3730,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3702,15 +3766,15 @@ msgid "Reports published"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3723,7 +3787,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3776,39 +3840,45 @@ msgstr ""
 msgid "Right place?"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3824,20 +3894,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3854,13 +3924,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr ""
 
@@ -3873,7 +3942,7 @@ msgstr ""
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr ""
 
@@ -3888,12 +3957,12 @@ msgstr ""
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3903,8 +3972,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3914,7 +3982,7 @@ msgid "Select a body"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr ""
@@ -3935,7 +4003,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3948,7 +4016,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3957,11 +4025,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3999,7 +4067,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4010,7 +4078,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4035,8 +4103,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4047,7 +4115,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr ""
 
@@ -4107,7 +4175,7 @@ msgid "Some photos of recent reports"
 msgstr ""
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4116,12 +4184,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4139,9 +4206,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -4151,13 +4218,13 @@ msgstr ""
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4171,11 +4238,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4184,11 +4251,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4212,18 +4279,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4232,31 +4299,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr ""
 
@@ -4274,7 +4338,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4293,50 +4357,48 @@ msgstr ""
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4348,7 +4410,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4362,20 +4424,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr ""
 
@@ -4386,14 +4447,19 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4411,13 +4477,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr "Šablonas &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Šablonai"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr ""
@@ -4438,6 +4508,10 @@ msgstr ""
 msgid "Text:"
 msgstr ""
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+msgid "Textarea"
+msgstr ""
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4467,7 +4541,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4479,27 +4553,29 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
@@ -4545,8 +4621,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4600,7 +4676,7 @@ msgstr ""
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4662,8 +4738,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4696,7 +4772,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4714,12 +4790,12 @@ msgstr ""
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -4727,7 +4803,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -4803,10 +4879,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr ""
 
@@ -4823,19 +4899,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4848,26 +4928,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4875,15 +4955,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4907,6 +4990,10 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4932,7 +5019,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4957,11 +5044,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4984,16 +5066,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5003,7 +5085,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5033,10 +5115,10 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5048,13 +5130,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr ""
 
@@ -5105,29 +5187,27 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr ""
 
@@ -5138,7 +5218,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5168,6 +5248,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5181,8 +5269,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5200,7 +5288,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5213,27 +5301,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5241,9 +5327,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr ""
 
@@ -5269,7 +5355,7 @@ msgstr ""
 msgid "View report on site"
 msgstr ""
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5277,7 +5363,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5295,7 +5381,7 @@ msgstr ""
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -5365,7 +5451,7 @@ msgstr ""
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5385,7 +5471,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr ""
 
@@ -5397,7 +5483,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5408,12 +5493,12 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr ""
 
@@ -5426,7 +5511,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5439,7 +5524,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5448,7 +5533,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5478,7 +5563,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5488,7 +5573,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5496,7 +5581,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5505,8 +5590,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5570,9 +5654,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5581,13 +5665,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5616,16 +5701,16 @@ msgstr ""
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5645,8 +5730,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5679,7 +5764,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5710,19 +5795,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5730,8 +5815,8 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr ""
 
@@ -5762,6 +5847,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5779,7 +5868,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5861,12 +5950,12 @@ msgid "today"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5891,7 +5980,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr ""
 
@@ -5967,7 +6056,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5994,7 +6083,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6021,7 +6110,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
@@ -6030,7 +6119,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
@@ -6039,7 +6128,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6084,7 +6173,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
@@ -6093,7 +6182,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
@@ -6102,6 +6191,18 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Uždaryta "
+
+#~ msgid "Filter report list"
+#~ msgstr "Filtruoti pranešimo sąraša"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Invalid agency_responsible value %s"
+
+#~ msgid "Post"
+#~ msgstr "Įkelti"
+
 #~ msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 #~ msgstr "<strong>Pastaba:</strong> Šis pranešimas jau išsiūstas vykdymui. Bet kokie pakeitimai nebus perduoti."
 
diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
index e4a336027..29c3fd0c9 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-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " dan "
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Laporan Ringkasan"
 
@@ -111,7 +111,7 @@ msgstr "%s soalan selidik dihantar &ndash; %s dijawabi (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ruj;&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -157,6 +157,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(tidak dihantar kepada majlis)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(hantar kepada kedua-dua)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Pilih kategori --"
@@ -205,17 +207,18 @@ msgstr ""
 "Tambahkan <code>MAPIT_TYPES</code> ke dalam fail konfigurasi anda?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -245,7 +248,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ya</strong> Aku ada kata laluan"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -262,7 +265,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -282,7 +285,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:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Tambah kategori baru"
@@ -315,7 +318,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Tambah kategori baru"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -324,8 +327,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -333,21 +336,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Tambah pengguna"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -363,6 +365,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Sekali lagi:"
@@ -375,8 +383,8 @@ msgstr "Alert %d diciptakan untuk %s, jenis %s, parameter %s/%s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Pemberitahuan %d dihenti (dibuat pada %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Maklumkan aku sebarang kemas kini masa depan"
 
@@ -388,10 +396,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Semua Laporan"
@@ -431,6 +441,10 @@ msgstr "Semua laporan antara %s dan %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+msgid "Allow anonymous reports on this category"
+msgstr ""
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -467,7 +481,7 @@ msgstr "Tanpa nama"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -480,7 +494,7 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -489,8 +503,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -501,7 +515,7 @@ msgstr ""
 msgid "Area covered"
 msgstr "Kawasan dilintungi"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -515,27 +529,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr "Ditugaskan kepada %s"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Ditugaskan kepada kategori lain:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Ditugaskan kepada badan luaran:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Ditugaskan kepada bahagian bawah:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Ditugaskan kepada %s"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Ditugaskan kepada %s"
@@ -548,7 +567,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -556,11 +575,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -572,12 +591,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Mengunggu penyederhanaan"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Balik"
@@ -598,14 +618,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Badan"
 
@@ -618,11 +636,13 @@ msgstr "Badan"
 msgid "Body"
 msgstr "Badan"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Badan:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -634,8 +654,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -651,15 +670,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -669,7 +686,7 @@ msgstr "Kategori"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -692,6 +709,11 @@ msgstr "Kategori:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Menukar Kata Laluan"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -708,7 +730,7 @@ msgstr "Menukar Kata Laluan"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -718,12 +740,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -760,8 +782,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -771,11 +793,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Ditutup"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Ditutup oleh majlis"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -808,13 +826,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Konfigurasi"
@@ -931,7 +948,7 @@ msgstr "Laporan baru"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Kategori baru"
@@ -941,27 +958,25 @@ msgstr "Kategori baru"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr ""
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Diwujudkan"
@@ -970,6 +985,17 @@ msgstr "Diwujudkan"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Diwujudkan"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Diwujudkan"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -981,10 +1007,6 @@ msgstr "Diwujudkan:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -994,19 +1016,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "Belum ada badan wujud pada masa kini."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Papan pemuka"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1018,7 +1042,7 @@ msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1028,7 +1052,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr ""
@@ -1050,9 +1074,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Huraian"
 
@@ -1061,7 +1083,7 @@ msgstr "Huraian"
 msgid "Destination"
 msgstr "Huraian"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1097,7 +1119,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1105,6 +1127,15 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+msgid "Disable reopening of reports in this category"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Dapatkan kemas kini masalah di %"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1139,24 +1170,24 @@ msgstr "Tidak tahu"
 msgid "Don't like forms?"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1168,7 +1199,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1180,7 +1211,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Menyunting"
@@ -1191,12 +1222,11 @@ msgstr "Menyunting"
 msgid "Edit body details"
 msgstr "Edit perincian badah"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1204,17 +1234,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1251,8 +1279,9 @@ msgstr "Editor"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1261,15 +1290,14 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Emel"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1289,12 +1317,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Emel:"
@@ -1357,12 +1386,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Endpoint"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Masukkan nama jalan Z&uuml;rich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Masukkan poskod UK terdekat, atau nama jalan dan kawasan"
 
@@ -1389,10 +1418,10 @@ msgstr "Masukkan perincian masalah tersebut"
 msgid "Error"
 msgstr "Ralat"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1405,7 +1434,7 @@ msgstr "Contoh poskod %s"
 msgid "Examples:"
 msgstr "Contoh:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1414,7 +1443,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1439,7 +1468,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1451,20 +1480,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Data tambahan:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1497,20 +1526,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Tapis senarai laporan"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Pertama kali"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Foto laporan terdekat baru-baru ini "
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Laporan baru"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1540,7 +1574,7 @@ msgstr "Tanda sebagai dipadam"
 msgid "Flag user"
 msgstr "Tanda pengguna"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Ditanda"
@@ -1549,7 +1583,7 @@ msgstr "Ditanda"
 msgid "Flagged reports and users"
 msgstr "Laporan dan pengguna ditanda"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1557,8 +1591,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Ditanda:"
 
@@ -1584,11 +1618,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Terlupai kata laluan anda?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1598,12 +1632,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Soalan lazim"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1625,7 +1667,7 @@ msgstr "Dapatkan kemas kini %s masalah"
 msgid "Get updates of problems in this %s"
 msgstr "Dapatkan kemas kini masalah di %"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Berikan aku RSS feed"
 
@@ -1641,15 +1683,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1659,7 +1701,7 @@ msgstr "Pergi"
 msgid "Going to send questionnaire?"
 msgstr "Teruskan dengan menghantar soalan selidik?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1685,6 +1727,7 @@ msgstr "Adakan anda pernah melaporkan masalah kepada majlis, atau inikah pertama
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1719,7 +1762,8 @@ msgstr "Tersembunyi"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1747,7 +1791,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Sembunyikan pin"
 
@@ -1800,11 +1844,9 @@ msgstr "Masalah anda tidak dapat dijumpai dalam database.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1823,15 +1865,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1845,7 +1887,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1869,7 +1911,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1906,7 +1948,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1930,6 +1972,17 @@ msgstr "Dalam table penyalahguna?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "kawasan pentadbiran"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1939,20 +1992,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Termasuk perincian peribadi pelapor"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Nilai has_photo \"%s\" salah"
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1969,16 +2022,12 @@ msgstr "Nota dalaman"
 msgid "Internal notes"
 msgstr "Nota dalaman"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Nilai agency_responsible %s salah"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Format dinyatakan %s salah"
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2030,13 +2079,13 @@ msgstr "Kemas kini terakhir:"
 msgid "Last&nbsp;update:"
 msgstr "Kemas kini terakhir:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2053,7 +2102,7 @@ msgstr "Senaraikan semua laporan masalah"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Loading..."
@@ -2091,17 +2140,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2119,19 +2169,20 @@ msgstr ""
 msgid "MAP"
 msgstr "PETA"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2145,24 +2196,24 @@ msgstr ""
 msgid "Mark as sent"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Pesanan"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2175,7 +2226,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Kehilangan jurisdiction_id"
 
@@ -2183,8 +2234,7 @@ msgstr "Kehilangan jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2207,7 +2257,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2217,14 +2267,14 @@ msgstr ""
 msgid "Month"
 msgstr "Bulan"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2252,9 +2302,10 @@ msgstr ""
 msgid "Name"
 msgstr "Nama"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Nama:"
@@ -2272,7 +2323,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -2280,12 +2331,12 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2308,7 +2359,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Badan baru ditambahi"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Kategori hubungan baru ditambahi"
 
@@ -2321,8 +2372,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nota dalaman baru:"
 
@@ -2330,13 +2381,13 @@ msgstr "Nota dalaman baru:"
 msgid "New local problems on FixMyStreet"
 msgstr "Masalah tempatan baru dalam FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2413,7 +2464,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2426,7 +2477,6 @@ msgstr "Seterusnya"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2435,11 +2485,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Tidak"
 
@@ -2451,11 +2501,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Tiada badan"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Tiada majlis dipilihi"
 
@@ -2471,8 +2522,8 @@ msgstr "Belum ada masalah yang ditanda."
 msgid "No flagged users found."
 msgstr "Belum ada pengguna yang ditanda."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Tiada kemaskini baru."
 
@@ -2508,15 +2559,15 @@ msgstr "Tiada penyokong"
 msgid "None"
 msgstr "Tiada"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2524,10 +2575,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Bukan untuk bahagian bawah aku"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Belum dilaporkan"
@@ -2575,12 +2630,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2588,12 +2643,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Keadaan lama"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2602,7 +2657,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2633,7 +2688,7 @@ msgstr "Laman web inisiatif Open311"
 msgid "Open311 specification"
 msgstr "Spesifikasi Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2645,7 +2700,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2653,16 +2708,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2694,7 +2749,7 @@ msgstr "Laman Tidak Dijumpai"
 msgid "Parent"
 msgstr "Induk"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Kategori baru"
@@ -2703,13 +2758,13 @@ msgstr "Kategori baru"
 msgid "Partial"
 msgstr "Separa"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Kata Laluan (tidah diwajibkan)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Kata laluan anda telah diubahi"
@@ -2724,7 +2779,7 @@ msgstr "Kata Laluan (tidah diwajibkan)"
 msgid "Permissions"
 msgstr "Permalink"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2732,19 +2787,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefon:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Nombor telefon"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Nombor telefon (tidak diwajibkan)"
 
@@ -2752,30 +2812,26 @@ msgstr "Nombor telefon (tidak diwajibkan)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefon:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2795,9 +2851,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2806,7 +2861,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr "Foto laporan terdekat baru-baru ini "
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2820,6 +2875,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Letakkan pin atas peta"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2847,27 +2907,26 @@ msgid "Please check your email address is correct"
 msgstr "Sila periksa sama ada alamat emel anda adalah betul"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Sila pilihkan kategori"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2886,27 +2945,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Sila masukkan pesanan"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2919,16 +2978,16 @@ msgstr "Sila masukkan kata laluan"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Sila masukkan tajuk"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2939,20 +2998,20 @@ msgstr "Silah masukkan emel yang benar"
 msgid "Please enter a valid email address"
 msgstr "Sila masukkan alamat emel yang benah"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Sila masukkan perincian"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2968,7 +3027,7 @@ msgid "Please enter your first name"
 msgstr "Sila masukkan nama pertama anda"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Sila masukkan nama penuh anda, majlis memerlukan maklumat ini - Jika anda tidak ingin nama anda dikemukakan dalam laman, untik kota dibawah"
@@ -2980,9 +3039,9 @@ msgstr "Sila masukkan nama anda"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Sila masukkan nama anda"
@@ -3023,19 +3082,19 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Sila masukkan alamat emel yang benah"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3062,24 +3121,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Sila  nota:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -3087,7 +3150,7 @@ msgstr ""
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3099,7 +3162,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -3107,12 +3170,12 @@ msgstr ""
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3120,27 +3183,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Sila tuliskan pesanan"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Post"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Post tanpa nama pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Dipostkan oleh %s pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Dipostkan oleh <strong>%s</strong> (%s) pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Dipostkan oleh <strong>%s</strong> pada %s"
 
@@ -3156,7 +3215,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3164,11 +3223,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3184,9 +3243,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Peribadi"
 
@@ -3235,7 +3294,7 @@ msgstr "Masalah %s dihantar kepada majlis %s"
 msgid "Problem breakdown by state"
 msgstr "Pecahan masalah bagi negeri"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Masalah ditanda sebagai terbukan"
 
@@ -3243,8 +3302,7 @@ msgstr "Masalah ditanda sebagai terbukan"
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Masalah-masalah"
@@ -3269,18 +3327,18 @@ msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Masalah dalam %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Masalah dalam kawasan pentadbiran %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3288,7 +3346,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3296,11 +3354,15 @@ msgstr ""
 msgid "Property address:"
 msgstr "Alamat bangunan"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3314,11 +3376,11 @@ msgstr "Sediakan kemas kini"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr ""
 
@@ -3326,12 +3388,12 @@ msgstr ""
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Tindak balas awam:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3374,11 +3436,11 @@ msgstr "Soalan selidik diisikan oleh pelapor masalah"
 msgid "RSS feed"
 msgstr "Feed RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "Feed RSS untuk %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "Feed RSS untuk kawasan pentadbiran %s, %s"
 
@@ -3386,11 +3448,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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "Feed RSS untuk %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s"
 
@@ -3398,13 +3460,13 @@ msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s"
 msgid "RSS feed of nearby problems"
 msgstr "Feed RSS untuk masalah berdekatan"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "Feed RSS untuk masalah dalam %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s"
 
@@ -3418,11 +3480,11 @@ msgstr "Feed RSS untuk masalah tempatan baru-baru ini"
 msgid "RSS feed of updates to this problem"
 msgstr "Feed RSS untuk kemas kini bagi masalah ini"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3435,7 +3497,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Terima emel semasa kemas kini ditinggalkan bagi masalah ini"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3449,7 +3511,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Masalah yang dilaporkan baru-baru ini"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3462,7 +3524,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3474,8 +3537,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3490,17 +3553,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3508,14 +3575,14 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3524,7 +3591,7 @@ msgid "Report a problem"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3540,7 +3607,7 @@ msgid "Report anonymously"
 msgstr "Post tanpa nama pada %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3575,7 +3642,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -3586,7 +3653,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr ""
@@ -3600,27 +3667,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -3639,17 +3706,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3677,15 +3742,15 @@ msgid "Reports published"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3698,7 +3763,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3751,39 +3816,45 @@ msgstr ""
 msgid "Right place?"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3799,20 +3870,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3829,13 +3900,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr ""
 
@@ -3848,7 +3918,7 @@ msgstr ""
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr ""
 
@@ -3863,12 +3933,12 @@ msgstr ""
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3878,8 +3948,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3889,7 +3958,7 @@ msgid "Select a body"
 msgstr "Pilihkan badan"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Pilihkan kawasan"
@@ -3910,7 +3979,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3923,7 +3992,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3932,11 +4001,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Dihantar kepada %s %s kemudian"
 
@@ -3974,7 +4043,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3985,7 +4054,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4010,8 +4079,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4022,7 +4091,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Tunjukkan pin"
 
@@ -4082,7 +4151,7 @@ msgid "Some photos of recent reports"
 msgstr ""
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4091,12 +4160,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4114,9 +4182,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -4126,13 +4194,13 @@ msgstr ""
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4146,11 +4214,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4159,11 +4227,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4187,18 +4255,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Negeri"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4207,31 +4275,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Negeri:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Stats"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Status"
 
@@ -4249,7 +4314,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Bahagian bawah/Badan"
 
@@ -4268,50 +4333,48 @@ msgstr "Tajuk:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Hantar"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Hantar perubahan"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Hantar soalan selidik"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Dihantarkan"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Melanggan"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4323,7 +4386,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4337,20 +4400,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Ringkasan"
 
@@ -4361,14 +4423,19 @@ msgstr "Laporan ringkasan"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4386,13 +4453,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Teks"
@@ -4413,6 +4484,11 @@ msgstr "Versi teks sahaja"
 msgid "Text:"
 msgstr "Teks:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Teks"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4442,7 +4518,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4454,27 +4530,29 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
@@ -4520,8 +4598,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4575,7 +4653,7 @@ msgstr ""
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4637,8 +4715,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4671,7 +4749,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4689,12 +4767,12 @@ msgstr ""
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -4702,7 +4780,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -4778,10 +4856,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr ""
 
@@ -4798,19 +4876,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Masalah ini telah diselesai"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Masalah ini belum diselesai"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4823,26 +4905,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Laporan ini menunggui sederhana."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Laporan ini ditanda sebagai ditutupi sekarang."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Laporan ini ditanda sebagai diselesai sekarang."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Laporan ini ditanda sebagai terbuka sekarang."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4850,15 +4932,18 @@ msgstr ""
 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."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4882,6 +4967,10 @@ msgstr "Tajuk"
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4907,7 +4996,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "Melihat lokasi tepat atas peta bagi isu ini"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4932,11 +5021,6 @@ msgstr ""
 msgid "Total"
 msgstr "Jumlah"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4959,16 +5043,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4978,7 +5062,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5008,10 +5092,10 @@ msgstr "Ralat tidak diketahui"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "ID masalah tidak diketahui"
 
@@ -5023,13 +5107,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Kemas kini"
 
@@ -5080,29 +5164,27 @@ msgstr "Kemas kini masalah dibuka semula"
 msgid "Update statuses"
 msgstr "Status kemas kini"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Dikemas kinikan"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Dikemas kinikan!"
 
@@ -5113,7 +5195,7 @@ msgstr "Dikemas kinikan!"
 msgid "Updates"
 msgstr "Kemas kini"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5143,6 +5225,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5156,8 +5246,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5175,7 +5265,7 @@ msgid "User flagged"
 msgstr "Pengguna ditanda"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5188,27 +5278,25 @@ msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna."
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Pengguna"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5216,9 +5304,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Nilai dikemaskinikan"
 
@@ -5244,7 +5332,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Melihat laporan di laman"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Melihat laporan dengan kawasan pentadbiran"
 
@@ -5252,7 +5340,7 @@ msgstr "Melihat laporan dengan kawasan pentadbiran"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5270,7 +5358,7 @@ msgstr "Melihat masalah"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Kawasan pentadbiran majlis ini"
 
@@ -5340,7 +5428,7 @@ msgstr "Bila dihantar"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5360,7 +5448,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr ""
 
@@ -5372,7 +5460,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5383,12 +5470,12 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Ya"
 
@@ -5401,7 +5488,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5414,7 +5501,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5423,7 +5510,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5453,7 +5540,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5463,7 +5550,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Anda menolak; sila isikan kotak di atas"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5471,7 +5558,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5480,8 +5567,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5548,9 +5634,9 @@ msgstr "Laporan Anda"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5559,13 +5645,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5594,16 +5681,16 @@ msgstr "Nama anda"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5623,8 +5710,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5657,7 +5744,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5688,19 +5775,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5708,8 +5795,8 @@ msgstr ""
 msgid "by %s"
 msgstr "dari %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "majlis"
 
@@ -5740,6 +5827,10 @@ msgstr "edit pengguna"
 msgid "from %s different users"
 msgstr "dari %s pengguna lain"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5757,7 +5848,7 @@ msgstr "tiada"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5840,12 +5931,12 @@ msgid "today"
 msgstr "hari ini"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5870,7 +5961,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "kawasan pentadbiran"
 
@@ -5922,7 +6013,7 @@ msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5940,7 +6031,7 @@ msgid "%s problem reported"
 msgid_plural "%s problems reported"
 msgstr[0] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5958,19 +6049,19 @@ msgid "<big>%s</big> fixed in past month"
 msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> diselesai di bulan lepas"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> laporan di minggu lepas"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> laporan baru-baru ini"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6000,18 +6091,30 @@ msgid "last updated %d day ago"
 msgid_plural "last updated %d days ago"
 msgstr[0] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Ditutup oleh majlis"
+
+#~ msgid "Filter report list"
+#~ msgstr "Tapis senarai laporan"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Nilai agency_responsible %s salah"
+
+#~ msgid "Post"
+#~ msgstr "Post"
+
 #~ msgid "OK"
 #~ msgstr "OK"
 
diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
index 1cf3a6b53..2cf3f57e2 100644
--- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Burmese (Myanmar) (https://www.transifex.com/mysociety/teams/12067/my_MM/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "ႏွင့္"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "အက်ဥ္းခ်ဳပ္ အစီရင္ခံစာမ်ား"
 
@@ -111,7 +111,7 @@ msgstr "%s စစ်တမ်းမေးခွန်းလွှာပို့
 msgid "%s ref:&nbsp;%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -157,6 +157,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(ေကာင္စီသို႔မပို႔ပါ)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(ႏွစ္ခုလံုးသို႔ပို႔မည္)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- ေခါင္းစဥ္တစ္ခုေရြးပါ --"
@@ -202,17 +204,18 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -242,7 +245,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>ဟုတ္ကဲ့</strong> ကၽြႏ္ုပ္တြင္စကား၀ွက္တစ္ခုရွိသည္"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -259,7 +262,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -279,7 +282,7 @@ msgstr "အုပ္ခ်ဳပ္ေရး အဖြဲ႔တစ္ခုခ
 msgid "Add a contact using the form below."
 msgstr "ေအာက္ပါပံုစံကိုသံုးျပီးအဆက္အသြယ္တစ္ခုထည့္မည္"
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "ေခါင္းစဥ္အသစ္ထည့္မည္"
@@ -312,7 +315,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "ေခါင္းစဥ္အသစ္ထည့္မည္"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -321,8 +324,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -330,21 +333,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "အသံုးျပဳသူထည့္မည္"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -360,6 +362,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "ထပ္မံ၍-"
@@ -372,8 +380,8 @@ msgstr "Parameters %s/%s ၊ အမ်ိဳးအစား %s ၊ %s အတြ
 msgid "Alert %d disabled (created %s)"
 msgstr "အသိေပးခ်က္%dကိုပိတ္ထားသည္(%sကိုဖန္တီးျပီး)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "ေနာက္ထပ္အသစ္မ်ားအတြက္လည္းကၽြႏ္ုပ္ကိုအသိေပးမည္"
 
@@ -385,10 +393,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "အစီရင္ခံစာအားလံုး"
@@ -428,6 +438,10 @@ msgstr "%s ႏွင့္ %s ၾကားအစီရင္ခံစားအ
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+msgid "Allow anonymous reports on this category"
+msgstr ""
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -464,7 +478,7 @@ msgstr "အမည္မသိ"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -477,7 +491,7 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -486,8 +500,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -498,7 +512,7 @@ msgstr ""
 msgid "Area covered"
 msgstr "ဧရိယာလႊမ္းျခံဳ ျခင္း"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -512,27 +526,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr "%s သို႔ လြဲအပ္မည္"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "တျခားေခါင္းစဥ္တစ္ခုသို႔ေျပာင္းလဲသတ္မွတ္မည္ -"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "အပိုစာကိုယ္ကိုသတ္မွတ္မည္ -"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "အေသးစိတ္နယ္နမိတ္သို႔သတ္မွတ္မည္-"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "%s သို႔ လြဲအပ္မည္"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "%s သို႔ လြဲအပ္မည္"
@@ -545,7 +564,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr "အခုေလာေလာဆယ္ အစီရင္ခံစာမ်ားကို ရွာေဖြျခင္း၊ၾကည့္ရႈျခင္းသာျပဳလုပ္ႏိုင္ေသးသည္"
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -553,11 +572,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -569,12 +588,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "စိစစ္ျခင္းကိုေစာင့္ဆိုင္းေနတုန္း"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "ေနာက္သို႔"
@@ -595,14 +615,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "စာကိုယ္မ်ား"
 
@@ -615,11 +633,13 @@ msgstr "စာကိုယ္မ်ား"
 msgid "Body"
 msgstr "စာကိုယ္"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "စာကိုယ္ -"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -631,8 +651,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "ေျမပံုကိုမျမင္ဘူးလား။ <em>ဒီအဆင့္ကိုေက်ာ္မည္</em> "
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -648,15 +667,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -666,7 +683,7 @@ msgstr "အမ်ိဳးအစား"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -689,6 +706,11 @@ msgstr "အမ်ိဳးအစား -"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "စကား၀ွက္ေျပာင္းမည္"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -705,7 +727,7 @@ msgstr "စကား၀ွက္ေျပာင္းမည္"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -715,12 +737,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -757,8 +779,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -768,11 +790,7 @@ msgstr ""
 msgid "Closed"
 msgstr "ပိတ္မည္"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "ေကာင္စီမွပိတ္ထားသည္"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -805,13 +823,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "အစီအစဥ္သတ္မွတ္ျခင္း"
@@ -928,7 +945,7 @@ msgstr "အစီရင္ခံစာတစ္ခုကိုဖန္တီး
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "အမ်ိဳးအစားဖန္တီးမည္"
@@ -938,27 +955,25 @@ msgstr "အမ်ိဳးအစားဖန္တီးမည္"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr ""
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "ဖန္တီးမည္"
@@ -967,6 +982,17 @@ msgstr "ဖန္တီးမည္"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "ဖန္တီးမည္"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "ဖန္တီးမည္"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -978,10 +1004,6 @@ msgstr "ဖန္တီးခဲ့ခ်ိန္-"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -991,19 +1013,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "ယခုေလာေလာဆယ္ စာကိုယ္ ကိုမဖန္တီးရေသးပါ"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1015,7 +1039,7 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1025,7 +1049,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr ""
@@ -1047,9 +1071,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "ေဖာ္ျပခ်က္"
 
@@ -1058,7 +1080,7 @@ msgstr "ေဖာ္ျပခ်က္"
 msgid "Destination"
 msgstr "ေဖာ္ျပခ်က္"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1094,7 +1116,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1102,6 +1124,14 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+msgid "Disable reopening of reports in this category"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+msgid "Disable updates on reports in this category"
+msgstr ""
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1136,24 +1166,24 @@ msgstr ""
 msgid "Don't like forms?"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1165,7 +1195,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1177,7 +1207,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "ျပင္ဆင္မည္"
@@ -1188,12 +1218,11 @@ msgstr "ျပင္ဆင္မည္"
 msgid "Edit body details"
 msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1201,17 +1230,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1248,8 +1275,9 @@ msgstr "အယ္ဒီတာ"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1258,15 +1286,14 @@ msgstr "အယ္ဒီတာ"
 msgid "Email"
 msgstr "အီးေမးလ္"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1286,12 +1313,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "အီးေမးလ္-"
@@ -1354,12 +1382,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "ျပီးဆံုးမွတ္-"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "လမ္းနာမည္ ျဖည့္စြက္ပါ"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "ယူေကအနီးနားရွိ စာတိုက္နံပါတ္၊သို႔မဟုတ္လမ္းအမည္ႏွင့္ဧရိယာရိုက္ထည့္ပါ"
 
@@ -1386,10 +1414,10 @@ msgstr "ျပႆနာ၏အေသးစိတ္အခ်က္အလက္မ
 msgid "Error"
 msgstr "အမွားအယြင္း"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1402,7 +1430,7 @@ msgstr "နမူနာစာတိုက္ေသတၱာနံပါတ္ %s
 msgid "Examples:"
 msgstr "နမူနာမ်ား -"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1411,7 +1439,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1436,7 +1464,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1448,20 +1476,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "ေနာက္ထပ္အခ်က္အလက္မ်ား-"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1494,20 +1522,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "အစီရင္ခံစာစာရင္းကိုစစ္ထုတ္မည္"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "ပထမအၾကိမ္"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "မၾကာေသးခင္ကအနီးအနားက အစီရင္ခံစာမ်ား၏ဓာတ္ပံု"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "အစီရင္ခံစာအသစ္မ်ား"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1537,7 +1570,7 @@ msgstr "ဖ်က္ျပီးျပီဟုသတ္မွတ္မည္"
 msgid "Flag user"
 msgstr "သတ္မွတ္သည့္အသံုးျပဳသူ"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr ""
@@ -1546,7 +1579,7 @@ msgstr ""
 msgid "Flagged reports and users"
 msgstr "အမွတ္အသားျပဳလုပ္ထားသည့္ အသံုးျပဳသူမ်ားကို ေဖာ္ျပျခင္း"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1554,8 +1587,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "အမွတ္အသားျပဳလုပ္ထားျခင္း"
 
@@ -1581,11 +1614,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "သင္၏စကား၀ွက္ေမ့သြားျပီလား။"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1595,12 +1628,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "မၾကာခဏေမးေသာေမးခြန္းမ်ား"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1622,7 +1663,7 @@ msgstr "%ျပႆနာ၏အသစ္မြမ္းမံမႈမ်ား
 msgid "Get updates of problems in this %s"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "ကၽြႏ္ုပ္ကို RSS Feed ေပးပါ"
 
@@ -1638,15 +1679,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1656,7 +1697,7 @@ msgstr "သြားမည္"
 msgid "Going to send questionnaire?"
 msgstr "စစ္တမ္းကိုပို႔ေတာ့မွာလား။"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1682,6 +1723,7 @@ msgstr "ယခင္က ေကာင္စီထံ ျပႆနာမ်ား
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1716,7 +1758,8 @@ msgstr "ေဖ်ာက္ထားေသာ"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1744,7 +1787,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr ""
 
@@ -1797,11 +1840,9 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "အိုင္ဒီ"
 
@@ -1820,15 +1861,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1842,7 +1883,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1866,7 +1907,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1903,7 +1944,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1927,6 +1968,17 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "အုပ္ခ်ဳပ္ေရးဌာန"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1936,20 +1988,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1966,16 +2018,12 @@ msgstr "အတြင္းမွတ္စု"
 msgid "Internal notes"
 msgstr "အတြင္းမွတ္စု"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "ပံုစံ %s သည္မမွန္ကန္ပါ"
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2027,13 +2075,13 @@ msgstr "ေနာက္ဆံုးအသစ္မြမ္းမံျခင္
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2050,7 +2098,7 @@ msgstr "အစီရင္ခံစာတင္ျပီးေသာျပႆန
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "ဖြင့္ေနသည္"
@@ -2088,17 +2136,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2116,19 +2165,20 @@ msgstr ""
 msgid "MAP"
 msgstr "ေျမပံု"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2142,24 +2192,24 @@ msgstr ""
 msgid "Mark as sent"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "စာ"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2172,7 +2222,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -2180,8 +2230,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2204,7 +2253,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2214,14 +2263,14 @@ msgstr ""
 msgid "Month"
 msgstr "လ"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2249,9 +2298,10 @@ msgstr ""
 msgid "Name"
 msgstr "အမည္"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "အမည္-"
@@ -2269,7 +2319,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -2277,12 +2327,12 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2305,7 +2355,7 @@ msgstr ""
 msgid "New body added"
 msgstr "စာကိုယ္အသစ္ထည့္ျပီးျပီ"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "ေခါင္းစဥ္အသစ္အဆက္အသြယ္ထည့္ျပီးျပီ"
 
@@ -2318,8 +2368,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "အတြင္းမွတ္စုအသစ္-"
 
@@ -2327,13 +2377,13 @@ msgstr "အတြင္းမွတ္စုအသစ္-"
 msgid "New local problems on FixMyStreet"
 msgstr "ကၽြႏ္ုပ္လမ္းကိုျပင္ေပးပါတြင္ေဒသတြင္းျပႆနာအသစ္မ်ား"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2410,7 +2460,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2423,7 +2473,6 @@ msgstr "ေနာက္သို႔"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2432,11 +2481,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "မရွိပါ"
 
@@ -2448,11 +2497,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "စာကိုယ္မရွိ"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "မည္သည့္ေကာင္စီမွမေရြးရေသးပါ"
 
@@ -2468,8 +2518,8 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "အသစ္မြမ္းမံမႈမ်ားမေတြ႕ပါ"
 
@@ -2505,15 +2555,15 @@ msgstr "ေထာက္ပံ့ေပးမည့္သူမရွိပါ"
 msgid "None"
 msgstr "ဘာမွမဟုတ္"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2521,10 +2571,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "ကၽြႏ္ုပ္၏အေသးစိတ္နယ္နမိတ္အတြက္မဟုတ္ပါ"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "ယခင္ကအစီရင္မခံရေသး"
@@ -2572,12 +2626,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2585,12 +2639,12 @@ msgstr ""
 msgid "Old state"
 msgstr "ျပည္နယ္အေဟာင္း"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2599,7 +2653,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2630,7 +2684,7 @@ msgstr ""
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2642,7 +2696,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2650,16 +2704,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2691,7 +2745,7 @@ msgstr "စာမ်က္ႏွာရွာမေတြ႕ပါ"
 msgid "Parent"
 msgstr "ပင္မ"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "အမ်ိဳးအစားဖန္တီးမည္"
@@ -2700,13 +2754,13 @@ msgstr "အမ်ိဳးအစားဖန္တီးမည္"
 msgid "Partial"
 msgstr "တစ္၀က္"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "စကား၀ွက္(ထည့္ခ်င္မွထည့္ပါ)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "သင္၏ စကားဝွက္ကို ေျပာင္းလဲၿပီးျဖစ္သည္"
@@ -2721,7 +2775,7 @@ msgstr "စကား၀ွက္(ထည့္ခ်င္မွထည့္ပ
 msgid "Permissions"
 msgstr "အျမဲတမ္းလင့္ခ္"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2729,19 +2783,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "ဖုန္း-"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "ဖုန္းနံပါတ္"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "ဖုန္းနံပါတ္(ထည့္ခ်င္မွထည့္ပါ)"
 
@@ -2749,30 +2808,26 @@ msgstr "ဖုန္းနံပါတ္(ထည့္ခ်င္မွထည
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "ဖုန္း-"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2792,9 +2847,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2803,7 +2857,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr "မၾကာေသးခင္ကအနီးအနားက အစီရင္ခံစာမ်ား၏ဓာတ္ပံု"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2817,6 +2871,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "ေျမပံုတြင္ပင္တစ္ခုထားမည္"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2844,27 +2903,26 @@ msgid "Please check your email address is correct"
 msgstr "သင္၏အီးေမးလ္လိပ္စာမွန္၊မမွန္ကိုစစ္ေဆးပါ"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "ေခါင္းစဥ္တစ္ခုကိုေရြးပါ"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2883,27 +2941,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "စာတစ္ခုရိုက္ထည့္ပါ"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2916,16 +2974,16 @@ msgstr "စကား၀ွက္တစ္ခုရိုက္ထည့္ပါ
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "ေခါင္းစီးတစ္ခုရိုက္ထည့္ပါ"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2936,20 +2994,20 @@ msgstr "မွန္ကန္ေသာအီးေမးလ္တစ္ခုရ
 msgid "Please enter a valid email address"
 msgstr "မွန္ကန္ေသာအီးေမးလ္လိပ္စာတစ္ခုရိုက္ထည့္ပါ"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "တစ္ခ်ိဳ႕အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2965,7 +3023,7 @@ msgid "Please enter your first name"
 msgstr "သင္၏ပထမအမည္ကိုရိုက္ထည့္ပါ"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr ""
@@ -2977,9 +3035,9 @@ msgstr "သင္၏အမည္ကိုရိုက္ထည့္ပါ"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "သင္၏အမည္ကိုရိုက္ထည့္ပါ"
@@ -3020,19 +3078,19 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "မွန္ကန္ေသာအီးေမးလ္လိပ္စာတစ္ခုရိုက္ထည့္ပါ"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3059,24 +3117,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "ေက်းဇူးျပဳျပီးမွတ္သားပါ-"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "သင္ဘာလို႔ဒီသတင္းပို႔ခ်က္ကိုျပန္ဖြင့္ရသလဲဆိုသည့္ရွင္းလင္းခ်က္ကိုေျပာျပေပးပါ"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "စာအနည္းငယ္ႏွင့္ဓာတ္ပံုတစ္ပံုကိုလည္းေဖာ္ျပေပးပါ"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "သင္၏ေကာင္စီသို႔သင္ယခင္ကသတင္းပို႔ဖူးေၾကာင္းေျပာျပေပးပါ"
 
@@ -3084,7 +3146,7 @@ msgstr "သင္၏ေကာင္စီသို႔သင္ယခင္ကသ
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3096,7 +3158,7 @@ msgstr "သင္လိုခ်င္ေသာ feed ကိုေရြးပါ
 msgid "Please select the type of alert you want"
 msgstr "သင္လိုခ်င္ေသာ အသိေပးခ်က္အမ်ိဳးအစားမ်ားကိုေရြးပါ"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "ျပႆနာေျဖရွင္းျပီးျပီ၊မရွင္းျပီးျပီကိုေဖာ္ျပပါ"
 
@@ -3104,12 +3166,12 @@ msgstr "ျပႆနာေျဖရွင္းျပီးျပီ၊မရွ
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3117,27 +3179,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "စာတစ္ေၾကာင္းေရးပါ"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "တင္မည္"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "%sမွာ အမည္မသိကဲ့သို႔တင္မည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "%s မွာ %s မွတင္ခဲ့သည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "%s မွာ <strong>%s</strong>(%s)မွတင္ခဲ့သည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "%s မွာ <strong>%s</strong>မွတင္ခဲ့သည္"
 
@@ -3153,7 +3211,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3161,11 +3219,11 @@ msgstr ""
 msgid "Previous"
 msgstr "ယခင္က"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3181,9 +3239,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "ကိုယ္ပိုင္"
 
@@ -3232,7 +3290,7 @@ msgstr "ေကာင္စီ %s သို႔ ျပႆနာ %s ကိုပိ
 msgid "Problem breakdown by state"
 msgstr "ျပည္နယ္မွ ျပႆနာကိုထပ္မံခြဲစိတ္လိုက္သည္"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "ျပႆနာကို ဖြင့္ထားသည္"
 
@@ -3240,8 +3298,7 @@ msgstr "ျပႆနာကို ဖြင့္ထားသည္"
 msgid "Problem state change based on survey results"
 msgstr "စစ္ေဆးမႈရလဒ္မ်ားအေပၚတြင္ မူတည္ၿပီး ျပႆနာ  အေျခအေန ေျပာင္းလဲသည္။"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "ျပႆနာမ်ား"
@@ -3266,18 +3323,18 @@ msgstr "FixMyStreet ေပၚတြင္ လတ္တေလာ တင္ျပ
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3285,7 +3342,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3293,11 +3350,15 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3311,11 +3372,11 @@ msgstr ""
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "စကားဝွက္ကို မထည့္သြင္းခ်င္လွ်င္ ရသည္။ စကားဝွက္ ထည့္သြင္းပါက ျပႆနာမ်ားကို တင္ျပျခင္း၊ update မ်ား ျပဳလုပ္ျခင္းႏွင့္ အစီရင္ခံစာမ်ား စီမံခန္႔ခြဲျခင္းတို႔ကို ပိုမိုလြယ္ကူစြာ ျပဳလုပ္ႏိုင္မည္။"
 
@@ -3323,12 +3384,12 @@ msgstr "စကားဝွက္ကို မထည့္သြင္းခ်
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3371,11 +3432,11 @@ msgstr "ျပႆနာ အစီရင္ခံသူ ျဖည့္စြက
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "%s အတြက္ RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "%s အုပ္ခ်ဳဳပ္ေရးဌာန %s အတြက္ RSS feed"
 
@@ -3383,11 +3444,11 @@ msgstr "%s အုပ္ခ်ဳဳပ္ေရးဌာန %s အတြက္ R
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "%s ၏ RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရိွ %s ၏ RSS feed"
 
@@ -3395,13 +3456,13 @@ msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရ
 msgid "RSS feed of nearby problems"
 msgstr "အနီးအနားရိွ ျပႆနာမ်ား၏ RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "%s အတြင္းရိွ ျပႆနာမ်ား၏ RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရိွ ျပႆနာမ်ား၏ RSS feed"
 
@@ -3415,11 +3476,11 @@ msgstr "လတ္တေလာ ျပည္တြင္း ျပႆနာမ်
 msgid "RSS feed of updates to this problem"
 msgstr "လက္ရိွ ျပႆနာကို update ျပဳလုပ္ထားသည့္ RSS feed"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3432,7 +3493,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3446,7 +3507,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "ျပႆနာမ်ားကို မၾကာေသးမီက အစီရင္ခံ တင္ျပၿပီး"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3459,7 +3520,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3471,8 +3533,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3487,17 +3549,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "ဓာတ္ပံု ဖယ္ရွားရန္ (မၿပီးေျမာက္ႏိုင္ပါ)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3505,14 +3571,14 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3521,7 +3587,7 @@ msgid "Report a problem"
 msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပရန္"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3537,7 +3603,7 @@ msgid "Report anonymously"
 msgstr "%sမွာ အမည္မသိကဲ့သို႔တင္မည္"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3573,7 +3639,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "ေဒသတြင္း ျပႆနာမ်ားကို အစီရင္ခံျခင္း၊ ၾကည့္႐ႈျခင္းႏွင့္ ေဆြးေႏြးျခင္း"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -3584,7 +3650,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr ""
@@ -3598,27 +3664,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -3637,17 +3703,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပျခင္း"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3675,15 +3739,15 @@ msgid "Reports published"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3696,7 +3760,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3749,39 +3813,45 @@ msgstr ""
 msgid "Right place?"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "ဘယ္ဘက္ကို လွည့္ပါ"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3797,20 +3867,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3827,13 +3897,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "အစီရင္ခံစာမ်ားကို ရွာေဖြရန္"
 
@@ -3846,7 +3915,7 @@ msgstr ""
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "အစီရင္ခံစာမ်ားကို ရွာေဖြရန္"
 
@@ -3861,12 +3930,12 @@ msgstr ""
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3876,8 +3945,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3887,7 +3955,7 @@ msgid "Select a body"
 msgstr "စာကိုယ္တစ္ခုကို ေရြးပါ။"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "ဧရိယာတစ္ခုကို ေရြးပါ။"
@@ -3908,7 +3976,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3921,7 +3989,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3930,11 +3998,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3972,7 +4040,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3983,7 +4051,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4008,8 +4076,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4020,7 +4088,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr ""
 
@@ -4080,7 +4148,7 @@ msgid "Some photos of recent reports"
 msgstr ""
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4089,12 +4157,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4112,9 +4179,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -4124,13 +4191,13 @@ msgstr ""
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4144,11 +4211,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4157,11 +4224,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4185,18 +4252,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4205,31 +4272,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr ""
 
@@ -4247,7 +4311,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4266,50 +4330,48 @@ msgstr ""
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4321,7 +4383,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4335,20 +4397,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "အက်ဥ္းခ်ဳပ္"
 
@@ -4359,14 +4420,19 @@ msgstr "အစီရင္ခံစာအက်ဥ္းခ်ဳပ္"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4384,13 +4450,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "စာ"
@@ -4411,6 +4481,11 @@ msgstr "စာဗားရွင္းသာ"
 msgid "Text:"
 msgstr "စာ-"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "စာ"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4440,7 +4515,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "ေက်းဇူးတင္ပါသည္။ ျပင္ဆင္ၿပီး ျဖစ္ေၾကာင္း ၾကားသိရ၍ ဝမ္းသာမိပါသည္။ သင့္အေနျဖင့္ ယခင္က ေကာင္စီထံ ျပႆနာတစ္ခုကို အစီရင္ခံတင္ျပဖူးပါသလား?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4452,27 +4527,29 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "ထိုျပႆနာကိုယခုပင္ျပန္ပို႔ပါမည္"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "ကၽြႏ္ုပ္လမ္းကိုျပင္ေပးပါ မွဒီအစီရင္ခံစာကိုဖယ္ျပီးပါျပီ"
 
@@ -4518,8 +4595,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4573,7 +4650,7 @@ msgstr "ခ်ိဳ႕ယြင္းမႈမွာ - %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4635,8 +4712,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4669,7 +4746,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4687,12 +4764,12 @@ msgstr ""
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -4700,7 +4777,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -4776,10 +4853,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "ဒီအခ်က္အလက္ ျဖည့္စြက္ရန္ လိုအပ္သည္"
 
@@ -4796,19 +4873,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "ဒီျပႆနာကိုေျဖရွင္းျပီးပါျပီ"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "ဒီျပႆနာကိုမေျဖရွင္းရေသးပါ"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4821,26 +4902,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "ဒီအစီရင္ခံစာသည္အတည္ျပဳျခင္းကိုေစာင့္ဆိုင္းေနဆဲျဖစ္သည္"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "ဒီျပႆနာကို ပိတ္ထားသည္ဟုေလာေလာဆယ္သတ္မွတ္ထားသည္"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "ဒီျပႆနာကိုေလာေလာဆယ္ေျဖရွင္းျပီးျပီဟုသတ္မွတ္ထားသည္"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "ဒီအစီရင္ခံစာကိုယခုေလာေလာဆယ္ဖြင့္ထားသည္"
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4848,15 +4929,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "ဒီ web စာမ်က္ႏွာသည္ အသံုးျပဳသူမွရိုက္ထားေသာ ျပႆနာ၏ဓာတ္ပံုတစ္ပံုပါ၀င္သည္"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4880,6 +4964,10 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4905,7 +4993,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4930,11 +5018,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4957,16 +5040,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4976,7 +5059,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5006,10 +5089,10 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5021,13 +5104,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr ""
 
@@ -5078,29 +5161,27 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr ""
 
@@ -5111,7 +5192,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5141,6 +5222,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5154,8 +5243,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5173,7 +5262,7 @@ msgid "User flagged"
 msgstr "သုုံးစြဲသူက အမွတ္အသား ျပဳလုပ္ျခင္း"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5186,27 +5275,25 @@ msgstr "သုံးစြဲသူရွာေဖြမႈသည္ ၎တိ
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "အသံုးျပဳသူမ်ား"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5214,9 +5301,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr ""
 
@@ -5242,7 +5329,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "ဆိုက္ေပၚတြင္ အစီရင္ခံစာ ၾကည့္႐ႈျခင္း"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5250,7 +5337,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5268,7 +5355,7 @@ msgstr "ျပႆနာကို စိစစ္ျခင္း"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "ေကာင္စီအဖြဲ႔မ်ား"
 
@@ -5338,7 +5425,7 @@ msgstr "ေပးပို႔ခဲ့သည့္ အခ်ိန္"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5360,7 +5447,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "သင့္အေနျဖင့္ ေလးပတ္အတြင္း အျခားေမးခြန္းမ်ား ရရွိလိုၿပီး အေျခအေနကို သတိရေစရန္ သတိေပးလိုပါသလား။"
 
@@ -5372,7 +5459,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "မက္ေဆ့ခ်္ တစ္ခုလုံးကို စာလုံးအႀကီးမ်ား ျဖင့္ ေရးျခင္းသည္ ဖတ္ရခက္ခဲၿပီး ပုဒ္ျဖတ္ပုဒ္ရပ္ ကိုလည္း ေပ်ာက္ေစသည္။"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5383,12 +5469,12 @@ msgstr "မက္ေဆ့ခ်္ တစ္ခုလုံးကို စာ
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "ဟုတ္သည္။"
 
@@ -5401,7 +5487,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5414,7 +5500,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "သင့္အေနျဖင့္ ေစာ္ကားခံေနရေၾကာင္း ျပန္လည္မြမ္းမံထားသည္ တို႔ကေဖာ္ျပေနၿပီး ထိုထဲတြင္ တစ္ကုိယ္ရည္ အခ်က္အလက္ သို႔မဟုတ္ တူညီသည့္ အခ်က္အလက္မ်ား ပါဝင္သည္။"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5423,7 +5509,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "သင့္အေနျဖင့္ ယခုဆိုက္တြင္ ျပႆနာကို ၾကည့္ရူႏိုင္သည္။"
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "သင့္အေနျဖင့္ ယဥ္ေက်းမႈမရွိေသာ သုံးစြဲသူ၏ အီးေမးလ္ကို ၎တို႔ဖန္တီးထားေသာ အလိုအေလ်ာက္ ဖုံးထားေသာ(မေပးပို႔ေသာ) အစီရင္ခံစာမ်ား ျဖစ္သည့္ ယဥ္ေက်းမႈမရွိေသာ စာရင္းတြင္ ထည့္သြင္းထားႏိုင္သည္။"
 
@@ -5453,7 +5539,7 @@ msgstr "သင့္အေနျဖင့္ ကၽြႏု္ပ္တို
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "ဆိုက္ေပၚတြင္ ရွိေနမေစခ်င္လွ်င္ ဖ်က္ထားေသာ အဖြဲ႔ကို အမွတ္အသား ျပဳလုပ္ႏိုင္သည္။"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5463,7 +5549,7 @@ msgid "You declined; please fill in the box above"
 msgstr "ျငင္းပယ္လိုက္သည္။ ေက်းဇူးျပဳ၍ အေပၚက အကြက္တြင္ ျဖည့္ေပးပါ။"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5474,7 +5560,7 @@ msgstr ""
 "မွာ သင့္ျပႆနာကို သြားေရာက္ ၾကည့္ရူႏိုင္ပါသည္။ \n"
 "\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5483,8 +5569,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5550,9 +5635,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5561,13 +5646,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5596,16 +5682,16 @@ msgstr "သင့္အမည္"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5625,8 +5711,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5659,7 +5745,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5690,19 +5776,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5710,8 +5796,8 @@ msgstr ""
 msgid "by %s"
 msgstr "%s မွ"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "ေကာင္စီ"
 
@@ -5742,6 +5828,10 @@ msgstr "သုံးစြဲသူအား ျပင္ဆင္ျခင္
 msgid "from %s different users"
 msgstr "%s မွ မတူညီေသာ သုံးစြဲသူမ်ား"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5759,7 +5849,7 @@ msgstr "မအားေသးပါ"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5842,12 +5932,12 @@ msgid "today"
 msgstr "ယေန႔"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5872,7 +5962,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "အုပ္ခ်ဳပ္ေရးဌာန"
 
@@ -5924,7 +6014,7 @@ msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5942,7 +6032,7 @@ msgid "%s problem reported"
 msgid_plural "%s problems reported"
 msgstr[0] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5960,19 +6050,19 @@ msgid "<big>%s</big> fixed in past month"
 msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> ၿပီးခဲ့သည့္လက ျပဳျပင္ထားမႈ"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> ၿပီးခဲ့သည့္ ရက္သတၱပတ္က အစီရင္ခံစာမ်ား"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> လတ္တေလာ တင္ျပထားေသာ အစီရင္ခံစာမ်ား"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6002,18 +6092,27 @@ msgid "last updated %d day ago"
 msgid_plural "last updated %d days ago"
 msgstr[0] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "ေကာင္စီမွပိတ္ထားသည္"
+
+#~ msgid "Filter report list"
+#~ msgstr "အစီရင္ခံစာစာရင္းကိုစစ္ထုတ္မည္"
+
+#~ msgid "Post"
+#~ msgstr "တင္မည္"
+
 #~ msgid "OK"
 #~ msgstr "အိုေက"
 
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 5cb559649..4ebf5577d 100644
--- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/mysociety/teams/12067/nb_NO/)\n"
@@ -20,8 +20,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " og "
@@ -56,7 +56,7 @@ msgstr "%d brukere fantes fra før"
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - oppsummeringsrapporter"
 
@@ -115,7 +115,7 @@ msgstr "%s spørreskjema sendt &ndash; %s besvart (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> -bidragsytere"
 
@@ -161,6 +161,8 @@ msgstr "(eksisterer ikke lenger)"
 msgid "(not sent to council)"
 msgstr "(ikke rapportert til administrasjonen)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -179,8 +181,8 @@ msgstr "(sendt til begge)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr "(vi har også RSS-strømmer for problemer innenfor %s)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Velg en kategori --"
@@ -207,17 +209,18 @@ msgid ""
 msgstr "<code>MAPIT_URL</code> er satt (<code>%s</code>) men ingen <code>MAPIT_TYPES</code>.<br>Dette er antagelig hvorfor \"dekket område\" er tom (under).<br>Kanskje du skal legge til noen <code>MAPIT_TYPES</code> i konfigurasjonsfilen?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr "<h2>Rapporter, statistikk og handlinger for</h2> <h1>%s</h1>"
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Vis</label> %s rapporter <label for=\"filter_categories\">om</label> %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> lagret."
 
@@ -247,7 +250,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ja</strong>, jeg har et passord"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -264,7 +267,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr "Aktiver totrinns pålogging"
 
@@ -284,7 +287,7 @@ msgstr "Legg til en <strong>administrasjon</strong> for hver administrativ insta
 msgid "Add a contact using the form below."
 msgstr "Legg til en kontakt ved å bruke formen under."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Legg til ny kategori"
@@ -317,7 +320,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Legg til ny kategori"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "Legg til valg"
 
@@ -326,8 +329,8 @@ msgstr "Legg til valg"
 msgid "Add phone number"
 msgstr "Legg til telefonnummer"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -335,21 +338,20 @@ msgid "Add to shortlist"
 msgstr "Legg i hurtiglisten"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Legg til / endre problemkategorier"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Legg til / endre responsprioriteter"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Legg til / endre responsmaler"
 
@@ -365,6 +367,12 @@ msgstr "Ved å legge rapporten i hurtiglisten din vil fjerne den fra hurtigliste
 msgid "Admin"
 msgstr "Admin"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Gjenta:"
@@ -377,8 +385,8 @@ msgstr "Varsel %d opprettet for %s, type %s, parameter %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Varsel %d koblet ut (opprettet %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Send meg varsel ved fremtidige oppdateringer"
 
@@ -390,10 +398,12 @@ msgstr "Varsler:"
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Alle"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Alle rapporter"
@@ -433,6 +443,11 @@ msgstr "Alle rapporter mellom %s og %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Rapportert i kategorien %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -469,7 +484,7 @@ msgstr "Anonym"
 msgid "Anonymous user"
 msgstr "Anonym bruker"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -482,7 +497,7 @@ msgid "Another user"
 msgstr "En annen bruker"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Er du sikker på at du vil avbryte opplastingen?"
 
@@ -491,8 +506,8 @@ msgstr "Er du sikker på at du vil avbryte opplastingen?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Er du sikker?"
@@ -503,7 +518,7 @@ msgstr "Er du sikker?"
 msgid "Area covered"
 msgstr "Dekket område"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Område:"
 
@@ -517,27 +532,32 @@ msgstr "Da dette er en reproduksjonsside og %s er usann, vil meldinger som blir
 msgid "Assign selected to role:"
 msgstr "Tilordne brukere til områder"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Tildel til kompetent administrasjon:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Flytt til en annen kategori:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Tildel til ekstern administrasjon:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Tildelt underavdeling:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "Tilordne brukere til områder"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Tilgjengelige kategorier"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Tildelt %s"
@@ -550,7 +570,7 @@ msgstr "På det meste blir %d forespørsler returnert i hver spørring.  De retu
 msgid "At the moment only searching for and looking at reports work."
 msgstr "For øyeblikket er det kun søk etter og å se på rapporter som fungerer."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr "Autorisert personale kan bli assosiert med en kategori hvor de operer."
 
@@ -558,11 +578,11 @@ msgstr "Autorisert personale kan bli assosiert med en kategori hvor de operer."
 msgid "Auto Response"
 msgstr "Autorespons"
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Auto-svar:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -574,12 +594,13 @@ msgstr "Gjennomsnittlig tid fra et problem rapporteres til det er fikset, de sis
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Unngå personlig informasjon og bilnummerskilt"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Avventer moderasjon"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Tilbake"
@@ -600,14 +621,12 @@ msgstr "Bannlys bruker"
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Administrasjoner"
 
@@ -620,11 +639,13 @@ msgstr "Administrasjoner"
 msgid "Body"
 msgstr "Administrasjon"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Administrasjon:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr "CSV-fil"
 
@@ -636,8 +657,7 @@ msgstr "Finner du ikke e-posten? Sjekk mappen for uønsket post. Det løser prob
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Hvis du ikke kan se kartet, <em>hopp over dette steget</em>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -653,15 +673,13 @@ msgstr "Kategorier:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -671,7 +689,7 @@ msgstr "Kategori"
 msgid "Category and State"
 msgstr "Kategori og tilstand"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Kategori endret fra '%s' til '%s'"
 
@@ -694,6 +712,11 @@ msgstr "Kategori:"
 msgid "Change"
 msgstr "Endre"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Bytt passord"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -710,7 +733,7 @@ msgstr "Bytt passord"
 msgid "Change phone number"
 msgstr "Endre telefonnummer"
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 #, fuzzy
 msgid "Change two-factor authentication"
 msgstr "Aktiver totrinns pålogging"
@@ -721,12 +744,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr "Velg et <strong>kategorinavn</strong> som gir mening for innbyggerne (f.eks. \"Hull i veien\", \"Gatelys\") men som også er nyttig for administrasjonen.  Disse vil dukke opp i nedtrekksmenyen på rapporter-et-problem-siden."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr "Velg en annen"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr "Nullstill lokalt lagrede data"
 
@@ -763,8 +786,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -774,11 +797,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Lukket"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "(ikke rapportert til administrasjonen)"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr "Stengt for oppdateringer"
 
@@ -811,13 +830,12 @@ msgid "Code"
 msgstr "Kode"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr "Minimer kart"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Oppsett"
@@ -934,7 +952,7 @@ msgstr "Lag en rapport"
 msgid "Create an account"
 msgstr "Opprett konto"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Lag kategori"
@@ -944,27 +962,25 @@ msgstr "Lag kategori"
 msgid "Create priority"
 msgstr "Opprett prioritet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "Opprett rapporter/oppdateringer som myndigheten"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "Opprett rapporter/oppdateringer på vegne av en bruker"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Lag mal"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Opprettet"
@@ -973,6 +989,17 @@ msgstr "Opprettet"
 msgid "Created %d new users"
 msgstr "Opprettet %d nye brukere"
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Opprettet"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Opprettet"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -984,10 +1011,6 @@ msgstr "Opprettet:"
 msgid "Current password:"
 msgstr "Gjeldende passord:"
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr "Gjeldende nøkkel:"
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -997,19 +1020,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "I øyeblikket er ikke laget noen instanser."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Kunden kan ikke kontaktes"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Oversikt"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr "Slå av totrinns pålogging"
 
@@ -1021,7 +1046,7 @@ msgstr "Behandlet av underavdeling innen 5 arbeidsdager"
 msgid "Default"
 msgstr "Standard"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1031,7 +1056,7 @@ msgid "Delete"
 msgstr "Slett"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Slett mal"
@@ -1053,9 +1078,7 @@ msgid "Describe why you are moderating this"
 msgstr "Beskriv hvorfor du moderer dette"
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -1064,7 +1087,7 @@ msgstr "Beskrivelse"
 msgid "Destination"
 msgstr "Beskrivelse"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr "Detaljert informasjon er begrenset til %d tegn."
 
@@ -1100,7 +1123,7 @@ msgid "Disable"
 msgstr "Slå av"
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1108,6 +1131,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Rapportert i kategorien %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Rapportert i kategorien %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr "Slått av:"
@@ -1142,25 +1175,25 @@ msgstr "Vet ikke"
 msgid "Don't like forms?"
 msgstr "Liker ikke skjemaer?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr "Én ned"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Dra og slipp bilder hit eller <u>klikk for å laste opp</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr "Duplikat av"
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr "Duplikater"
 
@@ -1175,7 +1208,7 @@ msgstr ""
 "Ulike kategorier kan ha same kontakt</strong> (e-postadresse).\n"
 "Dette betyr at du kan legge til mange grupper/kategorier selv om du bare har <strong>en<strong> kontakt for administrasjonen."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr "Øst/Nord:"
@@ -1187,7 +1220,7 @@ msgstr "Øst/Nord:"
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Rediger"
@@ -1198,12 +1231,11 @@ msgstr "Rediger"
 msgid "Edit body details"
 msgstr "Rediger detaljer for administrasjon"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "Endre andre brukeres rettigheter"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Endre rapportkategori"
 
@@ -1211,17 +1243,15 @@ msgstr "Endre rapportkategori"
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Endre rapportprioritet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Endre rapporter"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1258,8 +1288,9 @@ msgstr "Oppdatert av"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1268,15 +1299,14 @@ msgstr "Oppdatert av"
 msgid "Email"
 msgstr "E-post"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Epostadresse"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr "Epostadresse (valgfritt)"
 
@@ -1296,12 +1326,13 @@ msgstr "Send meg en lenke eller kode via epost/SMS for å logge inn"
 msgid "Email me a link to sign in"
 msgstr "Send meg ei lenke på epost for å logge inn"
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "Epost bekreftet:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "E-post:"
@@ -1370,12 +1401,12 @@ msgstr "Sluttdato"
 msgid "Endpoint"
 msgstr "Endepunkt"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Skriv inn et veinavn i Z&uuml;rich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Skriv inn et britisk postnummer i nærheten, eller veinavn og sted"
 
@@ -1402,10 +1433,10 @@ msgstr "Legg inn detaljer om problemet"
 msgid "Error"
 msgstr "Feil"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Alt"
 
@@ -1418,7 +1449,7 @@ msgstr "Eksempel-postnummer %s"
 msgid "Examples:"
 msgstr "Eksempler:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Eksisterende kategori"
 
@@ -1427,7 +1458,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1452,7 +1483,7 @@ msgid "External body"
 msgstr "Ekstern administrasjon"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1464,20 +1495,20 @@ msgstr ""
 msgid "External team"
 msgstr "Eksternt lag"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Ekstra data:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1510,20 +1541,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filtrer rapportliste"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Første gang"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Bilder av nye problemer i nærheten"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nye rapporter"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Fiks dette ved å velge en <strong>area covered</strong> i <em> Edit body details</em>-skjemaet nedenfor."
@@ -1553,7 +1589,7 @@ msgstr "Merk som slettet"
 msgid "Flag user"
 msgstr "Flag bruker"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Flagget"
@@ -1562,7 +1598,7 @@ msgstr "Flagget"
 msgid "Flagged reports and users"
 msgstr "Flaggede rapporter og brukere"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Flaggede brukere er listet opp på <a href='%s'>flaggede</a>-siden."
 
@@ -1570,8 +1606,8 @@ msgstr "Flaggede brukere er listet opp på <a href='%s'>flaggede</a>-siden."
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Flaggede brukere er ikke begrenset på noe måte.  Dette er bare en liste med brukere som har blitt markert for å gi dem oppmerksomhet."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Flagget:"
 
@@ -1597,11 +1633,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Glemt passordet ditt?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Tildelt til ekstern administrasjon"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Ønsket er sendt videre til ekstern administrasjon"
 
@@ -1611,12 +1647,20 @@ msgstr "Ønsket er sendt videre til ekstern administrasjon"
 msgid "Frequently Asked Questions"
 msgstr "Ofte spurte spørsmål"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1638,7 +1682,7 @@ msgstr "Få oppdateringer for problemer i denne %s"
 msgid "Get updates of problems in this %s"
 msgstr "Få oppdateringer for problemer i denne %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Gi meg en RSS-strøm"
 
@@ -1654,15 +1698,15 @@ msgstr "Glad for å høre at det er i orden!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1672,7 +1716,7 @@ msgstr "Fortsett"
 msgid "Going to send questionnaire?"
 msgstr "Skal det sendes spørreskjema?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr "Gi tilgang til administratoren"
 
@@ -1698,6 +1742,7 @@ msgstr "Har du rapportert et problem til en administrasjon før, eller er dette
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1732,7 +1777,8 @@ msgstr "Skjul"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1760,7 +1806,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Skjul nåler"
 
@@ -1814,11 +1860,9 @@ msgstr "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1837,15 +1881,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1859,7 +1903,7 @@ msgstr "Hvis to eller flere instanser er lokalisert på samme sted,  kombinerer
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1883,7 +1927,7 @@ msgstr "Hvis du vil at denne malen skal være et valg for spesielle kategorier,
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "Hvis du legger inn en rapport her vil <strong>ikke</strong> rapporten bli sendt til administrasjonen."
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1920,7 +1964,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1944,6 +1988,17 @@ msgstr "I misbrukstabell?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "I tillegg er følgende attributter som ikke er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (også returnert som del av description), interface_used, comment_count, requestor_name (kun tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "bydel"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1953,20 +2008,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr "Tom innboks, her kommer vi!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Inkluder rapportørens personlige detaljer"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Feil has_photo-verdi \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "Instruer underleverandør til å fikse problemer"
 
@@ -1983,16 +2038,12 @@ msgstr "Interne notater"
 msgid "Internal notes"
 msgstr "Interne notater"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Ugyldig agency_responsible-verdi %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Ugyldig format %s oppgitt."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Ugyldig plassering.  Ny plassering må være dekket av den samme administrasjonen."
 
@@ -2044,13 +2095,13 @@ msgstr "Siste oppdatering:"
 msgid "Last&nbsp;update:"
 msgstr "Siste&nbsp;oppdatering:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Minst nylig oppdatert"
@@ -2067,7 +2118,7 @@ msgstr "List alle rapporterte problemer"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Laster..."
@@ -2105,17 +2156,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2133,19 +2185,20 @@ msgstr ""
 msgid "MAP"
 msgstr "KART"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr "Administrer hurtigliste"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2159,24 +2212,24 @@ msgstr "Kart"
 msgid "Mark as sent"
 msgstr "Marker som sendt"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Merk brukere hvis adferd du ønsker å ha en sjekk på som <strong>flagget</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Melding"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Melding til kompetent administrasjon:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Melding til ekstern administrasjon:"
 
@@ -2189,7 +2242,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr "Manglende administrasjoner:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Mangler jurisdiction_id"
 
@@ -2197,8 +2250,7 @@ msgstr "Mangler jurisdiction_id"
 msgid "Moderate"
 msgstr "Moderer"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Moderer detaljer i rapprten"
 
@@ -2221,7 +2273,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "Moderert av avdeling innen en arbeidsdag"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2231,14 +2283,14 @@ msgstr ""
 msgid "Month"
 msgstr "Måned"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Mest kommentert"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2266,9 +2318,10 @@ msgstr ""
 msgid "Name"
 msgstr "Navn"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Navn:"
@@ -2286,7 +2339,7 @@ msgstr "Naviger til dette problemet"
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Nærmeste navngitte vei til nålen plassert på kartet (automatisk generert ved hjelp av OpenStreetMap): %s%s"
 
@@ -2294,12 +2347,12 @@ msgstr "Nærmeste navngitte vei til nålen plassert på kartet (automatisk gener
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Nærmeste postnummer til nålen plassert på kartet (automatisk generert): %s (%sm unna)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Nærmeste vei til nålen plassert på kartet (automatisk generert ved hjelp av Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2324,7 +2377,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Ny administrasjon lagt til"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Ny kategorikontakt lagt til"
 
@@ -2338,8 +2391,8 @@ msgstr "Ny epostadresse:"
 msgid "New field"
 msgstr "Legg til felt"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nytt internt notat:"
 
@@ -2347,13 +2400,13 @@ msgstr "Nytt internt notat:"
 msgid "New local problems on FixMyStreet"
 msgstr "Nye lokale problemer på FiksGataMi"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Nytt notat til DM:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Nytt passord:"
 
@@ -2430,7 +2483,7 @@ msgstr "Ny mal"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Nyeste"
@@ -2443,7 +2496,6 @@ msgstr "Neste"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2452,11 +2504,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Nei"
 
@@ -2468,11 +2520,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Ingen administrasjon"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Ingen administrasjon er valgt"
 
@@ -2488,8 +2541,8 @@ msgstr "Fant ingen flaggede problemer."
 msgid "No flagged users found."
 msgstr "Fant ingen flaggede brukere."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Ingen flere oppdateringer"
 
@@ -2528,8 +2581,8 @@ msgstr "Ingen støttespillere"
 msgid "None"
 msgstr "Ingen"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
@@ -2537,8 +2590,8 @@ msgstr ""
 "Vanlige (offentlige) brukere bør ikke være tilknyttet noen <strong>områder</strong>.<br>\n"
 "Autorisert personale kan være assosiert med området de operer i."
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2550,10 +2603,14 @@ msgstr ""
 "Avhengig av implementeringen, kan ansatte brukere ha tilgang til dashbordet (sammendrag av \n"
 "aktivitet for hele instansen), mulighet å skjule meldinger eller sette status for spesialrapporter."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Ikke for min underavdeling"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Ikke rapportert tidligere"
@@ -2601,12 +2658,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2614,12 +2671,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Gammel tilstand"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Eldste"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2628,7 +2685,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2659,7 +2716,7 @@ msgstr "Open311-initiativets nettside"
 msgid "Open311 specification"
 msgstr "Open311-spesifikasjon"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2671,7 +2728,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2679,16 +2736,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2720,7 +2777,7 @@ msgstr "Fant ikke siden"
 msgid "Parent"
 msgstr "Forelder"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Alle kategorier"
@@ -2729,13 +2786,13 @@ msgstr "Alle kategorier"
 msgid "Partial"
 msgstr "Delvis"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Passord (valgfritt)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Ditt passord har blitt endret"
@@ -2750,7 +2807,7 @@ msgstr "Passord (valgfritt)"
 msgid "Permissions"
 msgstr "Rettigheter:"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Rettigheter:"
 
@@ -2758,19 +2815,24 @@ msgstr "Rettigheter:"
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefon:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Telefonnummer (valgfritt)"
 
@@ -2778,30 +2840,26 @@ msgstr "Telefonnummer (valgfritt)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefon:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2821,9 +2879,8 @@ msgstr "Foto kreves"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Bilder"
@@ -2832,7 +2889,7 @@ msgstr "Bilder"
 msgid "Photos of recent nearby reports"
 msgstr "Bilder av nye problemer i nærheten"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2846,6 +2903,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Plasser tegnestiften på kartet"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2873,27 +2935,26 @@ msgid "Please check your email address is correct"
 msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Velg en kategori"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2915,27 +2976,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Ikke vær ufin &mdash; å kjefte på din administrasjon skader verdien av tjenesten for alle brukerne."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Vennligst legg til en melding"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Vennligst skriv et navn"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "Vennligst legg inn et navn for administrasjonen"
 
@@ -2948,16 +3009,16 @@ msgstr "Skriv inn et passord"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Vennligst legg inn et emne"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2968,20 +3029,20 @@ msgstr "Legg til en gyldig e-post"
 msgid "Please enter a valid email address"
 msgstr "Legg inn din e-post"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Legg inn opplysninger om problemet"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2997,7 +3058,7 @@ msgid "Please enter your first name"
 msgstr "Vennligst tast inn ditt fornavn"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Vennligst legg inn ditt fulle navn, administrasjoner som mottar ditt problem trenger dette - hvis du ikke ønsker at ditt navn skal vises, fjern haken under"
@@ -3009,9 +3070,9 @@ msgstr "Legg inn ditt navn"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Legg inn ditt navn"
@@ -3054,19 +3115,19 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Vennligst indiker om du ønsker å motta et nytt spørreskjema"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Legg inn din e-post"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3093,24 +3154,28 @@ msgstr "Merk at din oppdatering <strong>enda ikke har blitt sendt</strong>."
 msgid "Please note:"
 msgstr "Vennligst merk deg:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr "Vennligst bidra med en offentlig oppdatering for denne rapporten."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Vennligst bidra med en forklaring for hvorfor du gjenåpner denne problemrapporten"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Vennligst bidra med litt tekst i tillegg til et bilde"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Vennligst opplys om du har rapportert et problem til din administrasjon tidligere"
 
@@ -3118,7 +3183,7 @@ msgstr "Vennligst opplys om du har rapportert et problem til din administrasjon
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Velg en administrasjon."
 
@@ -3130,7 +3195,7 @@ msgstr "Velg den kilden du ønsker"
 msgid "Please select the type of alert you want"
 msgstr "Vennligst velg hvilken type varsel du ønsker"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke"
 
@@ -3138,12 +3203,12 @@ msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Vennligst last opp kun bilder"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3151,27 +3216,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Skriv inn en melding"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Send inn"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Publisert anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Sendt inn av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Lagt inn av <strong>%s</strong> (%s) %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Lagt inn av <strong>%s</strong> %s"
 
@@ -3187,7 +3248,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3195,11 +3256,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Forrige"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Prioriteter"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Prioritet"
@@ -3215,9 +3276,9 @@ msgid "Privacy and cookies"
 msgstr "Personvern og cookies"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privat"
 
@@ -3267,7 +3328,7 @@ msgstr "Problem %s sendt til administrasjon %s"
 msgid "Problem breakdown by state"
 msgstr "Tilstandsfordeling av problemer"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problem markert som åpent."
 
@@ -3275,8 +3336,7 @@ msgstr "Problem markert som åpent."
 msgid "Problem state change based on survey results"
 msgstr "Problemtilstandsendring basert på spørreundersøkelsesresultater"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemer"
@@ -3301,18 +3361,18 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemer innenfor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemer innenfor %s bydel"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3320,7 +3380,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Problemer innenfor %s, %s"
 
@@ -3328,11 +3388,15 @@ msgstr "Problemer innenfor %s, %s"
 msgid "Property address:"
 msgstr "Eiendomsadresse:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3346,11 +3410,11 @@ msgstr "Bidra med en oppdatering"
 msgid "Provide update as"
 msgstr "Legg inn oppdatering som"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Det er valgfritt å oppgi et passord, men hvis du gjør det vil det bli enklere for deg å rapportere problemer, legge inn oppdateringer og holde oversikt over dine rapporter"
 
@@ -3358,12 +3422,12 @@ msgstr "Det er valgfritt å oppgi et passord, men hvis du gjør det vil det bli
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Offentlig respons:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Offentlig oppdatering:"
 
@@ -3406,11 +3470,11 @@ msgstr "Spørreskjema fylt inn av feilrapportøren"
 msgid "RSS feed"
 msgstr "RSS-strøm"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS-strøm for %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS-strøm for %s bydel, %s"
 
@@ -3418,11 +3482,11 @@ msgstr "RSS-strøm for %s bydel, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS-strøm fra %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS-strøm av %s, innenfor %s bydel"
 
@@ -3430,13 +3494,13 @@ msgstr "RSS-strøm av %s, innenfor %s bydel"
 msgid "RSS feed of nearby problems"
 msgstr "RSS-strøm med problemer i nærheten"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS-strøm for problemer innenfor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS-strøm for problemer innenfor %s bydel"
 
@@ -3450,11 +3514,11 @@ msgstr "RSS-strøm med nylige lokale problemer"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS-strøm med oppdateringer for dette problemet"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3467,7 +3531,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Motta e-post når det er oppdateringer på dette problemet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr "Mottatt av %s øyeblikk senere"
 
@@ -3481,7 +3545,7 @@ msgstr "Nylige lokale problemer, %s"
 msgid "Recently reported problems"
 msgstr "Nylig meldte problemer"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Nylig oppdatert"
@@ -3494,7 +3558,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Husk at FiksGataMi primert er laget for å rapportere fysiske problemer som kan bli fikset. Hvis ditt problem ikke er egnet for å sende inn via denne tjenesten, så husk at du kan kontakte administrasjonen direkte via deres egen nettside."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3506,8 +3571,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Fjern flagg"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3523,17 +3588,22 @@ msgstr "Fjern fra nettsiden"
 msgid "Remove option"
 msgstr "Fjern fra nettsiden"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Fjern bilde (kan ikke gjøres om!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Endre andre brukeres rettigheter"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Svar til bruker:"
 
@@ -3541,14 +3611,14 @@ msgstr "Svar til bruker:"
 msgid "Report"
 msgstr "Rapport"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "Rapport-ID:"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3557,7 +3627,7 @@ msgid "Report a problem"
 msgstr "Rapporter et problem"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3573,7 +3643,7 @@ msgid "Report anonymously"
 msgstr "Rapportert anonymt %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3609,7 +3679,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Rapporter, finn eller diskuter lokale problemer"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Rapportert anonymt %s"
@@ -3620,7 +3690,7 @@ msgstr "Rapportert anonymt %s"
 msgid "Reported before"
 msgstr "Rapportert tidligere"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Publisert av %s %s"
@@ -3634,27 +3704,27 @@ msgstr "Rapportert av:"
 msgid "Reported in the %s category"
 msgstr "Rapportert i kategorien %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Rapportert i kategorien %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Rapportert i kategorien %s av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Publisert av %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Rapportert av %s av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Rapportert av %s i kategorien %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Rapportert av %s i kategorien %s av %s %s"
 
@@ -3673,17 +3743,15 @@ msgstr "Rapportert:"
 msgid "Reporting a problem"
 msgstr "Legger til et problem"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Rapporter"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3711,15 +3779,15 @@ msgid "Reports published"
 msgstr "Publiserte rapporter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3732,7 +3800,7 @@ msgstr "Usendte rapporter"
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3785,39 +3853,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "Riktig sted?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Veioperatør for denne navngitte veien (utledet fra veiens referansenummer og type) %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Roter til venstre"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3833,20 +3907,20 @@ msgstr "Hvis du roterer dette bildet, mister du ikke lagrede endringer til rappo
 msgid "Satellite"
 msgstr "Satelitt"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3863,13 +3937,12 @@ msgid "Save with a public update"
 msgstr "Lagre med en offentlig oppdatering"
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Søk i rapporter"
 
@@ -3882,7 +3955,7 @@ msgstr "Søk i brukere"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Søk i rapporter"
 
@@ -3897,12 +3970,12 @@ msgstr "Søk:"
 msgid "Searching found no reports."
 msgstr "Søket fant ingen rapporter."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Søket fant ingen brukere."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3912,8 +3985,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr "Se personvernreglene våre"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3923,7 +3995,7 @@ msgid "Select a body"
 msgstr "Velg en administrasjon"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Velg et område"
@@ -3944,7 +4016,7 @@ msgstr ""
 msgid "Select:"
 msgstr "Velg:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3957,7 +4029,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3966,11 +4038,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "Rapport sendt tilbake"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Sendt til %s %s senere"
 
@@ -4008,7 +4080,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr "Hurtigliste"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4019,7 +4091,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr "I hurtiglisten"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr "I hurtiglisten til %s"
@@ -4044,8 +4116,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4056,7 +4128,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Vis nåler"
 
@@ -4119,7 +4191,7 @@ msgid "Some photos of recent reports"
 msgstr "Noen bilder av nylig meldte problemer"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Noe tekst å oversette"
 
@@ -4128,12 +4200,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Beklager det ser ut til å være et \"Crown dependency\"-postnummer, som vi ikke dekker."
 
@@ -4151,9 +4222,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Beklager, men det oppsto et problem når vi forsøkte å bekrefte problemrapporten din"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Beklager, vi kunne ikke finne det stedet."
 
@@ -4163,13 +4234,13 @@ msgstr "Beklager, vi kunne ikke finne det stedet."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr "Beklager, vi kunne ikke logge deg inn. Vennligst fyll in skjemaet nedenfor."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Beklager, vi kunne ikke tolke den posisjonen.  Vennligst prøv på nytt."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4184,11 +4255,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr "Beklager, du mangler rettigheter til å gjøre dette."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Sorter etter"
@@ -4198,11 +4269,11 @@ msgstr "Sorter etter"
 msgid "Staff only"
 msgstr "Personale:"
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr "Personale har mulighet til å logge admingrensesnittet."
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr "Personale:"
 
@@ -4226,18 +4297,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Tilstand"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4246,31 +4317,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Tilstand:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Statistikk"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Status"
 
@@ -4288,7 +4356,7 @@ msgstr "Gatevisning"
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Underavdeling/administrasjon"
 
@@ -4307,50 +4375,48 @@ msgstr "Emne:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Send inn"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Send inn endringer"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Send inn spørreskjema"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Sendt inn"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4363,7 +4429,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Oppdateringer er begrenset til %s tegn i lengde. Vennligst skriv en kortere tekst."
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4377,20 +4443,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr "Oppsummer problemet"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Oppsummer dine endringer"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Oppsummering"
 
@@ -4401,14 +4466,20 @@ msgstr "Oppsummeringsrapporter"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Superuser"
+msgstr "Superbruker:"
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr "Superbruker:"
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "Superbrukere har tilgang til å utføre <strong>alle handlinger</strong> i admingrensesnittet."
 
@@ -4426,13 +4497,18 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr "Mal &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Maler"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Minst nylig oppdatert"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Tekst"
@@ -4454,6 +4530,11 @@ msgstr "Tekst-versjon"
 msgid "Text:"
 msgstr "Tekst:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Tekst"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Takk for at du rapporterte dette problemet!"
@@ -4483,7 +4564,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Takk, glad for å høre at problemet er fikset! Vi vil gjerne spørre deg om du har rapportert et problem til en administrasjon tidligere?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4495,27 +4576,29 @@ msgstr "Bildet ser ikke ut til å ha blitt lastet opp riktig (%s), prøv på nyt
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Det stedet dekkes ikke av noen administrasjon, kanskje det er til havs eller utenfor landet - vennligst forsøk et annet sted."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Det postnummeret ble ikke gjenkjent, beklager."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Det problemer har blitt markert som sendt."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Det problemet vil nå bli sendt på nytt."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Den rapporten har blitt fjernet fra FiksGataMi."
 
@@ -4565,8 +4648,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4629,7 +4712,7 @@ msgstr "Feilen var: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "De følgende Open311 v2-atributtene blir returnert for hver forespørsel: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code og service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "Følgende informasjon om nærmeste vei kan være unøyaktig eller irrelevant, hvis problemet er nær flere veier eller nær en vei uten navn registrert i OpenStreetmap."
 
@@ -4691,8 +4774,8 @@ msgstr "Brukeren kunne ikke plassere problemet på et kart, men sjekk området r
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4727,7 +4810,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4745,12 +4828,12 @@ msgstr "Det var problemer med å vise denne siden. Vennligst prøv igjen senere.
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Det var problemer med din oppdatering.  Vær så snill å forsøke igjen."
 
@@ -4758,7 +4841,7 @@ msgstr "Det var problemer med din oppdatering.  Vær så snill å forsøke igjen
 msgid "There were problems with your report. Please see below."
 msgstr "Det var problemer med din rapport.  Vennligst se under."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Det var problemer med din oppdatering. Vennligst se under."
 
@@ -4843,10 +4926,10 @@ msgstr "Denne e-posten har blitt sendt til begge administrasjonene som dekker st
 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 "Denne e-posten har blitt sendt til flere administrasjoner som dekker stedet for problemet, da den valgte kategorien er tilgjengelig for disse.  Vær så snill å ignorere e-posten hvis dere ikke er korrekt administrasjon for å håndtere denne saken."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Denne informasjonen er påkrevd"
 
@@ -4863,19 +4946,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Dette problemet er løst"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Dette problemet har ikke blitt løst"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4888,26 +4975,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Denne rapporten avventer moderasjon"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Denne rapporten er for tiden markert som lukket."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Denne rapporten er for tiden markert som fikset."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Denne rapporten er for tiden markert som åpen."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4915,15 +5002,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Tid brukt (i minutter):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4947,6 +5037,10 @@ msgstr "Tittel"
 msgid "Title:"
 msgstr "Tittel:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "Du finner lokale problemer ved å søke på ditt postnummer eller veinavn og sted"
@@ -4972,7 +5066,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "For å se et kart med en mer presis plassering for dette problemet."
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4997,11 +5091,6 @@ msgstr ""
 msgid "Total"
 msgstr "Totalt"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr "Trafikkstyring kreves?"
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -5024,17 +5113,17 @@ msgstr "Forsøk å sende epost direkte til oss:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 #, fuzzy
 msgid "Two-factor authentication"
 msgstr "Aktiver totrinns pålogging"
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5044,7 +5133,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5074,10 +5163,10 @@ msgstr "Ukjent feil"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "Ukjent problem-Id"
 
@@ -5089,13 +5178,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Oppdatering"
 
@@ -5146,29 +5235,27 @@ msgstr "En oppdatering gjennåpnet problemet"
 msgid "Update statuses"
 msgstr "Oppdater tilstanden"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Oppdatert!"
 
@@ -5179,7 +5266,7 @@ msgstr "Oppdatert!"
 msgid "Updates"
 msgstr "Oppdateringer"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Oppdateringer er begrenset til %s tegn i lengde. Vennligst skriv en kortere tekst."
 
@@ -5209,6 +5296,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5222,8 +5317,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5241,7 +5336,7 @@ msgid "User flagged"
 msgstr "Bruker flagget"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5254,27 +5349,25 @@ msgstr "Brukersøk leter etter treff gjennom brukernavn og epostadresser. "
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Brukere"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr "Brukere kan gjøre følgende handlinger innenfor deres tildelte administrasjon eller område"
 
@@ -5283,9 +5376,9 @@ msgstr "Brukere kan gjøre følgende handlinger innenfor deres tildelte administ
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr "Brukere kan gjøre følgende handlinger innenfor deres tildelte administrasjon eller område"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Verdier oppdatert"
 
@@ -5311,7 +5404,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Se rapport på nettstedet"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Se rapport per bydel"
 
@@ -5319,7 +5412,7 @@ msgstr "Se rapport per bydel"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5337,7 +5430,7 @@ msgstr "Ser på et problem"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Bydeler innenfor denne administrasjonen"
 
@@ -5407,7 +5500,7 @@ msgstr "Når sendt"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5427,7 +5520,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "Kunne du tenke deg å bidra til FiksGataMi?  Kildekoden vår er fri programvare og <a href=\"https://fixmystreet.org\">tilgjengelig via fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Kunne du tenke deg å motta en ny forespørsel om 4 uker, som minner deg om å sjekke status?"
 
@@ -5439,7 +5532,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Når du skriver meldingen din med kun store bokstaver blir den vanskelig å lese. Det samme gjelder manglende tegnsetting."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5450,12 +5542,12 @@ msgstr "Når du skriver meldingen din med kun store bokstaver blir den vanskelig
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Ja"
 
@@ -5468,7 +5560,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5481,7 +5573,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Du rapporterer at følgende oppdatering er støtende, inneholder personlig informasjon, eller lignende:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5490,7 +5582,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Du kan <a href=\"%s%s\">lese om problemet på denne siden</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Du kan legge en misbrukers epostadresse til misbrukslista, hvilket automatisk skjuler (og aldri sender) rapporter vedkommende oppretter."
 
@@ -5522,7 +5614,7 @@ msgstr "Du kan hjelpe oss ved å finne en kontakt-e-post for lokale problemer i
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Du kan markere en administrasjon som slettet hvis du ikke vil at den skal være aktiv på dette nettstedet."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5532,7 +5624,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Du avviste; vennligst fyll inn boksen ovenfor"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5540,7 +5632,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Du har allerede besvart dette spørreskjemaet. Hvis du har spørsmål, vennligst <a href='%s'>ta kontakt</a>, eller <a href='%s'>se på ditt problem</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 #, fuzzy
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Du har allerede lagt ved bilder til denne rapporten. Merk at du kan maksimalt legge ved 3 til rapporten (hvis du laster opp flere blir det eldste slettet)."
@@ -5550,8 +5642,7 @@ msgstr "Du har allerede lagt ved bilder til denne rapporten. Merk at du kan maks
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Du har allerede lagt ved bilder til denne rapporten. Merk at du kan maksimalt legge ved 3 til rapporten (hvis du laster opp flere blir det eldste slettet)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr "Du har allerede lagt ved bilder til denne rapporten. Merk at du kan maksimalt legge ved 3 til rapporten (hvis du laster opp flere blir det eldste slettet)."
 
@@ -5617,9 +5708,9 @@ msgstr "Dine rapporter"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Din konto"
@@ -5629,13 +5720,14 @@ msgstr "Din konto"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr "Slå av totrinns pålogging"
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5664,16 +5756,16 @@ msgstr "Ditt navn"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5694,8 +5786,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr "Logg inn med epost i stedet, og oppgi et nytt passord.  Når du besøker lenken du fikk i epost vil passordet ditt bli oppdatert."
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5728,7 +5820,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5759,19 +5851,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "alle"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5779,8 +5871,8 @@ msgstr ""
 msgid "by %s"
 msgstr "av %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "administrasjon"
 
@@ -5811,6 +5903,10 @@ msgstr "rediger bruker"
 msgid "from %s different users"
 msgstr "fra %s forskjellige brukere"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5828,7 +5924,7 @@ msgstr "n/a"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr "ingen"
 
@@ -5911,12 +6007,12 @@ msgid "today"
 msgstr "idag"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5941,7 +6037,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "bydel"
 
@@ -6001,7 +6097,7 @@ msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6022,7 +6118,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6043,21 +6139,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> fikset siste måned"
 msgstr[1] "<big>%s</big> fikset siste måned"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> rapport siste uke"
 msgstr[1] "<big>%s</big> rapporter siste uke"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> rapportert<br>nylig"
 msgstr[1] "<big>%s</big> rapportert<br>nylig"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6092,20 +6188,38 @@ msgid_plural "last updated %d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "(ikke rapportert til administrasjonen)"
+
+#~ msgid "Current token:"
+#~ msgstr "Gjeldende nøkkel:"
+
+#~ msgid "Filter report list"
+#~ msgstr "Filtrer rapportliste"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Ugyldig agency_responsible-verdi %s"
+
+#~ msgid "Post"
+#~ msgstr "Send inn"
+
+#~ msgid "Traffic management required?"
+#~ msgstr "Trafikkstyring kreves?"
+
 #~ msgid "(ignored if type is \"String\")"
 #~ msgstr "(ignorert hvis typen er \"String\")"
 
@@ -6118,9 +6232,6 @@ msgstr[1] ""
 #~ msgid "Automated"
 #~ msgstr "Automatisk"
 
-#~ msgid "Available categories"
-#~ msgstr "Tilgjengelige kategorier"
-
 #~ msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (<code>meta.datatype_description</code>), you must add it in <code>category_extras_fields.html</code>"
 #~ msgstr "Kan brukes for å vise ekstra tekst til brukeren sammen med feltet. Standardmalen viser ikke dette (<code>meta.datatype_description</code>), du må legge det til i <code>category_extras_fields.html</code>"
 
diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
index f77b8b7a0..90d483bd5 100644
--- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Dutch (Netherlands) (https://www.transifex.com/mysociety/teams/12067/nl_NL/)\n"
@@ -20,8 +20,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "en"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Overzichtsverslagen"
 
@@ -111,7 +111,7 @@ msgstr "%s vragenlijsten verzonden &ndash; %s beantwoord (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&Rechten; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> bijdragende partijen"
 
@@ -157,6 +157,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(niet verstuurd naar de gemeente)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(verstuurd naar beide)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Kies een categorie --"
@@ -205,17 +207,18 @@ msgstr ""
 "Misschien moeten er <code>MAPIT_TYPES</code> toegevoegd worden aan het configuratie bestand?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -245,7 +248,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ja</strong, ik heb een wachtwoord"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -262,7 +265,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -284,7 +287,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Voeg een contactpersoon toe"
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Voeg een nieuwe categorie toe"
@@ -317,7 +320,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Voeg een nieuwe categorie toe"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -326,8 +329,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -335,21 +338,20 @@ msgid "Add to shortlist"
 msgstr "Voeg aan favorieten toe"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Gebruiker toevoegen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Voeg toe/wijzig categoriën"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Voeg toe/wijzig beantwoordingsprioriteiten"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Voeg toe/wijzig antwoordstramien"
 
@@ -365,6 +367,12 @@ msgstr "Als dit rapport aan jouw favorieten toevoegd wordt het verwijderd van %s
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Nogmaals:"
@@ -377,8 +385,8 @@ msgstr "Melding %d gemaakt voor %s, type %s, parameters %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Melding %d inactief gemaakt (gemaakt %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Meld het me als er updates zijn"
 
@@ -390,10 +398,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Alle meldingen"
@@ -433,6 +443,11 @@ msgstr "Alle rapporten tussen %s en %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Toegewezen aan categorie %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -469,7 +484,7 @@ msgstr "Anoniem"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -482,7 +497,7 @@ msgid "Another user"
 msgstr "Andere gebruiker"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Weet je zeker dat je de bestandsoverdracht wil afbreken?"
 
@@ -491,8 +506,8 @@ msgstr "Weet je zeker dat je de bestandsoverdracht wil afbreken?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Weet je het zeker?"
@@ -503,7 +518,7 @@ msgstr "Weet je het zeker?"
 msgid "Area covered"
 msgstr "Bestreken gebied"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Gebied:"
 
@@ -517,27 +532,32 @@ msgstr "Dit is een website in opbouw! %s is false. Rapportages op deze site word
 msgid "Assign selected to role:"
 msgstr "Toegewezen aan %s"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Toewijzen aan categorie:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Toegewezen aan:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Toegewezen aan afdeling:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Beschikbare categoriën"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Toegewezen aan %s"
@@ -550,7 +570,7 @@ msgstr "Ten hoogste %d aanvragen worden per query teruggegeven. The teruggegeven
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Op dit moment kan je alleen zoeken naar meldingen en deze bekijken."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -558,11 +578,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Automatisch antwoord:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -574,12 +594,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Zet hier geen persoonlijke informatie of nummerborden van autos neer"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Wacht op controle"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Vorige"
@@ -600,14 +621,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Openbare lichamen"
 
@@ -620,11 +639,13 @@ msgstr "Openbare lichamen"
 msgid "Body"
 msgstr "Openbaar lichaam"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Openbaar lichaam:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -636,8 +657,7 @@ msgstr "Kun je onze email niet vinden? Check je spamfolder. Dat is oplossing in
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Kan je de kaart niet zien? <em>Sla deze stap over</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -653,15 +673,13 @@ msgstr "Categoriën:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -671,7 +689,7 @@ msgstr "Categorie"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Categorie veranderd van '%s' in '%s'"
 
@@ -694,6 +712,11 @@ msgstr "Categorie:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Verander Wachtwoord"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -710,7 +733,7 @@ msgstr "Verander Wachtwoord"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -720,12 +743,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -762,8 +785,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -773,11 +796,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Gesloten"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Gesloten door gemeente"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -810,13 +829,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Configuratie"
@@ -933,7 +951,7 @@ msgstr "Maak een melding"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Maak een categorie"
@@ -943,27 +961,25 @@ msgstr "Maak een categorie"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Maak een sjabloon"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Aangemaakt"
@@ -972,6 +988,17 @@ msgstr "Aangemaakt"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Aangemaakt"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Aangemaakt"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -983,10 +1010,6 @@ msgstr "Aangemaakt:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -996,19 +1019,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Klant kan niet bereikt worden"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1020,7 +1045,7 @@ msgstr "Door een afdeling behandeld binnen 5 werkdagen"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1030,7 +1055,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Verwijder sjabloon"
@@ -1052,9 +1077,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -1063,7 +1086,7 @@ msgstr "Beschrijving"
 msgid "Destination"
 msgstr "Beschrijving"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1099,7 +1122,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1107,6 +1130,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Toegewezen aan categorie %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Toegewezen aan categorie %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1141,25 +1174,25 @@ msgstr "Geen idee"
 msgid "Don't like forms?"
 msgstr "Hou je niet van formulieren?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Plaats de fotos hier om ze te <u>verzenden</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1171,7 +1204,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr "Oostwaarde/Noordwaarde"
@@ -1183,7 +1216,7 @@ msgstr "Oostwaarde/Noordwaarde"
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Bewerk"
@@ -1194,12 +1227,11 @@ msgstr "Bewerk"
 msgid "Edit body details"
 msgstr "Wijzig openbaar lichaam details"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1207,17 +1239,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1254,8 +1284,9 @@ msgstr "Redacteur"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1264,15 +1295,14 @@ msgstr "Redacteur"
 msgid "Email"
 msgstr "Email"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1292,12 +1322,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Email:"
@@ -1360,12 +1391,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Geef dichtstbijzijnde straatnaam en plaats"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Vul een dichtstbijzijnde UK postcode, of straatnaam en plaats in"
 
@@ -1392,10 +1423,10 @@ msgstr "Geef details van het probleem"
 msgid "Error"
 msgstr "Foutmelding"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1408,7 +1439,7 @@ msgstr "Voorbeeld van postcode %s"
 msgid "Examples:"
 msgstr "Voorbeelden:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1417,7 +1448,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1442,7 +1473,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1454,20 +1485,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Extra info:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1500,20 +1531,24 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr ""
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Eerste keer"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Foto's van recente meldingen dichtbij"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+msgid "Five newest reports"
+msgstr ""
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1543,7 +1578,7 @@ msgstr ""
 msgid "Flag user"
 msgstr "Gemarkeerde gebruikr"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Gemarkeerd"
@@ -1552,7 +1587,7 @@ msgstr "Gemarkeerd"
 msgid "Flagged reports and users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1560,8 +1595,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Gemarkeerd:"
 
@@ -1587,11 +1622,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1601,12 +1636,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Veelgestelde Vragen"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1628,7 +1671,7 @@ msgstr "Updates over %s problemen ontvangen"
 msgid "Get updates of problems in this %s"
 msgstr "Updates in deze %s ontvangen"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Geef me een RSS feed"
 
@@ -1644,15 +1687,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1662,7 +1705,7 @@ msgstr "Gaan"
 msgid "Going to send questionnaire?"
 msgstr "Vragenlijst versturen?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1688,6 +1731,7 @@ msgstr "Heb je al eens eerder een probleem aan de gemeente gemeld, of is dit jou
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1722,7 +1766,8 @@ msgstr "Verborgen"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1750,7 +1795,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Verberg spelden"
 
@@ -1804,11 +1849,9 @@ msgstr "Ik ben bang dat we je melding niet kunnen vinden in onze database.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1827,15 +1870,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1849,7 +1892,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1873,7 +1916,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1910,7 +1953,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1934,6 +1977,16 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "Daarnaast worden de volgende attributen, die niet onderdeel zijn van de Open311 v2 specificatie meegestuurd: agency_sent_datetime, title (ook meegestuurd als onderdeel van de description), interface_used, comment_count, requestor_name (alleen aanwezig als deze getoond mag worden op de site)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+msgid "In wards"
+msgstr ""
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1943,20 +1996,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Ongeldige has_photo waarde \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1973,16 +2026,12 @@ msgstr "Interne notities"
 msgid "Internal notes"
 msgstr "Interne notities"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Ongeldige agency_responsible waarde %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Ongeldig formaat %s gespecifieerd"
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2034,13 +2083,13 @@ msgstr "Laatste update:"
 msgid "Last&nbsp;update:"
 msgstr "Laatste update:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2057,7 +2106,7 @@ msgstr "Toon alle meldingen"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Laden..."
@@ -2095,17 +2144,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2123,19 +2173,20 @@ msgstr ""
 msgid "MAP"
 msgstr "Kaart"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2149,24 +2200,24 @@ msgstr "Kaart"
 msgid "Mark as sent"
 msgstr "Markeren als verzonden"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Bericht"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2179,7 +2230,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Vermiste jurisdiction_id"
 
@@ -2187,8 +2238,7 @@ msgstr "Vermiste jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2211,7 +2261,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2221,14 +2271,14 @@ msgstr ""
 msgid "Month"
 msgstr "Maand"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2256,9 +2306,10 @@ msgstr ""
 msgid "Name"
 msgstr "Naam"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Naam:"
@@ -2276,7 +2327,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Dichtstbijzijnde straat met naam voor lokatie op de kaart (automatisch gegenereerd via OpenStreetMap): %s%s"
 
@@ -2284,12 +2335,12 @@ msgstr "Dichtstbijzijnde straat met naam voor lokatie op de kaart (automatisch g
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Dichtstbijzijnde postcode voor lokatie op de kaart (automatisch gegenereerd): %s (%sm afstand)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Dichtstbijzijnde straat voor lokatie op de kaart (automatisch gegenereerd via Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2314,7 +2365,7 @@ msgstr ""
 msgid "New body added"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Nieuw contactpersonen voor categorie toegevoegd"
 
@@ -2327,8 +2378,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr ""
 
@@ -2336,13 +2387,13 @@ msgstr ""
 msgid "New local problems on FixMyStreet"
 msgstr "Nieuwe lokale problemen op FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2419,7 +2470,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2432,7 +2483,6 @@ msgstr "Volgende"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2441,11 +2491,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Nee"
 
@@ -2457,11 +2507,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Geen gemeente geselecteerd"
 
@@ -2477,8 +2528,8 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr ""
 
@@ -2514,15 +2565,15 @@ msgstr "Geen medestanders"
 msgid "None"
 msgstr "Geen"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2530,10 +2581,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Nog niet gemeld"
@@ -2581,12 +2636,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2594,12 +2649,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Oude status"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2608,7 +2663,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2639,7 +2694,7 @@ msgstr "Open311 initiatief website"
 msgid "Open311 specification"
 msgstr "Open311 specificatie"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2651,7 +2706,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2659,16 +2714,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2700,7 +2755,7 @@ msgstr "Pagina Niet Gevonden"
 msgid "Parent"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Alle categoriën"
@@ -2709,13 +2764,13 @@ msgstr "Alle categoriën"
 msgid "Partial"
 msgstr "Gedeeltelijk"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Wachtwoord (optioneel)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Je wachtwoord is gewijzigd"
@@ -2729,7 +2784,7 @@ msgstr "Wachtwoord (optioneel)"
 msgid "Permissions"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2737,19 +2792,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefoonnummer:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Telefoonnummer (optioneel)"
 
@@ -2757,30 +2817,26 @@ msgstr "Telefoonnummer (optioneel)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefoonnummer:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2800,9 +2856,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2811,7 +2866,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr "Foto's van recente meldingen dichtbij"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2825,6 +2880,10 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+msgid "Pin map"
+msgstr ""
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2852,27 +2911,26 @@ msgid "Please check your email address is correct"
 msgstr "Controleer of je e-mailadres klopt"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Kies een categorie"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2891,27 +2949,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Geef bericht in"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2924,16 +2982,16 @@ msgstr "Geef wachtwoord"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Geef onderwerp"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2944,20 +3002,20 @@ msgstr "Geef een geldig e-mailadres"
 msgid "Please enter a valid email address"
 msgstr "Geef een geldig e-mailadres"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Geef details"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2973,7 +3031,7 @@ msgid "Please enter your first name"
 msgstr "Geef je voornaam"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Geef je volledige naam, gemeentes hebben deze informatie nodig. Mocht je niet willen dat je naam op de site getoond wordt, haal dan de vink beneden weg."
@@ -2985,9 +3043,9 @@ msgstr "Geef je naam"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Geef je naam"
@@ -3028,19 +3086,19 @@ msgstr "Vul zoveel mogelijk details in het veld beneden in. Vermeld ook de locat
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Geef aan of je een vragenlijst wilt ontvangen"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Geef een geldig e-mailadres"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3067,24 +3125,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Let op:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Geef een reden op waarom je deze melding heropent"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Vermeld wat tekst en een foto"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Geef aan of je het probleem al eerder hebt doorgegeven aan de gemeente"
 
@@ -3092,7 +3154,7 @@ msgstr "Geef aan of je het probleem al eerder hebt doorgegeven aan de gemeente"
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3104,7 +3166,7 @@ msgstr "Kies de feed die je wilt"
 msgid "Please select the type of alert you want"
 msgstr "Kies de melding die je wilt"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Geef aan of het probleem is verholpen"
 
@@ -3112,12 +3174,12 @@ msgstr "Geef aan of het probleem is verholpen"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3125,27 +3187,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Schrijf een bericht"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Bericht"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Anoniem geplaatst bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Geplaatst door %s bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Geplaatst door <strong>%s</strong> (%s) bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Geplaatst door <strong>%s</strong> bij %s"
 
@@ -3161,7 +3219,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3169,11 +3227,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Vorige"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3189,9 +3247,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privé"
 
@@ -3240,7 +3298,7 @@ msgstr "Probleem %s verzonden naar gemeente %s"
 msgid "Problem breakdown by state"
 msgstr "Probleem verdeeld per status"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Probleem gemarkeerd als open"
 
@@ -3248,8 +3306,7 @@ msgstr "Probleem gemarkeerd als open"
 msgid "Problem state change based on survey results"
 msgstr "Probleem status gewijzigd op basis van onderzoeksresultaten"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemen"
@@ -3274,18 +3331,18 @@ msgstr "Recent gemelde problemen op FixMyStreet"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemen binnen %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemen binnen wijk %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3293,7 +3350,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3301,11 +3358,15 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3319,11 +3380,11 @@ msgstr "Geef een update"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Het is optioneel om een wachtwoord op de geven, maar hiermee is het makkelijker om in de toekomst problemen te melden, updates te plaatsen en je meldingen te beheren."
 
@@ -3331,12 +3392,12 @@ msgstr "Het is optioneel om een wachtwoord op de geven, maar hiermee is het makk
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3379,11 +3440,11 @@ msgstr "Vragenlijst ingevuld door melder"
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS feed voor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS feed voor wijk %s, %s"
 
@@ -3391,11 +3452,11 @@ msgstr "RSS feed voor wijk %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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS feed van %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS feed van %s, binnen wijk %s"
 
@@ -3403,13 +3464,13 @@ msgstr "RSS feed van %s, binnen wijk %s"
 msgid "RSS feed of nearby problems"
 msgstr "RSS feed van nabije problemen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS feed van problemen binnen %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS feed van problemen in wijk %s"
 
@@ -3423,11 +3484,11 @@ msgstr "RSS feed van recente lokale problemen"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS feed van updates voor dit probleem"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3440,7 +3501,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Ontvang een e-mail als updates worden achtergelaten bij dit probleem."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3454,7 +3515,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Recent gemelde problemen"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3467,7 +3528,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Onthoud dat FixMyStreet zich richt op het melden van fysieke problemen die opgelost kunnen worden. Als jouw probleem niet gepast is voor het melden via onze site kun je altijd direct contact opnemen met de gemeente via hun eigen website."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3479,8 +3541,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Verwijder markering"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3495,17 +3557,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Verwijder foto (kan niet ongedaan worden!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Beantwoord"
 
@@ -3513,14 +3579,14 @@ msgstr "Beantwoord"
 msgid "Report"
 msgstr "Melding"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3529,7 +3595,7 @@ msgid "Report a problem"
 msgstr "Meld een probleem"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3545,7 +3611,7 @@ msgid "Report anonymously"
 msgstr "Anoniem gemeld bij %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3581,7 +3647,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Meld, bekijk of discussier over lokale problemen"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Anoniem gemeld bij %s"
@@ -3592,7 +3658,7 @@ msgstr "Anoniem gemeld bij %s"
 msgid "Reported before"
 msgstr "Eerder gemeld"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Gemeld door %s bij %s"
@@ -3606,27 +3672,27 @@ msgstr "Gemeld door:"
 msgid "Reported in the %s category"
 msgstr "Toegewezen aan categorie %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Anoniem gemeld in de categorie %s bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Gemeld in de categorie %s door %s bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Anoniem door %s gemeld bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Gemeld door %s door %s bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Anoniem gemeld bij %s in de categorie %s door %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Gemeld door %s in de  categorie %s door %s bij %s"
 
@@ -3645,17 +3711,15 @@ msgstr "Gemeld:"
 msgid "Reporting a problem"
 msgstr "Meld een probleem"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Meldingen"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3683,15 +3747,15 @@ msgid "Reports published"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3704,7 +3768,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3757,39 +3821,45 @@ msgstr ""
 msgid "Right place?"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Wegbeheerder voor deze straat (afgeleid van wegnummer en type): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Wegbeheerder voor deze straat (uit OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Linksom roteren"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3805,20 +3875,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3835,13 +3905,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Zoek Meldingen"
 
@@ -3854,7 +3923,7 @@ msgstr "Zoek Gebruikers"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Meldingen zoeken"
 
@@ -3869,12 +3938,12 @@ msgstr "Zoek:"
 msgid "Searching found no reports."
 msgstr "Geen meldingen gevonden."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Geen gebruikers gevonden."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3884,8 +3953,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3895,7 +3963,7 @@ msgid "Select a body"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Selecteer een gebied"
@@ -3916,7 +3984,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3929,7 +3997,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3938,11 +4006,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Verzonden aan %s %s later"
 
@@ -3980,7 +4048,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3991,7 +4059,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4016,8 +4084,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4028,7 +4096,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Toon spelden"
 
@@ -4088,7 +4156,7 @@ msgid "Some photos of recent reports"
 msgstr ""
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4097,12 +4165,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4120,9 +4187,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -4132,13 +4199,13 @@ msgstr ""
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4152,11 +4219,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4165,11 +4232,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4193,18 +4260,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Staat"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4213,31 +4280,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Staat:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Statistieken"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Status"
 
@@ -4255,7 +4319,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4274,50 +4338,48 @@ msgstr "Onderwerp:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Opslaan"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Wijzigingen opslaan"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Vragenlijst opslaan"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Opgeslagen"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4329,7 +4391,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4343,20 +4405,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Samenvatting"
 
@@ -4367,14 +4428,19 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4392,13 +4458,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr ""
@@ -4419,6 +4489,10 @@ msgstr ""
 msgid "Text:"
 msgstr ""
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+msgid "Textarea"
+msgstr ""
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4448,7 +4522,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4460,27 +4534,29 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "De postcode is niet geldig."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Het probleem is gemarkeerd als verzonden."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Het probleem wordt opnieuw verzonden."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
@@ -4526,8 +4602,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4582,7 +4658,7 @@ msgstr "De foutmelding was: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "De volgende Open311 v2 attributen worden teruggegeven voor elke aanvraag: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code en service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "De volgende informatie over de dichtstbijzijnde weg kan onjuist of niet relevant zijn als het probleem zich dichtbij verschillende wegen, of dichtbij een weg zonder naam bevind."
 
@@ -4644,8 +4720,8 @@ msgstr "The gebruiker kon het probleem niet vinden op de kaart, maar het gebied
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4678,7 +4754,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4696,12 +4772,12 @@ msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Er was een probleem met je update. Probeer het later nog eens."
 
@@ -4709,7 +4785,7 @@ msgstr "Er was een probleem met je update. Probeer het later nog eens."
 msgid "There were problems with your report. Please see below."
 msgstr "Er was een probleem met je melding. Zie beneden."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Er was een probleem met je update. Zie beneden."
 
@@ -4785,10 +4861,10 @@ msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïn
 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 "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïnteresseerd zijn in deze lokatie. Negeer deze melding als je niet de juiste contactpersoon bent."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Deze informatie is verplicht"
 
@@ -4805,19 +4881,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Dit probleem is opgelost"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Dit probleem is niet opgelost"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4830,26 +4910,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Deze melding is momenteel gemarkeerd als gesloten."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Deze melding is momenteel gemarkeerd als opgelost."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Deze melding is momenteel gemarkeerd als openstaand."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4857,15 +4937,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Deze pagina bevat een door de gebruiker aangeleverde foto van het probleem."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Gespendeerde tijd (in minuten):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4889,6 +4972,10 @@ msgstr "Titel"
 msgid "Title:"
 msgstr "Titel:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4914,7 +5001,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4939,11 +5026,6 @@ msgstr ""
 msgid "Total"
 msgstr "Totaal"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4966,16 +5048,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4985,7 +5067,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5015,10 +5097,10 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5030,13 +5112,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr ""
 
@@ -5087,29 +5169,27 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr ""
 
@@ -5120,7 +5200,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5150,6 +5230,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5163,8 +5251,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5182,7 +5270,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5195,27 +5283,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Gebruikers"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5223,9 +5309,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr ""
 
@@ -5251,7 +5337,7 @@ msgstr ""
 msgid "View report on site"
 msgstr ""
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5259,7 +5345,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5277,7 +5363,7 @@ msgstr ""
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -5347,7 +5433,7 @@ msgstr ""
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5367,7 +5453,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr ""
 
@@ -5379,7 +5465,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Je bericht is moeilijk leesbaar als deze alleen uit hoofdletters bestaat of geen interpunctie heeft."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5390,12 +5475,12 @@ msgstr "Je bericht is moeilijk leesbaar als deze alleen uit hoofdletters bestaat
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Ja"
 
@@ -5408,7 +5493,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5421,7 +5506,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Je meld het volgende update als beledigend, persoonlijke informatie bevattend of gelijkend aan:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5430,7 +5515,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5460,7 +5545,7 @@ msgstr "Je kan ons helpen met het vinden van een e-mailadres voor lokale problem
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5470,7 +5555,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5478,7 +5563,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Je hebt deze vragenlijst al ingevuld. Als je vragen hebt kan je  <a href='%s'>contact opnemen</a> of <a href='%s'>je probleem bekijken</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5487,8 +5572,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5552,9 +5636,9 @@ msgstr "Jouw meldingen"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5563,13 +5647,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5598,16 +5683,16 @@ msgstr "Jouw naam"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5627,8 +5712,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5661,7 +5746,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5692,19 +5777,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5712,8 +5797,8 @@ msgstr ""
 msgid "by %s"
 msgstr "door %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "gemeente"
 
@@ -5744,6 +5829,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr "door %s verschillende gebruikers"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5761,7 +5850,7 @@ msgstr "n/b"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5843,12 +5932,12 @@ msgid "today"
 msgstr "vandaag"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5873,7 +5962,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr ""
 
@@ -5933,7 +6022,7 @@ msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5954,7 +6043,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5975,21 +6064,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6024,29 +6113,35 @@ msgid_plural "last updated %d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Gesloten door gemeente"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Ongeldige agency_responsible waarde %s"
+
+#~ msgid "Post"
+#~ msgstr "Bericht"
+
 #~ msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 #~ msgstr "<strong>N.B:</strong> Deze rapportage is verzonden opdat actie wordt ondernomen. Veranderingen worden daarom niet meer meegenomen."
 
 #~ msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 #~ msgstr "<strong>N.B:</strong>Deze rapportage is nog niet verzonden om actie te ondernemen. Veranderingen worden mogelijk niet doorgegeven."
 
-#~ msgid "Available categories"
-#~ msgstr "Beschikbare categoriën"
-
 #~ msgid "Description:"
 #~ msgstr "Beschrijving:"
 
diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 5bed755a8..3c078bb2d 100644
--- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Norwegian Nynorsk (Norway) (https://www.transifex.com/mysociety/teams/12067/nn_NO/)\n"
@@ -20,8 +20,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " og "
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s – oppsummeringsrapportar"
 
@@ -111,7 +111,7 @@ msgstr "%s spørjeskjema sendt &ndash; %s svart (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -157,6 +157,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(ikkje rapportert til administrasjonen)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(sendt til begge)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Vel ein kategori --"
@@ -202,17 +204,18 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -242,7 +245,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ja</strong>, eg har eit passord"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -259,7 +262,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -279,7 +282,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Legg til ny kategori"
@@ -312,7 +315,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Legg til ny kategori"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -321,8 +324,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -330,21 +333,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -360,6 +362,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Gjenta:"
@@ -372,8 +380,8 @@ msgstr "Varsel %d oppretta for %s, type %s, parameter %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Varsel %d kobla ut (oppretta %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Send meg varsel ved framtidige oppdateringar"
 
@@ -385,10 +393,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr ""
@@ -428,6 +438,11 @@ msgstr ""
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Rapportert i kategorien %s av %s %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -463,7 +478,7 @@ msgstr "Anonym"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -476,7 +491,7 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -485,8 +500,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -497,7 +512,7 @@ msgstr ""
 msgid "Area covered"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -510,27 +525,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Legg til ny kategori"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr ""
@@ -543,7 +563,7 @@ msgstr "På det meste vert %d førespurnader returnert i kvar spørring. Dei ret
 msgid "At the moment only searching for and looking at reports work."
 msgstr "For augneblunken går det berre an å søkja etter og å sjå på rapportar."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -551,11 +571,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -567,12 +587,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr ""
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr ""
@@ -593,14 +614,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr ""
 
@@ -613,11 +632,13 @@ msgstr ""
 msgid "Body"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr ""
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -629,8 +650,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -646,15 +666,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -664,7 +682,7 @@ msgstr "Kategori"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -687,6 +705,11 @@ msgstr "Kategori:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Byt passord"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -703,7 +726,7 @@ msgstr "Byt passord"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -713,12 +736,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -755,8 +778,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -766,11 +789,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Lukka"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "(ikkje rapportert til administrasjonen)"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -803,13 +822,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr ""
@@ -926,7 +944,7 @@ msgstr "Lag ein rapport"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Lag kategori"
@@ -936,27 +954,25 @@ msgstr "Lag kategori"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr ""
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Oppretta"
@@ -965,6 +981,17 @@ msgstr "Oppretta"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Oppretta"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Oppretta"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -976,10 +1003,6 @@ msgstr "Oppretta:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -989,19 +1012,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1013,7 +1038,7 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1023,7 +1048,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr ""
@@ -1045,9 +1070,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr ""
 
@@ -1055,7 +1078,7 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1091,7 +1114,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1099,6 +1122,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Rapportert i kategorien %s av %s %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Rapportert i kategorien %s av %s %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1133,24 +1166,24 @@ msgstr "Veit ikkje"
 msgid "Don't like forms?"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1162,7 +1195,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1174,7 +1207,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Rediger"
@@ -1185,12 +1218,11 @@ msgstr "Rediger"
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1198,17 +1230,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1245,8 +1275,9 @@ msgstr "Oppdatert av"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1255,15 +1286,14 @@ msgstr "Oppdatert av"
 msgid "Email"
 msgstr "E-post"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1283,12 +1313,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "E-post:"
@@ -1351,11 +1382,11 @@ msgstr ""
 msgid "Endpoint"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1382,10 +1413,10 @@ msgstr "Legg inn detaljar om problemet"
 msgid "Error"
 msgstr "Feil"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1398,7 +1429,7 @@ msgstr "Postnummerdøme %s"
 msgid "Examples:"
 msgstr "Døme:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1407,7 +1438,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1432,7 +1463,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1444,20 +1475,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1490,20 +1521,24 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr ""
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Første gong"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Bilete av nye problem i nærleiken"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+msgid "Five newest reports"
+msgstr ""
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1533,7 +1568,7 @@ msgstr ""
 msgid "Flag user"
 msgstr "Flagg brukar"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Flagga:"
@@ -1542,7 +1577,7 @@ msgstr "Flagga:"
 msgid "Flagged reports and users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1550,8 +1585,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Flagga:"
 
@@ -1577,11 +1612,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1591,12 +1626,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Ofte spurde spurnader"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1618,7 +1661,7 @@ msgstr ""
 msgid "Get updates of problems in this %s"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Gje meg ein RSS-straum"
 
@@ -1634,15 +1677,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1652,7 +1695,7 @@ msgstr "Hald fram"
 msgid "Going to send questionnaire?"
 msgstr "Skal spørjeskjemaet sendast?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1678,6 +1721,7 @@ msgstr "Har du rapportert eit problem til ein administrasjon før, eller er dett
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1712,7 +1756,8 @@ msgstr "Skjult"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1740,7 +1785,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Skjul nåler"
 
@@ -1794,11 +1839,9 @@ msgstr "Eg er redd vi ikkje klarte å finna problemet ditt i databasen.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1817,15 +1860,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1839,7 +1882,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1863,7 +1906,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1900,7 +1943,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1924,6 +1967,17 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (òg returnert som del av description), interface_used, comment_count, requestor_name (berre tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "bydel"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1933,20 +1987,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Feil has_photo-verdi «%s»"
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1962,16 +2016,12 @@ msgstr ""
 msgid "Internal notes"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Ugyldig agency_responsible-verdi %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Ugyldig format %s oppgjeve."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2023,13 +2073,13 @@ msgstr "Siste oppdatering:"
 msgid "Last&nbsp;update:"
 msgstr "Siste&nbsp;oppdatering:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2046,7 +2096,7 @@ msgstr "Vis alle rapporterte problem"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Lastar …"
@@ -2084,17 +2134,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2112,19 +2163,20 @@ msgstr ""
 msgid "MAP"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2138,24 +2190,24 @@ msgstr ""
 msgid "Mark as sent"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2168,7 +2220,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Manglar jurisdiction_id"
 
@@ -2176,8 +2228,7 @@ msgstr "Manglar jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2200,7 +2251,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2210,14 +2261,14 @@ msgstr ""
 msgid "Month"
 msgstr "Månad"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2245,9 +2296,10 @@ msgstr ""
 msgid "Name"
 msgstr "Namn"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Namn:"
@@ -2265,7 +2317,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Næraste namngjevne veg til nålen plassert på kartet (automatisk generert ved hjelp av OpenStreetMap): %s%s"
 
@@ -2273,12 +2325,12 @@ msgstr "Næraste namngjevne veg til nålen plassert på kartet (automatisk gener
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Næraste postnummer til nålen plassert på kartet (automatisk generert): %s (%sm unna)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2301,7 +2353,7 @@ msgstr ""
 msgid "New body added"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Ny kategorikontakt lagt til"
 
@@ -2314,8 +2366,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr ""
 
@@ -2323,13 +2375,13 @@ msgstr ""
 msgid "New local problems on FixMyStreet"
 msgstr "Nye lokale problem på FiksGataMi"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2406,7 +2458,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2419,7 +2471,6 @@ msgstr ""
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2428,11 +2479,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Nei"
 
@@ -2444,11 +2495,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Ingen administrasjon er vald"
 
@@ -2464,8 +2516,8 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr ""
 
@@ -2501,15 +2553,15 @@ msgstr ""
 msgid "None"
 msgstr "Ingen"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2517,10 +2569,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Ikkje rapportert tidlegare"
@@ -2568,12 +2624,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2581,12 +2637,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Gammal tilstand"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2595,7 +2651,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2626,7 +2682,7 @@ msgstr "Nettsida til Open311-initiativet"
 msgid "Open311 specification"
 msgstr "Open311-spesifikasjon"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2638,7 +2694,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2646,16 +2702,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2687,7 +2743,7 @@ msgstr "Fann ikkje sida"
 msgid "Parent"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Lag kategori"
@@ -2696,13 +2752,13 @@ msgstr "Lag kategori"
 msgid "Partial"
 msgstr "Delvis"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Passordet ditt har vorte endra"
@@ -2715,7 +2771,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2723,19 +2779,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefon:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr ""
 
@@ -2743,30 +2804,26 @@ msgstr ""
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefon:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2786,9 +2843,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2797,7 +2853,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr "Bilete av nye problem i nærleiken"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2811,6 +2867,10 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+msgid "Pin map"
+msgstr ""
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2838,27 +2898,26 @@ msgid "Please check your email address is correct"
 msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Vel ein kategori"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2877,27 +2936,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Ver venleg og skriv ei melding"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2910,16 +2969,16 @@ msgstr "Skriv inn eit passord"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Ver venleg og legg inn eit emne"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2930,20 +2989,20 @@ msgstr "Ver venleg og legg til ein gyldig e-post"
 msgid "Please enter a valid email address"
 msgstr "Ver venleg og legg inn e-postadressa di"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Ver venleg og legg inn opplysningar om problemet"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2959,7 +3018,7 @@ msgid "Please enter your first name"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr ""
@@ -2971,9 +3030,9 @@ msgstr "Ver venleg og legg inn namnet ditt"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Ver venleg og legg inn namnet ditt"
@@ -3016,19 +3075,19 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Ver venleg og indiker om du ynskjer å motta eit nytt spørjeskjema"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Ver venleg og legg inn e-postadressa di"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3055,24 +3114,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Merk:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Ver venleg og bidra med ei forklaring på kvifor du gjenopnar denne problemrapporten"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Ver venleg og bidra med litt tekst i tillegg til eit bilete"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Ver venleg og opplys om du har rapportert eit problem til administrasjonen din tidlegare"
 
@@ -3080,7 +3143,7 @@ msgstr "Ver venleg og opplys om du har rapportert eit problem til administrasjon
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3092,7 +3155,7 @@ msgstr "Vel den kjelda du ynskjer"
 msgid "Please select the type of alert you want"
 msgstr "Ver venleg og vel kva for ein type varsel du ynskjer"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje"
 
@@ -3100,12 +3163,12 @@ msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3113,27 +3176,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Skriv inn ei melding"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Send inn"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Publisert anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Sendt inn av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Lagt inn av <strong>%s</strong> (%s) %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Lagt inn av <strong>%s</strong> %s"
 
@@ -3149,7 +3208,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3157,11 +3216,11 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3177,9 +3236,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr ""
 
@@ -3228,7 +3287,7 @@ msgstr "Problem %s sendt til administrasjon %s"
 msgid "Problem breakdown by state"
 msgstr "Tilstandsfordeling av problem"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problem markert som ope."
 
@@ -3236,8 +3295,7 @@ msgstr "Problem markert som ope."
 msgid "Problem state change based on survey results"
 msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problem"
@@ -3262,18 +3320,18 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problem innanfor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problem innanfor %s bydel"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3281,7 +3339,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3289,11 +3347,15 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3307,11 +3369,11 @@ msgstr "Bidra med ei oppdatering"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Det er valfritt å oppgje eit passord, men om du gjer det vil det verta enklare for deg å rapportera problem, leggja inn oppdateringar og halda oversyn over rapportane dine"
 
@@ -3319,12 +3381,12 @@ msgstr "Det er valfritt å oppgje eit passord, men om du gjer det vil det verta
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3367,11 +3429,11 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren"
 msgid "RSS feed"
 msgstr "RSS-straum"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS-straum for %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS-straum for %s bydel, %s"
 
@@ -3379,11 +3441,11 @@ msgstr "RSS-straum for %s bydel, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS-straum frå %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS-straum av %s, innanfor %s bydel"
 
@@ -3391,13 +3453,13 @@ msgstr "RSS-straum av %s, innanfor %s bydel"
 msgid "RSS feed of nearby problems"
 msgstr "RSS-straum med problem i nærleiken"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS-straum for problem innanfor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS-straum for problem innanfor %s bydel"
 
@@ -3411,11 +3473,11 @@ msgstr "RSS-straum med nye lokale problem"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS-straum med oppdateringar for dette problemet"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3428,7 +3490,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Motta e-post når det er oppdateringar på dette problemet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3442,7 +3504,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Nyleg melde problem"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3455,7 +3517,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Hugs at FiksGataMi primert er laga for å rapportera fysiske problem som kan fiksast. Viss problemet ditt ikkje er eigna for å senda inn via denne tenesta, hugs at du kan kontakta administrasjonen direkte via deira eiga nettside."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3467,8 +3530,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Fjern flagg"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3483,17 +3546,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Fjern bilete (kan ikkje gjerast om!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3501,14 +3568,14 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3517,7 +3584,7 @@ msgid "Report a problem"
 msgstr "Rapporter eit problem"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3533,7 +3600,7 @@ msgid "Report anonymously"
 msgstr "Rapportert anonymt %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3569,7 +3636,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Rapporter, finn eller diskuter lokale problem"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Rapportert anonymt %s"
@@ -3580,7 +3647,7 @@ msgstr "Rapportert anonymt %s"
 msgid "Reported before"
 msgstr "Rapportert tidlegare"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Publisert av %s %s"
@@ -3594,27 +3661,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Rapportert i kategorien %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Rapportert i kategorien %s av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Publisert av %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Rapportert av %s av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Rapportert av %s i kategorien %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Rapportert av %s i kategorien %s av %s %s"
 
@@ -3633,17 +3700,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr "Legger til eit problem"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3671,15 +3736,15 @@ msgid "Reports published"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3692,7 +3757,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3745,39 +3810,45 @@ msgstr ""
 msgid "Right place?"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer og type): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3793,20 +3864,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3823,13 +3894,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Søk i rapportar"
 
@@ -3842,7 +3912,7 @@ msgstr "Søk i brukarar"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr ""
 
@@ -3857,12 +3927,12 @@ msgstr "Søk:"
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3872,8 +3942,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3883,7 +3952,7 @@ msgid "Select a body"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr ""
@@ -3904,7 +3973,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3917,7 +3986,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3926,11 +3995,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Sendt til %s %s seinare"
 
@@ -3968,7 +4037,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3979,7 +4048,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4004,8 +4073,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4016,7 +4085,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Vis nåler"
 
@@ -4076,7 +4145,7 @@ msgid "Some photos of recent reports"
 msgstr "Nokre bilete av nyleg melde problem"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Noko tekst å omsetja"
 
@@ -4085,12 +4154,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Orsak, det ser ut til å vera eit «Crown dependency»-postnummer, som vi ikkje dekkjer."
 
@@ -4108,9 +4176,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Orsak, men det oppstod eit problem når vi freista å stadfesta problemrapporten din"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Orsak, vi kunne ikkje finna den staden."
 
@@ -4120,13 +4188,13 @@ msgstr "Orsak, vi kunne ikkje finna den staden."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv på nytt."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4141,11 +4209,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4154,11 +4222,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4182,18 +4250,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Tilstand"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4202,31 +4270,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Tilstand:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Statistikk"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr ""
 
@@ -4244,7 +4309,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4263,50 +4328,48 @@ msgstr "Emne:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Send inn"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Send inn endringar"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Send inn spørjeskjema"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4318,7 +4381,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4332,20 +4395,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Oppsummering"
 
@@ -4356,14 +4418,19 @@ msgstr "Oppsummeringsrapportar"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4381,13 +4448,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Tekst"
@@ -4408,6 +4479,11 @@ msgstr "Tekst-utgåve"
 msgid "Text:"
 msgstr "Tekst:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Tekst"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4440,7 +4516,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Takk, glad for å høyra at problemet er løyst! Vi vil gjerne spørja deg om du har rapportert eit problem til ein administrasjon tidlegare?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4452,27 +4528,29 @@ msgstr "Biletet ser ikkje ut til å ha vorte lasta opp riktig (%s), prøv på ny
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Det postnummeret vart ikkje gjenkjent, orsak."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Det problemet vil no sendast på nytt."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Den rapporten har vorte fjerna frå FiksGataMi."
 
@@ -4518,8 +4596,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4573,7 +4651,7 @@ msgstr "Feilen var: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "Dei følgjande Open311 v2-attributtene vert returnerte for kvar førespurnad: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code og service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "Følgjande informasjon om næraste veg kan vera unøyaktig eller irrelevant, viss problemet er nær fleire vegar eller nær ein veg utan namn registrert i OpenStreetmap."
 
@@ -4635,8 +4713,8 @@ msgstr "Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4669,7 +4747,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4687,12 +4765,12 @@ msgstr ""
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen."
 
@@ -4700,7 +4778,7 @@ msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen."
 msgid "There were problems with your report. Please see below."
 msgstr "Det var problem med rapporten din. Ver venleg og sjå under."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under."
 
@@ -4776,10 +4854,10 @@ msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden f
 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 "Denne e-posten er sendt til fleire administrasjonar som dekkjer staden for problemet, sidan den valde kategorien er tilgjengeleg for desse. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Denne informasjonen er påkravd"
 
@@ -4796,19 +4874,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Dette problemet er løyst"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Dette problemet har ikkje vorte løyst"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4821,26 +4903,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Denne rapporten er for tida markert som lukka."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Denne rapporten er for tida markert som fiksa."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Denne rapporten er for tida markert som open."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4848,15 +4930,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4880,6 +4965,10 @@ msgstr "Tittel"
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4905,7 +4994,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4930,11 +5019,6 @@ msgstr ""
 msgid "Total"
 msgstr "Totalt"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4957,16 +5041,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4976,7 +5060,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5006,10 +5090,10 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "Ukjend problem-ID"
 
@@ -5021,13 +5105,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr ""
 
@@ -5078,29 +5162,27 @@ msgstr "Ei oppdatering gjenopna problemet"
 msgid "Update statuses"
 msgstr "Oppdater tilstanden"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Oppdatert!"
 
@@ -5111,7 +5193,7 @@ msgstr "Oppdatert!"
 msgid "Updates"
 msgstr "Oppdateringar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5141,6 +5223,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5154,8 +5244,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5173,7 +5263,7 @@ msgid "User flagged"
 msgstr "Brukar flagga"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5186,27 +5276,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Brukarar"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5214,9 +5302,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Verdi oppdatert"
 
@@ -5242,7 +5330,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Sjå rapport på nettstaden"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5250,7 +5338,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5268,7 +5356,7 @@ msgstr "Ser på eit problem"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Bydelar innanfor denne administrasjonen"
 
@@ -5338,7 +5426,7 @@ msgstr "Når sendt"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5358,7 +5446,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Kunne du tenkja deg å motta ein ny førespurnad om 4 veker, som minner deg om å sjekka status?"
 
@@ -5370,7 +5458,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Når du skriv meldinga di med berre store bokstavar vert ho vanskeleg å lesa. Det same gjeld manglande tegnsetting."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5381,12 +5468,12 @@ msgstr "Når du skriv meldinga di med berre store bokstavar vert ho vanskeleg å
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Ja"
 
@@ -5399,7 +5486,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5412,7 +5499,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Du rapporterer at følgjande oppdatering er støytande, inneheld personleg informasjon, eller liknande:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5421,7 +5508,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5451,7 +5538,7 @@ msgstr "Du kan hjelpa oss ved å finna ein kontakt-e-post for lokale problem i %
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5461,7 +5548,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5469,7 +5556,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Du har allereie svart på dette spørjeskjemaet. Viss du har spurnader, ver venleg og <a href='%s'>ta kontakt</a>, eller <a href='%s'>sjå på problemet ditt</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5478,8 +5565,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5543,9 +5629,9 @@ msgstr "Rapportane dine"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5554,13 +5640,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5589,16 +5676,16 @@ msgstr ""
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5618,8 +5705,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5652,7 +5739,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5683,19 +5770,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5703,8 +5790,8 @@ msgstr ""
 msgid "by %s"
 msgstr "av %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "administrasjon"
 
@@ -5735,6 +5822,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr "frå %s ulike brukarar"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5752,7 +5843,7 @@ msgstr "i/t"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5835,12 +5926,12 @@ msgid "today"
 msgstr "i dag"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5865,7 +5956,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "bydel"
 
@@ -5925,7 +6016,7 @@ msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5946,7 +6037,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5967,21 +6058,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> løyst siste månad"
 msgstr[1] "<big>%s</big> løyst siste månad"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> rapport siste veke"
 msgstr[1] "<big>%s</big> rapportar siste veke"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> rapport nyleg"
 msgstr[1] "<big>%s</big> rapportar nyleg"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6016,20 +6107,29 @@ msgid_plural "last updated %d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "(ikkje rapportert til administrasjonen)"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Ugyldig agency_responsible-verdi %s"
+
+#~ msgid "Post"
+#~ msgstr "Send inn"
+
 #~ msgid "There was a problem with your email/password combination. Please try again."
 #~ msgstr "Det var problem med e-post/passord-kombinasjonen din. Ver venleg og prøv igjen."
 
diff --git a/locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po
index c6397bd58..af33d46fd 100644
--- a/locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -4,15 +4,17 @@
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
 # Translators:
-# mySociety <transifex@mysociety.org>, 2019
+# mySociety <transifex@mysociety.org>, 2020
+# Wrobel Wroblasty <qefkjws17237x@gmail.com>, 2020
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
-"PO-Revision-Date: 2019-04-29 18:03+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
+"PO-Revision-Date: 2020-03-05 09:59+0000\n"
+"Last-Translator: Wrobel Wroblasty <qefkjws17237x@gmail.com>, 2020\n"
 "Language-Team: Polish (Poland) (https://www.transifex.com/mysociety/teams/12067/pl_PL/)\n"
 "Language: pl_PL\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +22,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
-msgstr ""
+msgstr "i"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:52
@@ -35,19 +37,19 @@ msgstr ""
 #: templates/web/base/report/new/top_message_some.html:10
 #: templates/web/base/report/new/top_message_some.html:12
 msgid " or "
-msgstr ""
+msgstr "lub"
 
 #: templates/web/base/report/inspect/_extra_details_field.html:5
 msgid "%d characters maximum"
-msgstr ""
+msgstr "%d maksymalnych znaków"
 
 #: templates/web/base/admin/bodies/edit-league.html:12
 msgid "%d edits by %s"
-msgstr ""
+msgstr "%dedytowane przez %s"
 
 #: templates/web/base/pagination.html:7
 msgid "%d to %d of %d"
-msgstr ""
+msgstr "%ddo %d z %d"
 
 #: templates/web/base/admin/users/import.html:42
 msgid "%d users already existed"
@@ -56,22 +58,22 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr ""
 
 #. ("%s here is the site name")
 #: templates/web/base/admin/navigation.html:3
 msgid "%s admin:"
-msgstr ""
+msgstr "%s administrator:"
 
 #: templates/web/base/status/stats.html:26
 msgid "%s bodies"
-msgstr ""
+msgstr "%sciała"
 
 #: templates/web/base/status/stats.html:24
 msgid "%s confirmed alerts, %s unconfirmed"
-msgstr ""
+msgstr "%s potwierdzone alerty, %s niepotwierdzone"
 
 #: templates/web/base/status/stats.html:27
 #: templates/web/zurich/admin/index.html:6
@@ -101,7 +103,7 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:166
 #: templates/web/base/dashboard/index.html:169
 msgid "%s opened, %s closed, %s fixed"
-msgstr ""
+msgstr "%s otwarte, %s zamknięte, %s naprawione"
 
 #: templates/web/base/status/stats.html:25
 msgid "%s questionnaires sent &ndash; %s answered (%s%%)"
@@ -109,11 +111,11 @@ msgstr ""
 
 #: templates/web/base/report/_council_sent_info.html:8
 msgid "%s ref:&nbsp;%s"
-msgstr ""
+msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
-msgstr ""
+msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> współtwórcy"
 
 #: templates/web/zurich/report/new/fill_in_details_form.html:21
 msgid "(Defect &amp; location of defect)"
@@ -122,12 +124,12 @@ msgstr ""
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/reports/edit.html:78
 msgid "(No name)"
-msgstr ""
+msgstr "(Nie ma nazwy)"
 
 #: templates/web/zurich/admin/report_edit-sdm.html:57
 #: templates/web/zurich/admin/reports/edit.html:85
 msgid "(No phone number)"
-msgstr ""
+msgstr "(Nie ma numeru telefonu)"
 
 #: templates/web/base/admin/states/index.html:95
 msgid "(a-z and space only)"
@@ -135,7 +137,7 @@ msgstr ""
 
 #: templates/web/zurich/report/_item.html:21
 msgid "(closed)"
-msgstr ""
+msgstr "(zamknięte)"
 
 #: templates/web/base/alert/_list_rss_local.html:8
 msgid "(covers roughly 200,000 people)"
@@ -143,7 +145,7 @@ msgstr ""
 
 #: templates/web/zurich/report/_item.html:19
 msgid "(fixed)"
-msgstr ""
+msgstr "(naprawione)"
 
 #: templates/web/base/around/intro.html:2
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
@@ -157,14 +159,16 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
-msgstr ""
+msgstr "(opcjonalnie)"
 
 #: templates/web/base/report/_item_small.html:28
 msgid "(sent to all)"
-msgstr ""
+msgstr "(wyślij do wszystkich)"
 
 #: templates/web/base/report/_item_small.html:29
 msgid "(sent to both)"
@@ -175,19 +179,19 @@ msgstr ""
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
-msgstr ""
+msgstr "-- Wybierz Kategorie --"
 
 #: templates/web/base/report/new/category_extras_fields.html:19
 msgid "-- Pick an option --"
-msgstr ""
+msgstr "-- Wybierz jakąś opcję --"
 
 #: templates/web/base/contact/enquiry/index.html:35
 msgid "-- Please select --"
-msgstr ""
+msgstr "-- Proszę wybrać --"
 
 #: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
@@ -202,19 +206,20 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
-msgstr ""
+msgstr "<span>%s</span>zapisane."
 
 #: templates/web/base/status/stats.html:17
 #: templates/web/zurich/admin/index.html:4
@@ -223,7 +228,7 @@ msgstr ""
 
 #: templates/web/base/report/form/user_loggedout_by_email_heading.html:11
 msgid "<strong>No</strong> Let me confirm my report by email"
-msgstr ""
+msgstr "<strong>Nie</strong> Poinformuj mnie o moim zgłoszeniu przez maila "
 
 #: templates/web/base/report/form/user_loggedout_by_email_heading.html:5
 msgid "<strong>No</strong> Let me confirm my report by email/text"
@@ -235,14 +240,14 @@ msgstr ""
 
 #: templates/web/base/report/form/user_loggedout_by_email_heading.html:3
 msgid "<strong>No</strong> Let me confirm my update by email/text"
-msgstr ""
+msgstr "<strong>Nie</strong>Daj mi potwierdzić moją aktualizacje przez emaila"
 
 #: templates/web/base/report/form/user_loggedout_password.html:4
 msgid "<strong>Yes</strong> I have a password"
-msgstr ""
+msgstr "<strong>Tak</strong>Posiadam hasło"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -252,20 +257,20 @@ msgstr ""
 
 #: templates/web/base/report/new/form_user.html:8
 msgid "About the problem"
-msgstr ""
+msgstr "O problemie"
 
 #: perllib/FixMyStreet/App/Controller/Root.pm:128
 msgid "Access denied"
-msgstr ""
+msgstr "Dostęp odrzucony"
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
 #: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #: templates/web/base/admin/bodies/form.html:3
 #: templates/web/base/admin/bodies/form.html:4
@@ -279,7 +284,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 msgid "Add another parent category"
 msgstr ""
 
@@ -287,12 +292,12 @@ msgstr ""
 #: templates/web/base/admin/bodies/index.html:78
 #: templates/web/zurich/admin/bodies/form.html:63
 msgid "Add body"
-msgstr ""
+msgstr "Dodaj ciało"
 
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:7
 msgid "Add email address"
-msgstr ""
+msgstr "Dodaj adres email"
 
 #: templates/web/base/admin/reportextrafields/index.html:24
 msgid "Add extra fields"
@@ -309,19 +314,19 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:146
 #: templates/web/zurich/admin/bodies/body.html:33
 msgid "Add new category"
-msgstr ""
+msgstr "Dodaj nową kategorie "
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
-msgstr ""
+msgstr "Dodaj opcje"
 
 #: templates/web/base/auth/change_phone.html:2
 #: templates/web/base/auth/change_phone.html:7
 msgid "Add phone number"
-msgstr ""
+msgstr "Dodaj numer telefonu"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -329,27 +334,26 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
-msgstr ""
+msgstr "Dodaj użytkownika"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
-msgstr ""
+msgstr "Dodaj/edytuj kategorię problemu"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
 #: templates/web/base/my/my.html:119
 msgid "Added %s"
-msgstr ""
+msgstr "Dodano %s"
 
 #: templates/web/base/report/_main.html:158
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
@@ -357,11 +361,17 @@ msgstr ""
 
 #: templates/web/base/main_nav_items.html:31
 msgid "Admin"
+msgstr "Administrator"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
-msgstr ""
+msgstr "Znów:"
 
 #: templates/web/base/admin/timeline.html:35
 msgid "Alert %d created for %s, type %s, parameters %s / %s"
@@ -371,26 +381,28 @@ msgstr ""
 msgid "Alert %d disabled (created %s)"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:96
 msgid "Alerts:"
-msgstr ""
+msgstr "Alerty:"
 
 #: templates/web/base/dashboard/index.html:40
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
-msgstr ""
+msgstr "Wszystko"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
-msgstr ""
+msgstr "Wszystkie Zgłoszenia"
 
 #: templates/web/zurich/admin/stats/index.html:47
 msgid "All Reports as CSV"
@@ -400,7 +412,7 @@ msgstr ""
 #: templates/web/base/admin/responsepriorities/index.html:26
 #: templates/web/base/admin/templates/view.html:19
 msgid "All categories"
-msgstr ""
+msgstr "Wszystkie kategorie"
 
 #: templates/web/base/admin/reportextrafields/edit.html:26
 msgid "All cobrands"
@@ -408,7 +420,7 @@ msgstr ""
 
 #: templates/web/base/admin/reportextrafields/edit.html:47
 msgid "All languages"
-msgstr ""
+msgstr "Wszystkie języki"
 
 #: templates/web/base/navigation/_all_reports.html:0
 #: templates/web/base/navigation/_all_reports.html:12
@@ -417,14 +429,18 @@ msgstr ""
 #: templates/web/zurich/footer.html:20
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
-msgstr ""
+msgstr "Wszystkie zgłoszenia"
 
 #: templates/web/zurich/admin/stats/index.html:45
 msgid "All reports between %s and %s"
-msgstr ""
+msgstr "Wszystkie reporty "
 
 #: templates/web/base/reports/index.html:25
 msgid "All time"
+msgstr "Cały czas"
+
+#: templates/web/base/admin/bodies/contact-form.html:81
+msgid "Allow anonymous reports on this category"
 msgstr ""
 
 #: templates/web/base/report/new/duplicate_suggestions.html:7
@@ -455,40 +471,40 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:33
 #: templates/web/base/admin/problem_row.html:20
 msgid "Anonymous"
-msgstr ""
+msgstr "Anonimowy"
 
 #: templates/web/base/report/new/form_user_loggedin.html:22
 #: templates/web/base/report/update/form_user_loggedin.html:19
 msgid "Anonymous user"
-msgstr ""
+msgstr "Anonimowy użytkownik"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
 msgid "Anonymous:"
-msgstr ""
+msgstr "Anonimowy:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:25
 #: templates/web/base/report/update/form_user_loggedin.html:16
 msgid "Another user"
-msgstr ""
+msgstr "Inny użytkownik"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
-msgstr ""
+msgstr "Czy jesteś pewien, chcesz cofnąć wgrywanie?"
 
 #. ("JS")
 #: templates/web/base/admin/manifesttheme/form.html:62
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
-msgstr ""
+msgstr "Czy jesteś pewien?"
 
 #: templates/web/base/admin/bodies/body.html:21
 #: templates/web/base/admin/bodies/form.html:77
@@ -496,9 +512,9 @@ msgstr ""
 msgid "Area covered"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
-msgstr ""
+msgstr "Arena:"
 
 #: templates/web/base/admin/bodies/body.html:65
 #: templates/web/base/admin/bodies/index.html:19
@@ -509,27 +525,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Wszystkie kategorie"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr ""
@@ -542,7 +563,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -550,11 +571,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -566,19 +587,20 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr ""
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
-msgstr ""
+msgstr "Cofnij"
 
 #: templates/web/base/report/_main.html:8
 msgid "Back to all reports"
-msgstr ""
+msgstr "Cofnij do wszystkich zgłoszeń"
 
 #: templates/web/base/admin/manifesttheme/index.html:9
 msgid "Background Colour"
@@ -586,20 +608,18 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
 msgid "Ban user"
-msgstr ""
+msgstr "Blokada użytkownika"
 
 #: templates/web/base/admin/extra-metadata-item.html:35
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr ""
 
@@ -610,15 +630,17 @@ msgstr ""
 #: templates/web/base/admin/users/import.html:48
 #: templates/web/base/admin/users/index.html:45
 msgid "Body"
-msgstr ""
+msgstr "Ciało"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
-msgstr ""
+msgstr "Ciało:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
-msgstr ""
+msgstr "Plik CSV"
 
 #: templates/web/base/auth/token.html:27 templates/web/base/email_sent.html:20
 msgid "Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time."
@@ -626,46 +648,43 @@ msgstr ""
 
 #: templates/web/base/around/_report_banner.html:5
 msgid "Can't see the map? <em>Skip this step</em>"
-msgstr ""
+msgstr "Nie możesz zobaczyć mapy? <em>Pomiń ten krok</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
-msgstr ""
+msgstr "Kategorie"
 
 #: templates/web/base/admin/category-checkboxes.html:26
 #: templates/web/base/admin/category-multiselect.html:2
 #: templates/web/base/admin/responsepriorities/edit.html:31
 msgid "Categories:"
-msgstr ""
+msgstr "Kategorie:"
 
 #: templates/web/base/admin/bodies/_category_field.html:12
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
-msgstr ""
+msgstr "Kategoria"
 
 #: templates/web/base/dashboard/index.html:104
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr ""
+msgstr "Kategoria zmieniona z '%s' do '%s'"
 
 #: templates/web/base/admin/stats/fix_rate.html:1
 #: templates/web/base/admin/stats/index.html:14
@@ -686,23 +705,28 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Wybierz hasło"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
-msgstr ""
+msgstr "Wybierz adres email"
 
 #: templates/web/base/auth/change_password.html:2
 #: templates/web/base/auth/change_password.html:5
 #: templates/web/base/my/my.html:64 templates/web/base/my/my.html:68
 msgid "Change password"
-msgstr ""
+msgstr "Wybierz hasło"
 
 #: templates/web/base/auth/change_phone.html:2
 #: templates/web/base/auth/change_phone.html:3
 msgid "Change phone number"
-msgstr ""
+msgstr "Wybierz numer telefonu"
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -712,34 +736,34 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
-msgstr ""
+msgstr "Wybierz inne"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
 #: templates/web/base/around/_report_banner.html:2
 msgid "Click map to report a problem"
-msgstr ""
+msgstr "Kliknij mapę aby zgłosić problem"
 
 #: templates/web/base/email_sent.html:13
 msgid "Click the link in our confirmation email to activate your alert."
-msgstr ""
+msgstr "Kliknij link w wiadomości na mailu aby aktywować swój alert."
 
 #: templates/web/base/email_sent.html:9
 msgid "Click the link in our confirmation email to publish your problem."
-msgstr ""
+msgstr "Kliknij link w wiadomości na mailu aby opublikować swój problem."
 
 #: templates/web/base/email_sent.html:11
 msgid "Click the link in our confirmation email to publish your update."
-msgstr ""
+msgstr "Kliknij link w wiadomości na mailu aby opublikować swoją aktualizację."
 
 #: templates/web/base/auth/token.html:23
 msgid "Click the link in our confirmation email to sign in."
-msgstr ""
+msgstr "Kliknij link w wiadomości na mailu aby się zarejestrować."
 
 #: templates/web/base/auth/token.html:20
 msgid "Click the link in that email to sign in."
@@ -751,11 +775,11 @@ msgstr ""
 
 #: templates/web/base/report/new/duplicate_suggestions.html:6
 msgid "Close"
-msgstr ""
+msgstr "Zamknij"
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -763,13 +787,9 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:118
 #: templates/web/zurich/admin/stats/index.html:52
 msgid "Closed"
-msgstr ""
+msgstr "Zamknięte"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr ""
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -799,28 +819,27 @@ msgstr ""
 #: templates/web/base/auth/2fa/form.html:17
 #: templates/web/base/auth/smsform.html:24
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracja"
 
 #: templates/web/base/admin/bodies/body.html:78
 msgid "Confirm"
-msgstr ""
+msgstr "Potwierdź"
 
 #: templates/web/base/auth/2fa/form.html:1
 #: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1
 msgid "Confirm account"
-msgstr ""
+msgstr "Potwierdź konto"
 
 #: templates/web/base/report/form/user_loggedout_password.html:26
 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated."
@@ -839,13 +858,13 @@ msgstr ""
 #: templates/web/zurich/admin/bodies/contact-form.html:39
 #: templates/web/zurich/admin/stats/index.html:61
 msgid "Confirmed"
-msgstr ""
+msgstr "Potwierdzone"
 
 #: templates/web/base/admin/list_updates.html:40
 #: templates/web/base/admin/problem_row.html:36
 #: templates/web/base/admin/reports/edit.html:79
 msgid "Confirmed:"
-msgstr ""
+msgstr "Potwierdzone:"
 
 #. ("%s is the site name")
 #: templates/web/base/about/_sidebar.html:6
@@ -856,21 +875,21 @@ msgstr ""
 #: templates/web/base/contact/index.html:5
 #: templates/web/base/contact/submit.html:1
 msgid "Contact Us"
-msgstr ""
+msgstr "Skontaktuj Się Z Nami"
 
 #: templates/web/base/contact/index.html:18
 msgid "Contact the team"
-msgstr ""
+msgstr "Skontaktuj się z zespołem"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:62
 #: templates/web/base/report/form/user.html:8
 msgid "Continue"
-msgstr ""
+msgstr "Kontynuuj"
 
 #: templates/web/base/report/new/duplicate_suggestions.html:17
 msgid "Continue – report a new problem"
-msgstr ""
+msgstr "Kontynuuj -- zgłoś nowy problem"
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:151
 msgid "Convert location from Easting/Northing"
@@ -879,7 +898,7 @@ msgstr ""
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:723
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:753
 msgid "Could not find user"
-msgstr ""
+msgstr "Nie można znaleźć użytkownika"
 
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:55
@@ -915,69 +934,74 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:32
 #: templates/web/base/admin/states/index.html:114
 msgid "Create"
-msgstr ""
+msgstr "Stwórz"
 
 #: templates/web/base/email_sent.html:1
 msgid "Create a report"
-msgstr ""
+msgstr "Stwórz zgłoszenie"
 
 #: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:7
 msgid "Create an account"
-msgstr ""
+msgstr "Stwórz konto"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
-msgstr ""
+msgstr "Stwórz kategorie"
 
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/responsepriorities/index.html:41
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr ""
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
-msgstr ""
+msgstr "Stworzone"
 
 #: templates/web/base/admin/users/import.html:20
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Stworzone"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Stworzone"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
 #: templates/web/zurich/admin/update_edit.html:29
 msgid "Created:"
-msgstr ""
+msgstr "Stworzone:"
 
 #: templates/web/base/auth/change_password.html:40
 msgid "Current password:"
-msgstr ""
-
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
+msgstr "Obecne hasło:"
 
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
@@ -988,19 +1012,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1012,17 +1038,17 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/users/alerts.html:15
 msgid "Delete"
-msgstr ""
+msgstr "Usuń"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr ""
@@ -1035,7 +1061,7 @@ msgstr ""
 #: templates/web/base/admin/bodies/index.html:31
 #: templates/web/zurich/admin/bodies/contact-form.html:41
 msgid "Deleted"
-msgstr ""
+msgstr "Usunięte"
 
 #: templates/web/base/report/_main.html:125
 #: templates/web/base/report/update.html:56
@@ -1043,17 +1069,15 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #: templates/web/base/admin/bodies/contact-form.html:7
 msgid "Destination"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1089,7 +1113,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1097,6 +1121,14 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+msgid "Disable reopening of reports in this category"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+msgid "Disable updates on reports in this category"
+msgstr ""
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1131,24 +1163,24 @@ msgstr ""
 msgid "Don't like forms?"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1160,7 +1192,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1172,7 +1204,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr ""
@@ -1183,12 +1215,11 @@ msgstr ""
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1196,17 +1227,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1235,7 +1264,7 @@ msgstr ""
 
 #: templates/web/base/admin/bodies/category.html:31
 msgid "Editor"
-msgstr ""
+msgstr "Edytor"
 
 #: templates/web/base/admin/bodies/category.html:29
 #: templates/web/base/admin/bodies/index.html:27
@@ -1243,27 +1272,27 @@ msgstr ""
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
 #: templates/web/zurich/auth/general.html:14
 #: templates/web/zurich/auth/general.html:37
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
-msgstr ""
+msgstr "Adres email"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
-msgstr ""
+msgstr "Adres email (opcjonalnie)"
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1281,19 +1310,20 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
-msgstr ""
+msgstr "Weryfikacja emaila:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
-msgstr ""
+msgstr "Email:"
 
 #: templates/web/base/admin/users/alerts.html:13
 msgid "Enable"
-msgstr ""
+msgstr "Włącz"
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:156
 #: templates/web/base/admin/bodies/open311-form-fields.html:157
@@ -1349,12 +1379,11 @@ msgstr ""
 msgid "Endpoint"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
-#, fuzzy
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
-msgstr "Wpisz nazwę ulicy lub dzielnicy"
+msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1379,12 +1408,12 @@ msgstr "Opisz problem"
 #: templates/web/base/tokens/error.html:1
 #: templates/web/base/tokens/error.html:5
 msgid "Error"
-msgstr ""
+msgstr "Błąd"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1397,7 +1426,7 @@ msgstr ""
 msgid "Examples:"
 msgstr ""
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1406,7 +1435,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1431,7 +1460,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1443,20 +1472,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1489,20 +1518,24 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr ""
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+msgid "Five most recent commented reports"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nowe zgłoszenia"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1532,7 +1565,7 @@ msgstr ""
 msgid "Flag user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr ""
@@ -1541,7 +1574,7 @@ msgstr ""
 msgid "Flagged reports and users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1549,8 +1582,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr ""
 
@@ -1576,11 +1609,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1590,12 +1623,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1617,7 +1658,7 @@ msgstr ""
 msgid "Get updates of problems in this %s"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr ""
 
@@ -1633,25 +1674,25 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
-msgstr ""
+msgstr "Idź"
 
 #: templates/web/base/admin/reports/edit.html:101
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1677,6 +1718,7 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1698,20 +1740,21 @@ msgstr ""
 
 #: templates/web/zurich/footer.html:11
 msgid "Hi %s"
-msgstr ""
+msgstr "Cześć %s"
 
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:65
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/stats/index.html:53
 #: templates/web/zurich/admin/update_edit.html:18
 msgid "Hidden"
-msgstr ""
+msgstr "Ukryte"
 
 #: templates/web/base/admin/extra-metadata-item.html:46
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1739,7 +1782,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr ""
 
@@ -1754,15 +1797,15 @@ msgstr ""
 #: templates/web/base/report/_report_meta_info.html:3
 #: templates/web/base/report/_update_state.html:16
 msgid "Hide your name?"
-msgstr ""
+msgstr "Ukryć twoją nazwę?"
 
 #: templates/web/base/admin/bodies/category.html:25
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #: templates/web/base/around/display_location.html:78
 msgid "Home"
-msgstr ""
+msgstr "Główna"
 
 #: templates/web/base/index-steps.html:1
 msgid "How to report a problem"
@@ -1776,12 +1819,12 @@ msgstr ""
 #: templates/web/base/tokens/confirm_problem.html:46
 #: templates/web/base/tokens/confirm_problem.html:51
 msgid "I just reported a problem on @fixmystreet"
-msgstr ""
+msgstr "Po prostu zgłosiłem problem na @fixmystreet"
 
 #: templates/web/base/tokens/confirm_update.html:20
 #: templates/web/base/tokens/confirm_update.html:25
 msgid "I just updated a problem on @fixmystreet"
-msgstr ""
+msgstr "Po prostu zaktualizowałem problem na @fixmystreet"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:86
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
@@ -1792,11 +1835,9 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr ""
 
@@ -1815,15 +1856,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1837,7 +1878,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1861,7 +1902,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1898,7 +1939,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1922,6 +1963,16 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+msgid "In wards"
+msgstr ""
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1931,20 +1982,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1960,16 +2011,12 @@ msgstr ""
 msgid "Internal notes"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -1989,20 +2036,20 @@ msgstr ""
 #: templates/web/base/admin/bodies/_translations.html:6
 #: templates/web/base/admin/reportextrafields/edit.html:45
 msgid "Language"
-msgstr ""
+msgstr "Język"
 
 #: templates/web/base/admin/reportextrafields/index.html:8
 msgid "Languages"
-msgstr ""
+msgstr "Języki"
 
 #: templates/web/base/reports/index.html:40
 msgid "Last 7 days"
-msgstr ""
+msgstr "Ostatnie 7 dni"
 
 #: templates/web/base/admin/bodies/body.html:75
 #: templates/web/zurich/admin/bodies/body.html:16
 msgid "Last editor"
-msgstr ""
+msgstr "Ostatni edytor"
 
 #: templates/web/base/admin/reports/edit.html:92
 msgid "Last failure:"
@@ -2020,13 +2067,13 @@ msgstr ""
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2041,12 +2088,12 @@ msgstr ""
 
 #: templates/web/base/around/on_map_list_items.html:18
 msgid "Loading reports…"
-msgstr ""
+msgstr "Ładowanie zgłoszeń..."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
-msgstr ""
+msgstr "Ładowanie..."
 
 #: templates/web/base/alert/choose.html:2
 #: templates/web/base/alert/choose.html:4 templates/web/base/alert/index.html:2
@@ -2073,32 +2120,33 @@ msgstr "Oznacz problem na mapie"
 #: templates/web/base/auth/general.html:29
 #: templates/web/base/report/form/user.html:13
 msgid "Log in with Facebook"
-msgstr ""
+msgstr "Zaloguj przez Facebook"
 
 #: templates/web/base/auth/general.html:44
 #: templates/web/base/report/form/user.html:24
 msgid "Log in with Twitter"
-msgstr ""
+msgstr "Zaloguj przez Twitter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
-msgstr ""
+msgstr "Zaloguj przez email"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
 #: templates/web/base/auth/general.html:36
 #: templates/web/base/report/form/user.html:18
 msgid "Login with %s"
-msgstr ""
+msgstr "Zaloguj przez %s"
 
 #: templates/web/base/dashboard/index.html:83
 msgid "Look up"
@@ -2107,21 +2155,22 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:63
 msgid "MAP"
-msgstr ""
+msgstr "MAPA"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2129,30 +2178,30 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/js/translation_strings.html:65
 msgid "Map"
-msgstr ""
+msgstr "Mapa"
 
 #: templates/web/base/admin/reports/edit.html:87
 msgid "Mark as sent"
-msgstr ""
+msgstr "Oznacz jako przeczytane"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
-msgstr ""
+msgstr "Wiadomość"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2165,7 +2214,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -2173,8 +2222,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2197,7 +2245,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2205,16 +2253,16 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:103
 #: templates/web/zurich/admin/stats/index.html:9
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2242,12 +2290,13 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
-msgstr ""
+msgstr "Nazwa:"
 
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:20
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:26
@@ -2262,7 +2311,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -2270,12 +2319,12 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2298,21 +2347,21 @@ msgstr ""
 msgid "New body added"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr ""
 
 #: templates/web/base/auth/change_email.html:39
 msgid "New email address:"
-msgstr ""
+msgstr "Nowy adres email:"
 
 #: templates/web/base/admin/extra-metadata-item.html:14
 #: templates/web/base/admin/extra-metadata-item.html:20
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr ""
 
@@ -2320,15 +2369,15 @@ msgstr ""
 msgid "New local problems on FixMyStreet"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
-msgstr ""
+msgstr "Nowe hasło:"
 
 #: templates/web/base/auth/change_phone.html:38
 msgid "New phone number:"
@@ -2385,7 +2434,7 @@ msgstr ""
 
 #: templates/web/zurich/admin/index-sdm.html:4
 msgid "New reports"
-msgstr ""
+msgstr "Nowe zgłoszenia"
 
 #: templates/web/base/admin/states/index.html:91
 #: templates/web/base/admin/stats/questionnaire.html:24
@@ -2403,20 +2452,19 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
 
 #: templates/web/base/pagination.html:10
 msgid "Next"
-msgstr ""
+msgstr "Następne"
 
 #: templates/web/base/report/form/user.html:5
 msgid "Next:"
-msgstr ""
+msgstr "Następne:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2425,13 +2473,13 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
-msgstr ""
+msgstr "Nie"
 
 #: templates/web/base/admin/category-checkboxes.html:31
 msgid "No Group"
@@ -2441,11 +2489,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr ""
 
@@ -2461,8 +2510,8 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr ""
 
@@ -2498,15 +2547,15 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2514,10 +2563,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr ""
@@ -2565,12 +2618,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2578,12 +2631,12 @@ msgstr ""
 msgid "Old state"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2592,7 +2645,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2623,7 +2676,7 @@ msgstr ""
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2635,7 +2688,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2643,16 +2696,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2684,7 +2737,7 @@ msgstr ""
 msgid "Parent"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 msgid "Parent categories"
 msgstr ""
 
@@ -2692,13 +2745,13 @@ msgstr ""
 msgid "Partial"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
 msgstr ""
 
@@ -2710,7 +2763,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2718,19 +2771,23 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+msgid "Phone"
+msgstr ""
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr ""
 
@@ -2738,30 +2795,26 @@ msgstr ""
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr ""
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2781,9 +2834,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2792,7 +2844,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2806,6 +2858,10 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+msgid "Pin map"
+msgstr ""
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2833,27 +2889,26 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2872,27 +2927,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2905,16 +2960,16 @@ msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2925,20 +2980,20 @@ msgstr ""
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2954,7 +3009,7 @@ msgid "Please enter your first name"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr ""
@@ -2965,9 +3020,9 @@ msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr ""
@@ -3008,18 +3063,18 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 msgid "Please make sure you are not including an email address"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3046,24 +3101,28 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -3071,7 +3130,7 @@ msgstr ""
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3083,7 +3142,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -3091,12 +3150,12 @@ msgstr ""
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3104,27 +3163,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr ""
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr ""
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -3140,7 +3195,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3148,11 +3203,11 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3168,9 +3223,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr ""
 
@@ -3216,7 +3271,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr ""
 
@@ -3224,8 +3279,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr ""
@@ -3250,18 +3304,18 @@ msgstr ""
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3269,7 +3323,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3277,11 +3331,15 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3295,11 +3353,11 @@ msgstr ""
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr ""
 
@@ -3307,12 +3365,12 @@ msgstr ""
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3354,11 +3412,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -3366,11 +3424,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -3378,13 +3436,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -3398,11 +3456,11 @@ msgstr ""
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3415,7 +3473,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3429,7 +3487,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3442,7 +3500,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3454,8 +3513,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3470,17 +3529,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3488,14 +3551,14 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3504,7 +3567,7 @@ msgid "Report a problem"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3519,7 +3582,7 @@ msgid "Report anonymously"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3554,7 +3617,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Raportuj, przeglądaj i dyskutuj o lokalnych problemach"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -3565,7 +3628,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr ""
@@ -3579,27 +3642,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -3618,17 +3681,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3656,15 +3717,15 @@ msgid "Reports published"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3677,7 +3738,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3730,39 +3791,45 @@ msgstr ""
 msgid "Right place?"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3778,20 +3845,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3808,13 +3875,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr ""
 
@@ -3827,7 +3893,7 @@ msgstr ""
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr ""
 
@@ -3842,12 +3908,12 @@ msgstr ""
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3857,8 +3923,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3868,7 +3933,7 @@ msgid "Select a body"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr ""
@@ -3889,7 +3954,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3902,7 +3967,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3911,11 +3976,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3953,7 +4018,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3964,7 +4029,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -3989,8 +4054,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4001,7 +4066,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr ""
 
@@ -4061,7 +4126,7 @@ msgid "Some photos of recent reports"
 msgstr ""
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4070,12 +4135,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4093,9 +4157,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -4105,13 +4169,13 @@ msgstr ""
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4125,11 +4189,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4138,11 +4202,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4166,18 +4230,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4186,31 +4250,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr ""
 
@@ -4228,7 +4289,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4247,50 +4308,48 @@ msgstr ""
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4302,7 +4361,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4316,20 +4375,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr ""
 
@@ -4340,14 +4398,19 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4365,13 +4428,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr ""
@@ -4392,6 +4459,10 @@ msgstr ""
 msgid "Text:"
 msgstr ""
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+msgid "Textarea"
+msgstr ""
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4421,7 +4492,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4433,27 +4504,29 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
@@ -4499,8 +4572,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4554,7 +4627,7 @@ msgstr ""
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4616,8 +4689,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4650,7 +4723,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4668,12 +4741,12 @@ msgstr ""
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -4681,7 +4754,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -4757,10 +4830,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr ""
 
@@ -4777,19 +4850,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4802,26 +4879,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4829,15 +4906,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4861,6 +4941,10 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4886,7 +4970,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4911,11 +4995,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4938,16 +5017,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4957,7 +5036,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -4987,10 +5066,10 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5002,13 +5081,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr ""
 
@@ -5058,29 +5137,27 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr ""
 
@@ -5091,7 +5168,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5121,6 +5198,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5134,8 +5219,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5153,7 +5238,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5166,27 +5251,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5194,9 +5277,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr ""
 
@@ -5222,7 +5305,7 @@ msgstr ""
 msgid "View report on site"
 msgstr ""
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5230,7 +5313,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5248,7 +5331,7 @@ msgstr ""
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -5318,7 +5401,7 @@ msgstr ""
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5338,7 +5421,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr ""
 
@@ -5350,7 +5433,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5361,12 +5443,12 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr ""
 
@@ -5379,7 +5461,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5392,7 +5474,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5401,7 +5483,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5431,7 +5513,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5441,7 +5523,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5449,7 +5531,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5458,8 +5540,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5523,9 +5604,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5534,13 +5615,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5569,16 +5651,16 @@ msgstr ""
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5598,8 +5680,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5632,7 +5714,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5663,19 +5745,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5683,8 +5765,8 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr ""
 
@@ -5715,6 +5797,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5732,7 +5818,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5812,12 +5898,12 @@ msgid "today"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5842,7 +5928,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr ""
 
@@ -5918,7 +6004,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5945,7 +6031,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5972,7 +6058,7 @@ msgstr[1] "<big>%s</big> naprawionych w zeszłym miesiącu"
 msgstr[2] "<big>%s</big> naprawionych w zeszłym miesiącu"
 msgstr[3] "<big>%s</big> naprawionych w zeszłym miesiącu"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
@@ -5981,7 +6067,7 @@ msgstr[1] "%s raportów w zeszłym tygodniu"
 msgstr[2] "%sraportów w zeszłym tygodniu"
 msgstr[3] "<big>%s</big> raportów w ubiegłym tygodniu"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
@@ -5990,7 +6076,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6035,7 +6121,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
@@ -6044,7 +6130,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
diff --git a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po
index 44bcc9718..ef400bf67 100644
--- a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: ruifigueiredo <rui.figueiredo@gmail.com>, 2020\n"
 "Language-Team: Portuguese (https://www.transifex.com/mysociety/teams/12067/pt/)\n"
@@ -22,8 +22,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "e"
@@ -58,7 +58,7 @@ msgstr "%d utilizador já existe"
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - relatórios resumidos"
 
@@ -119,7 +119,7 @@ msgstr "%s questionários enviados - %s respondeu (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copiar; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contribuidores"
 
@@ -165,6 +165,8 @@ msgstr "(não existe mais)"
 msgid "(not sent to council)"
 msgstr "(Não reportar ao município)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -183,8 +185,8 @@ msgstr "(remeter para ambos)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr "(também temos feeds RSS para problemas dentro 1%s)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Escolha uma categoria --"
@@ -214,17 +216,18 @@ msgstr ""
 "              Talvez possa adicionar alguns <code>MAPIT_TYPES</code> ao seu ficheiro de configuração?<code>"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr "<h2>Relatórios, Estatísticas e Ações para <h2><h1> 1%s </h1>"
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Mostrar</label> %s relatórios<label for=\"filter_categories\">sobre</label> %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> gravado."
 
@@ -254,7 +257,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong> Sim </strong> Eu tenho uma password"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -271,7 +274,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr "Ativar a autenticação dois-factores"
 
@@ -293,7 +296,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Adicione um contato usando o formulário abaixo."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Adicionar nova categoria"
@@ -326,7 +329,7 @@ msgstr "Adicionar estado fixo"
 msgid "Add new category"
 msgstr "Adicionar nova categoria"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "Adicionar opção"
 
@@ -335,8 +338,8 @@ msgstr "Adicionar opção"
 msgid "Add phone number"
 msgstr "Adicionar numero de telefone"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -344,21 +347,20 @@ msgid "Add to shortlist"
 msgstr "Adicionar a lista sumário"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Adicionar user"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Adicionar/editar categoria de problemas"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Adicionar/editar prioridades de resposta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Adicionar/editar templates de resposta"
 
@@ -374,6 +376,12 @@ msgstr "Adicionar este relatório à sua lista de favoritos irá removê-lo da l
 msgid "Admin"
 msgstr "Admin"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Novamente:"
@@ -386,8 +394,8 @@ msgstr "Alerta %d criado por %s, tipo %s, os parâmetros %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Alerta %d desativada (criado %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Avise-me de atualizações futuras"
 
@@ -399,10 +407,12 @@ msgstr "Alertas:"
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Todo"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Todos os Relatórios"
@@ -442,6 +452,11 @@ msgstr "Todos os relatórios entre %s e %s"
 msgid "All time"
 msgstr "Tempo todo"
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Relatado na categoria %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr "Já foi reportado"
@@ -478,7 +493,7 @@ msgstr "Anonimo"
 msgid "Anonymous user"
 msgstr "Utilizador anonimo"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -491,7 +506,7 @@ msgid "Another user"
 msgstr "Outro Utilizador"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Tem certeza que deseja cancelar este upload?"
 
@@ -500,8 +515,8 @@ msgstr "Tem certeza que deseja cancelar este upload?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Tem a certeza?"
@@ -512,7 +527,7 @@ msgstr "Tem a certeza?"
 msgid "Area covered"
 msgstr "Área coberta"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Área:"
 
@@ -526,27 +541,32 @@ msgstr "Como este é um site de preparação e %s é falso, os relatórios feito
 msgid "Assign selected to role:"
 msgstr "Atribuir utilizadores a áreas"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Atribuir a um corpo competente:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Atribuir a categoria diferente:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Atribuir ao órgão externo:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Atribuir a subdivisão:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "Atribuir utilizadores a áreas"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Categorias disponíveis"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Designado para %s"
@@ -559,7 +579,7 @@ msgstr "No máximo %d pedidos são retornados em cada consulta. Os pedidos retor
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Neste momento, apenas procurando e olhando para os relatórios de trabalho."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr "Utilizadores autorizados da equipa podem ser associados às categorias em que operam."
 
@@ -567,11 +587,11 @@ msgstr "Utilizadores autorizados da equipa podem ser associados às categorias e
 msgid "Auto Response"
 msgstr "Resposta Automatica"
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Resposta-Automatica:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr "Preencher automaticamente o assunto / detalhe do relatório"
 
@@ -583,12 +603,13 @@ msgstr "Tempo médio entre um problema ser reportado e corrigido, nos últimos 1
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Evite informações pessoais e matrículas de veículos"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Aguardando moderação"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Voltar"
@@ -609,14 +630,12 @@ msgstr "Banir utilizador"
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Organismos"
 
@@ -629,11 +648,13 @@ msgstr "Organismos"
 msgid "Body"
 msgstr "Corpo"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Corpo:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr "Ficheiro CSV"
 
@@ -645,8 +666,7 @@ msgstr "Não recebeu o email de confirmação? Verifique o SPAM da sua caixa de
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Não pode ver a localizaçao no mapa  <em> Salte esta etapa </em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -662,15 +682,13 @@ msgstr "Categorias:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -680,7 +698,7 @@ msgstr "Categoria"
 msgid "Category and State"
 msgstr "Categoria e estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Categoria alterada de '%s' para '%s'"
 
@@ -703,6 +721,11 @@ msgstr "Categoria:"
 msgid "Change"
 msgstr "Alterar"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Mudar password"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -719,7 +742,7 @@ msgstr "Mudar password"
 msgid "Change phone number"
 msgstr "Alterar o numero de telefone"
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 #, fuzzy
 msgid "Change two-factor authentication"
 msgstr "Ativar a autenticação dois-factores"
@@ -730,12 +753,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr "Escolha um nome de <strong> categoria </strong> que faça sentido para o público (por exemplo, \"Buraco\", \"Iluminação pública\"), mas também ajude o organismo. Eles aparecerão no menu suspenso na página Informar um problema."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr "Escolher outra"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr "Limpar dados offline"
 
@@ -772,8 +795,8 @@ msgid "Close"
 msgstr "Fechar"
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -783,11 +806,7 @@ msgstr "Fechar"
 msgid "Closed"
 msgstr "Fechado"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Fechado pelo Município"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr "Fechado para atualizações"
 
@@ -820,13 +839,12 @@ msgid "Code"
 msgstr "Codigo"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr "Fechar mapa"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Configuração"
@@ -943,7 +961,7 @@ msgstr "Criar um report"
 msgid "Create an account"
 msgstr "Criar uma conta"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Criar uma categoria"
@@ -953,27 +971,25 @@ msgstr "Criar uma categoria"
 msgid "Create priority"
 msgstr "Criar prioridade"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr "Criar relatório/atualizar como um utilizador anónimo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "Crie relatórios / atualizações como município"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "Criar relatórios / atualizações em nome de um utilizador"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Criar template"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Criado"
@@ -982,6 +998,17 @@ msgstr "Criado"
 msgid "Created %d new users"
 msgstr "Criado %d novo utilizador"
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Criado"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Criado"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -993,10 +1020,6 @@ msgstr "Criado:"
 msgid "Current password:"
 msgstr "Passowrd atual:"
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr "Token atual:"
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr "Atualmente agrupados por %s"
@@ -1006,19 +1029,21 @@ msgstr "Atualmente agrupados por %s"
 msgid "Currently no bodies have been created."
 msgstr "Atualmente, não existe nenhum organismo."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Cliente não está contactável"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Painel de instrumentos"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr "Desactivar autenticação de dois fatores"
 
@@ -1030,7 +1055,7 @@ msgstr "Tratadas pelas  subdivisões dentro de 5 dias úteis"
 msgid "Default"
 msgstr "Defeito"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr "Padrão para criar relatórios / atualizações como município"
 
@@ -1040,7 +1065,7 @@ msgid "Delete"
 msgstr "Apagar"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Apagar template"
@@ -1062,9 +1087,7 @@ msgid "Describe why you are moderating this"
 msgstr "Descreva por que você está moderando isto"
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Descrição detalhada do problema"
 
@@ -1073,7 +1096,7 @@ msgstr "Descrição detalhada do problema"
 msgid "Destination"
 msgstr "Descrição detalhada do problema"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr "Informações detalhadas estão limitadas a %d caracteres.."
 
@@ -1109,7 +1132,7 @@ msgid "Disable"
 msgstr "Desativar"
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1117,6 +1140,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Relatado na categoria %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Relatado na categoria %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr "Desativar:"
@@ -1151,25 +1184,25 @@ msgstr "Não sei"
 msgid "Don't like forms?"
 msgstr "Não gosto de formulários"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr "Descer um"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Arraste e solte fotos aqui ou clique para  <u>upload</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr "Duplicado de"
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr "Duplicados"
 
@@ -1184,7 +1217,7 @@ msgstr ""
 "            Categorias diferentes<strong>podem ter o mesmo contacto</strong> (endereço de email).\n"
 "            Isso significa que você pode adicionar muitas categorias, mesmo se você tiver apenas um contato para o corpo."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr "Leste/Norte"
@@ -1196,7 +1229,7 @@ msgstr "Leste/Norte"
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Editar"
@@ -1207,12 +1240,11 @@ msgstr "Editar"
 msgid "Edit body details"
 msgstr "Editar os detalhes do corpo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "Editar permissões de outros utilizadores"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Editar categoria do relatório"
 
@@ -1220,17 +1252,15 @@ msgstr "Editar categoria do relatório"
 msgid "Edit report details"
 msgstr "Editar detalhes do relatório"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Editar priorirade do relatório"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Editar relatórios"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr "Edite os detalhes dos utilizadores / pesquise os seus relatórios"
 
@@ -1267,8 +1297,9 @@ msgstr "Editar"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1277,15 +1308,14 @@ msgstr "Editar"
 msgid "Email"
 msgstr "Email"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Endereço de e-mail"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr "Endereço de e-mail(opcional)"
 
@@ -1305,12 +1335,13 @@ msgstr "Envie-me um link por email ou envie-me um texto para entrar"
 msgid "Email me a link to sign in"
 msgstr "Envie-me um link para entrar"
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "Email confirmado:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Email:"
@@ -1373,12 +1404,12 @@ msgstr "Data final"
 msgid "Endpoint"
 msgstr "Endpoint"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Digite um nome de uma rua de Mindelo"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Inserir um código postal de Mindelo nas proximidades da area, zona, rua ou local"
 
@@ -1405,10 +1436,10 @@ msgstr "Escreva de forma detalhada o problema, incluindo uma fotografia"
 msgid "Error"
 msgstr "Erro"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Todos"
 
@@ -1421,7 +1452,7 @@ msgstr "Exemplo PostCode %s"
 msgid "Examples:"
 msgstr "Exemplos:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Categoria Existente"
 
@@ -1430,7 +1461,7 @@ msgid "Existing users won't be modified."
 msgstr "Os utilizadores existentes não serão modificados."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr "Expandir Mapa"
 
@@ -1455,7 +1486,7 @@ msgid "External body"
 msgstr "Corpo Externo"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr "codigo de estado externo"
 
@@ -1467,20 +1498,20 @@ msgstr "Código status externo"
 msgid "External team"
 msgstr "Equipa Externa"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "Campos Extra"
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Dados adicionais:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1513,20 +1544,25 @@ msgid "Fill in your details manually."
 msgstr "Preencha seus dados manualmente."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filtrar relatório"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Primeiro Nome"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Fotos de relatórios recentes mais proximos"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Novos reports"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Corrija isso escolhendo uma <strong> área coberta </strong> no formulário <em> Editar detalhes do organismo </em> abaixo."
@@ -1556,7 +1592,7 @@ msgstr "Marcar como apagado"
 msgid "Flag user"
 msgstr "Bandeira - Usuario"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Marcado"
@@ -1565,7 +1601,7 @@ msgstr "Marcado"
 msgid "Flagged reports and users"
 msgstr "Relatórios e utilizadores sinalizados"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Utilizadores sinalizados são listados na <a href='%s'>página</a>."
 
@@ -1573,8 +1609,8 @@ msgstr "Utilizadores sinalizados são listados na <a href='%s'>página</a>."
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Utilizadores sinalizados não são de forma alguma bloqueados. Esta é apenas uma lista de utilizadores que foram marcados para seren analisados com atenção."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Marcado:"
 
@@ -1600,11 +1636,11 @@ msgstr "Esqueci a password"
 msgid "Forgotten your password?"
 msgstr "Não se lembra da sua password?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Encaminhado para organismo externo"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Desejo de encaminhar para organismo externo"
 
@@ -1614,12 +1650,20 @@ msgstr "Desejo de encaminhar para organismo externo"
 msgid "Frequently Asked Questions"
 msgstr "Perguntas mais frequentes"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr "Gerar token"
 
@@ -1641,7 +1685,7 @@ msgstr "Receba as atualizações de problemas fix de %s"
 msgid "Get updates of problems in this %s"
 msgstr "Receba as atualizações de problemas neste %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Dê-me um feed RSS"
 
@@ -1657,15 +1701,15 @@ msgstr "Ficamos satisfeitos em saber que foi reparado!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1675,7 +1719,7 @@ msgstr " Ir"
 msgid "Going to send questionnaire?"
 msgstr "Vai enviar questionário?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr "Garantir acesso ao admin"
 
@@ -1701,6 +1745,7 @@ msgstr "Alguma vez relatou algum problema ao município, ou é a sua primeira ve
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1735,7 +1780,8 @@ msgstr "Esconder"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr "Esconder todos os relatórios e suas atualizações"
 
@@ -1763,7 +1809,7 @@ msgstr "Ocultar o meu nome neste relatório"
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Ocultar pins"
 
@@ -1817,11 +1863,9 @@ msgstr "Receio que não foi possível localizar o seu problema no banco de dados
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1840,15 +1884,15 @@ msgstr "Se houver um utilizador associado ao endereço inserido, enviaremos-lhe
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr "Se essa prioridade for passada para um serviço externo, digite o código de prioridade a ser usado com esse serviço aqui."
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr "Se este modelo for seleccionado será usado para actualizações do Open311 que colocam problemas nesse estado."
 
@@ -1864,7 +1908,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr "Se estiver contatando sobre um relatório ou atualização específicos, inclua um link para o respectivo relatório na mensagem."
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr "Se você gerar um novo token, o token existente deixará de funcionar."
 
@@ -1888,7 +1932,7 @@ msgstr "Se apenas desejar que este modelo seja apenas uma opção para categoria
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "Se você submeter um problema aqui, o problema <strong>não</strong> será relatado ao município."
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr "Se você deseja usar este modelo para preencher o campo de atualização quando um relatório&rsquo;s<strong> externo </strong> (por exemplo, confirmar) alterações no código de status, digite o código de status aqui."
 
@@ -1927,7 +1971,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr "Se você ativou o envio de atualizações do Open311 acima, deve identificar qual utilizador do FixMyStreet <strong> </strong> será atribuído como o criador dessas atualizações quando elas forem mostradas no site. Digite o ID (número) desse utilizador."
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1951,6 +1995,17 @@ msgstr "Na tabela de abuso?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "Além disso, os seguintes atributos que não fazem parte da especificação v2 Open311 são retornados: agency_sent_datetime, título (também retornou como parte da descrição), interface_used, comment_count, requestor_name (presente apenas se solicitante permitido o nome a ser mostrado neste site) ."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "Vizualizar departamentos"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1960,20 +2015,20 @@ msgstr "Inativo"
 msgid "Inbox zero, here we come!"
 msgstr "Caixa de entrada zero, aqui vamos nós!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Incluir reports detalhes pessoais"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Foto_has valor incorreto \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr "Verificar o relatório"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "Instrua os contratados para resolver problemas"
 
@@ -1990,16 +2045,12 @@ msgstr "Notas Internas"
 msgid "Internal notes"
 msgstr "Notas Internas"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Agencia_responsavel valor %s inválido"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Formato inválido%s especificado."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Localização inválida. O novo local deve ser coberto pelo mesmo município."
 
@@ -2051,13 +2102,13 @@ msgstr "Última atualização:"
 msgid "Last&nbsp;update:"
 msgstr "Última atualização:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Latitude/Longitude\\:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Atualizado recentemente"
@@ -2074,7 +2125,7 @@ msgstr "Listar todos os problemas relatados"
 msgid "Loading reports…"
 msgstr "Carregar relatórios..."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Carregando ..."
@@ -2112,17 +2163,18 @@ msgid "Log in with Twitter"
 msgstr "Login com o Twitter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "Login com o email"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr "Login com o email/texto"
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr "Sair de todas as sessões"
 
@@ -2141,19 +2193,20 @@ msgstr "Procurar"
 msgid "MAP"
 msgstr "Mapa"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr "Tornar anónimo em todos os relatórios e atualizações"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr "Gerir lista curta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr "Pedido manual"
@@ -2167,24 +2220,24 @@ msgstr "Mapa"
 msgid "Mark as sent"
 msgstr "Marcado como enviado"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Marque os utilizadores cujo comportamento você deseja manter uma verificação com um <strong>pisco</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr "Detalhes do problema de marcação"
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Menssagem"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Mensagem para o organismo competente\\:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Mensagem para um organismo externo\\:"
 
@@ -2197,7 +2250,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr "Faltam organismos:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Falta informaçao jurisdiction_id"
 
@@ -2205,8 +2258,7 @@ msgstr "Falta informaçao jurisdiction_id"
 msgid "Moderate"
 msgstr "Moderado"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Detalhes moderados do relatório"
 
@@ -2229,7 +2281,7 @@ msgstr "Moderado por %s em %s"
 msgid "Moderated by division within one working day"
 msgstr "Moderado por divisão dentro de um dia de trabalho"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr "Histórico de moderação"
@@ -2239,14 +2291,14 @@ msgstr "Histórico de moderação"
 msgid "Month"
 msgstr "Mês"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Mais comentado"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2274,9 +2326,10 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Nome:"
@@ -2294,7 +2347,7 @@ msgstr "Navegue para este problema"
 msgid "Nearest calculated address:"
 msgstr "Endereço calculado mais próximo\\:"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Nomeado rodoviário mais próximo ao pino colocado no mapa (gerado automaticamente usando OpenStreetMap): %s%s"
 
@@ -2302,12 +2355,12 @@ msgstr "Nomeado rodoviário mais próximo ao pino colocado no mapa (gerado autom
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Código postal mais próximo do pino colocado no mapa (gerado automaticamente): %s (%sm distância)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Estrada mais próxima para o pino colocado no mapa (gerado automaticamente por Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2333,7 +2386,7 @@ msgstr "Quase pronto! Verifique agora o seu telemóvel;"
 msgid "New body added"
 msgstr "Novo corpo adicionado"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Novo contato de categoria adicionado"
 
@@ -2347,8 +2400,8 @@ msgstr "Novo endereço de email:"
 msgid "New field"
 msgstr "Salvar novos campos"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nova nota interna:"
 
@@ -2356,13 +2409,13 @@ msgstr "Nova nota interna:"
 msgid "New local problems on FixMyStreet"
 msgstr "Novos problemas locais FixMyStreetMindelo"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Nova nota:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Nova password:"
 
@@ -2439,7 +2492,7 @@ msgstr "Novo template"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr "Novos actualizações no relatório <a href=\"%s\">%s</a>"
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Recente"
@@ -2452,7 +2505,6 @@ msgstr "Proximo"
 msgid "Next:"
 msgstr "Próximo:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2461,11 +2513,11 @@ msgstr "Próximo:"
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Nao"
 
@@ -2478,11 +2530,12 @@ msgstr "Grupo"
 msgid "No account?"
 msgstr "Não tem conta?"
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Nenhum corpo"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Nenhum município selecionado"
 
@@ -2498,8 +2551,8 @@ msgstr "Nenhum problema sinalizado encontrado."
 msgid "No flagged users found."
 msgstr "Nenhum utilizador sinalizado encontrado."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Sem mais atualizações"
 
@@ -2535,15 +2588,15 @@ msgstr "Não apoiantes"
 msgid "None"
 msgstr "Nenhum"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr "Utilizadores normais (públicos) não devem ser associados a nenhuma <strong> área </strong>. <br> Utilizadores autorizados da equipe podem ser associados à área em que operam."
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2551,10 +2604,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr "Utilizadores normais (públicos) não devem ser associados a nenhum <strong> corpo </strong>. <br> Os utilizadores autorizados da equipe podem ser associados ao organismo que representam. <br> Dependendo da implementação, os utilizadores da equipe podem ter acesso ao painel (resumo da atividade em todo o corpo), a capacidade de ocultar relatórios ou definir status especiais de relatórios."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Nao pertence ao meu sector"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Nao reportado antes"
@@ -2603,12 +2660,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr "Dados offline limpos"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr "Dados de atualização offline gravados"
 
@@ -2616,12 +2673,12 @@ msgstr "Dados de atualização offline gravados"
 msgid "Old state"
 msgstr "Estado antigo"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Mais antigo"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr "Em nome de %s"
 
@@ -2630,7 +2687,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2661,7 +2718,7 @@ msgstr "Open311 página web iniciativa"
 msgid "Open311 specification"
 msgstr "Especificação Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr "Opções"
 
@@ -2673,7 +2730,7 @@ msgstr "Ou <a href=\"/\">pequise por uma localização diferentes</a>"
 msgid "Or sign in with password to prefill this information."
 msgstr "Ou faça login com password para preencher esses campos."
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr "Ou subscreve por feed RSS"
 
@@ -2681,16 +2738,16 @@ msgstr "Ou subscreve por feed RSS"
 msgid "Order"
 msgstr "Ordem"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2722,7 +2779,7 @@ msgstr "Pagina nao encontrada"
 msgid "Parent"
 msgstr "Parente"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Outras categorias"
@@ -2731,13 +2788,13 @@ msgstr "Outras categorias"
 msgid "Partial"
 msgstr "Parcial"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Password (opcional)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Sua password foi alterada"
@@ -2752,7 +2809,7 @@ msgstr "Password (opcional)"
 msgid "Permissions"
 msgstr "Permissões:"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Permissões:"
 
@@ -2760,19 +2817,24 @@ msgstr "Permissões:"
 msgid "Permit blank updates"
 msgstr "Permitir atualizações a vazio"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefone:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr "Reportado por telefone\\:"
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Numero de telefone"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Telefone (opcional)"
 
@@ -2780,30 +2842,26 @@ msgstr "Telefone (opcional)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr "Os números de telemóvel são limitados a%s  caracteres."
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr "Telefone validado"
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefone:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2823,9 +2881,8 @@ msgstr "Foto necessária"
 msgid "Photo upload failed."
 msgstr "O envio da foto falhou"
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Fotos"
@@ -2834,7 +2891,7 @@ msgstr "Fotos"
 msgid "Photos of recent nearby reports"
 msgstr "Fotos de relatórios recentes mais proximos"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2848,6 +2905,11 @@ msgstr "Escolha o seu município "
 msgid "Pick your ward"
 msgstr "Seleccione o seu departamento"
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Coloque a fix pin no mapa"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2875,27 +2937,26 @@ msgid "Please check your email address is correct"
 msgstr "Favor verificar se seu email esta correcto"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr "Por favor verifique se o seu número de telemóvel está correcto"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Escolher uma categoria"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr "Por favor escolha uma password menos frequentemente"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2917,27 +2978,27 @@ msgstr ""
 "<a href=\"/\"> ir par a Página Inicial </a> e como SIGA INSTRUÇÕES."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Por favor insira uma mensagem"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr "Favor introduzir o numero de telemóvel"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Favor introduzir o nome"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "Digite um nome para este corpo"
 
@@ -2950,16 +3011,16 @@ msgstr "Por favor insira uma password"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Por favor insira um assunto"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2970,20 +3031,20 @@ msgstr "Por favor insira um email valido"
 msgid "Please enter a valid email address"
 msgstr "Por favor insira um endereço de e-mail válido"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr "Digite um email ou número de telefone válido"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Por favor, insira alguns detalhes"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2999,7 +3060,7 @@ msgid "Please enter your first name"
 msgstr "Digite seu primeiro nome"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Por favor, insira o seu nome completo, os municípios precisam desta informação - se você não quiser que seu nome seja mostrado no site, desmarque a caixa abaixo"
@@ -3011,9 +3072,9 @@ msgstr "Digite seu nome"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Digite seu nome"
@@ -3054,19 +3115,19 @@ msgstr "Por favor, preencha o formulário abaixo com detalhes do problema e desc
 msgid "Please generate a two-factor code and enter it below:"
 msgstr "Gere um código de dois fatores e digite-o abaixo\\:"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Por favor, indique se você gostaria de receber um outro questionário"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Por favor insira um endereço de e-mail válido"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr "Por favor certifique-se que a sua password tem no mínimo  %d caracteres"
@@ -3093,24 +3154,28 @@ msgstr "Atenção que a sua actualização <strong>ainda não foi submetida</str
 msgid "Please note:"
 msgstr "Favor notar:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr "Forneça um ID duplicado ou atualização pública para este relatório."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr "Forneça uma atualização pública para este relatório."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Favor fornecer uma explicação de por que você está reabrindo este relatório"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Por favor, forneça algum texto, bem como uma foto"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Por favor, diga se você já relatou um problema para o seu município antes"
 
@@ -3118,7 +3183,7 @@ msgstr "Por favor, diga se você já relatou um problema para o seu município a
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Por favor, selecione um corpo."
 
@@ -3130,7 +3195,7 @@ msgstr "Por favor, selecione o feed que deseja"
 msgid "Please select the type of alert you want"
 msgstr "Selecione o tipo de alerta que deseja"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Por favor, indique se o problema foi corrigido"
 
@@ -3138,12 +3203,12 @@ msgstr "Por favor, indique se o problema foi corrigido"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Carregue apenas uma imagem"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr "Verifique pelo menos um email / telefone"
 
@@ -3151,27 +3216,23 @@ msgstr "Verifique pelo menos um email / telefone"
 msgid "Please write a message"
 msgstr "Por favor, escreva uma mensagem"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Postar"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr "Código postal ou rua e localização"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Postado anonimamente em %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Postado por %s aem %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Postado por <strong>%s</strong> (%s) em %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Postado por <strong>%s</strong> em %s"
 
@@ -3187,7 +3248,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3195,11 +3256,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Anterior"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Prioridades"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Prioridade"
@@ -3215,9 +3276,9 @@ msgid "Privacy and cookies"
 msgstr "Privacidade e cookies"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privado"
 
@@ -3267,7 +3328,7 @@ msgstr "Problema %s enviado ao município %s"
 msgid "Problem breakdown by state"
 msgstr "Colapso problema por estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problema marcado como aberto."
 
@@ -3275,8 +3336,7 @@ msgstr "Problema marcado como aberto."
 msgid "Problem state change based on survey results"
 msgstr "Mudança de estado do problema com base nos resultados da pesquisa"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemas"
@@ -3301,18 +3361,18 @@ msgstr "Problemas relatados recentemente fixados em FixMyStreetMindelo"
 msgid "Problems within %.1fkm of %s"
 msgstr "Problemas em %.1fkm de %s"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemas dentro de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemas do departamento %s "
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr "Problemas do departamento%s, %s"
 
@@ -3320,7 +3380,7 @@ msgstr "Problemas do departamento%s, %s"
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Problemas em %s, %s"
 
@@ -3328,11 +3388,15 @@ msgstr "Problemas em %s, %s"
 msgid "Property address:"
 msgstr "Endereço do imóvel:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3346,11 +3410,11 @@ msgstr "Fornecer uma atualização"
 msgid "Provide update as"
 msgstr "Forneça a atualização como"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr "A introdução de uma password é opcional, no entanto isso permitirá que relate mais facilmente problemas futuros, efctue atualizações e faça a gestão dos seus relatórios."
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Fornecer uma password é opcional, mas isso vai permitir reportar problemas de forma mais fácil, actualizar e gerir os seus relatórios."
 
@@ -3358,12 +3422,12 @@ msgstr "Fornecer uma password é opcional, mas isso vai permitir reportar proble
 msgid "Public details"
 msgstr "Detalhes Publicos"
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Resposta do público:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Atualização pública\\:"
 
@@ -3406,11 +3470,11 @@ msgstr "Questionário preenchido por problema repórter"
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS feed para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS feed para %s departamento,%s"
 
@@ -3418,11 +3482,11 @@ msgstr "RSS feed para %s departamento,%s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS feed de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS feed de %s, %s problemas pendentes"
 
@@ -3430,13 +3494,13 @@ msgstr "RSS feed de %s, %s problemas pendentes"
 msgid "RSS feed of nearby problems"
 msgstr "RSS feed dos problemas próximos"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS feed dos Problemas Nesta %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS feed dos problemas dentro de %s ala"
 
@@ -3450,11 +3514,11 @@ msgstr "RSS feed dos problemas locais recentes"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS feed de atualizações para este problema"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr "Ler menos"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr "Ler mais"
 
@@ -3467,7 +3531,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "RSS feed dos problemas locais recentes"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr "Recebido à %satrás"
 
@@ -3481,7 +3545,7 @@ msgstr "Problemas locais recentes, %s"
 msgid "Recently reported problems"
 msgstr "Problemas recentemente reportados"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Atualizado recentemente"
@@ -3494,7 +3558,8 @@ msgstr "Rejeitar caso"
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Lembre-se que FixMyStreet é principalmente para relatar problemas físicos que podem ser corrigidos. Se o seu problema não é apropriado para a apresentação através deste site, lembre-se que você pode contactar o seu município diretamente usando seu próprio site."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr "Apagar detalhes da conta"
 
@@ -3506,8 +3571,8 @@ msgstr "Remover campo"
 msgid "Remove flag"
 msgstr "Remover bandeira"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3523,17 +3588,22 @@ msgstr "Remover do site"
 msgid "Remove option"
 msgstr "Remover campo"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Remover foto (não pode ser desfeita!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Editar permissões de outros utilizadores"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr "Substituir token"
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Responder ao utilizador\\:"
 
@@ -3541,14 +3611,14 @@ msgstr "Responder ao utilizador\\:"
 msgid "Report"
 msgstr "Relatório"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "Relatório ID:"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3557,7 +3627,7 @@ msgid "Report a problem"
 msgstr "Reportar um problema"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr "Reporte o problema aqui"
@@ -3573,7 +3643,7 @@ msgid "Report anonymously"
 msgstr "Relatado anonimamente em %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3609,7 +3679,7 @@ msgstr "Reportar, visualizar e discutir problemas locais."
 msgid "Report, view, or discuss local problems"
 msgstr "Reportar, ver ou discutir problemas locais"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Relatado anonimamente em %s"
@@ -3620,7 +3690,7 @@ msgstr "Relatado anonimamente em %s"
 msgid "Reported before"
 msgstr "Relatado antes"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Relatado por %s em %s"
@@ -3634,27 +3704,27 @@ msgstr "Reportado por\\:"
 msgid "Reported in the %s category"
 msgstr "Relatado na categoria %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Relatado na categoria %s anonimamente em %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Relatado na categoria %s por %s em %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Relatado por %s anonimamente em %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Relatado por %s por%s em %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Relatado por %s na categoria %s anonimamente em %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Relatado por %s na categoria %s por %s em %s"
 
@@ -3673,17 +3743,15 @@ msgstr "Reportado\\:"
 msgid "Reporting a problem"
 msgstr "Relatando um problema"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Relatórios"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3711,15 +3779,15 @@ msgid "Reports published"
 msgstr "Os relatórios publicados"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr "Relatórios salvos offline."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr "Relatórios enviados para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr "Relatório enviado para  %s, do departamento %s"
 
@@ -3732,7 +3800,7 @@ msgstr "Relatórios aguardando envio"
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr "Necessário"
 
@@ -3785,39 +3853,45 @@ msgstr "Reverter para o título original"
 msgid "Right place?"
 msgstr "Lugar certo?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Operador de estrada por esta estrada chamada (derivado do número de referência estrada e tipo): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operador de estrada por esta estrada chamada (a partir de OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Girar para a esquerda"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3833,20 +3907,20 @@ msgstr "Rodar esta foto descartará as alterações não gravadas deste relatór
 msgid "Satellite"
 msgstr "Satélite"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr "Salvar + fechar como duplicado"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3863,13 +3937,12 @@ msgid "Save with a public update"
 msgstr "Salvar com uma atualização pública"
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr "Salvando relatórios offline"
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Busca Reports"
 
@@ -3882,7 +3955,7 @@ msgstr "Procurar Usuários"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "elatórios de pesquisa"
 
@@ -3897,12 +3970,12 @@ msgstr "Pesquisar:"
 msgid "Searching found no reports."
 msgstr "A pesquisa não encontrou relatórios."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "A pesquisa não encontrou usuários."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr "Segurança"
@@ -3912,8 +3985,7 @@ msgstr "Segurança"
 msgid "See our privacy policy"
 msgstr "Veja nossa política de privacidade"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr "Consulte os detalhes do utilizador para relatórios criados como município "
 
@@ -3923,7 +3995,7 @@ msgid "Select a body"
 msgstr "Selecione um corpo"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Selecione uma área"
@@ -3944,7 +4016,7 @@ msgstr "Seleccionar multiplos departamentos?"
 msgid "Select:"
 msgstr "Escolher\\:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr "Enviar"
@@ -3957,7 +4029,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr "Envie estadps Open311 estendidos com atualizações de pedidos de serviço"
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr "Enviar o email de acesso"
 
@@ -3966,11 +4038,11 @@ msgstr "Enviar o email de acesso"
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr "O envio de um texto de confirmação falhou\\:\"%s\" "
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "Relatório enviado de volta"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Enviado para %s %s mais tarde"
 
@@ -4008,7 +4080,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr "Sumário"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr "Lista final visível"
 
@@ -4019,7 +4091,7 @@ msgstr "Lista final visível"
 msgid "Shortlisted"
 msgstr "Pré-selecionado"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr "Selecionado por %s"
@@ -4044,8 +4116,8 @@ msgstr "Mostrar nome publicamente?"
 msgid "Show older"
 msgstr "Mostrar por antiguidade"
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr "Mostrar relatórios mais antigos"
 
@@ -4056,7 +4128,7 @@ msgstr "Mostrar a foto"
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Mostrar pins"
 
@@ -4116,7 +4188,7 @@ msgid "Some photos of recent reports"
 msgstr "Fotos de reports recentes"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Algum informaçao para localizar"
 
@@ -4125,12 +4197,11 @@ msgid "Someone has moderated this report since you started."
 msgstr "Alguém moderou este relatório desde que você começou."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr "Desculpe! Você atingiu o limite de imagens que podem ser anexadas a um relatório."
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Desculpe, codigo postal nao coincide. Area nao comprrendida."
 
@@ -4148,9 +4219,9 @@ msgstr "Lamentamos, código incorrecto"
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Desculpe, houve um erro ao confirmar o seu 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/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Desculpe, não conseguimos encontrar esse local."
 
@@ -4160,13 +4231,13 @@ msgstr "Desculpe, não conseguimos encontrar esse local."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr "Desculpe, não foi possível fazer o login. Por favor, preencha o formulário abaixo."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Desculpe, mas não foi possível analisar esse local. Por favor, tente novamente."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4184,11 +4255,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr "Desculpe, você não tem permissões para fazer isso."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Ordernado por"
@@ -4198,11 +4269,11 @@ msgstr "Ordernado por"
 msgid "Staff only"
 msgstr "Equipa\\:"
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr "Os utilizadores da equipa têm permissão para efetuar login no administrador."
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr "Equipa\\:"
 
@@ -4226,18 +4297,18 @@ msgstr "Data de inicio"
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr "Estado e código de estado externo não podem ser utilizados em simultaneo."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4246,31 +4317,28 @@ msgstr "Estado alterado para:"
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Estado"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr "Estados"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Stats"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Status"
 
@@ -4288,7 +4356,7 @@ msgstr "vista da rua"
 msgid "Subcategory"
 msgstr "Subcategoria"
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Zona / Bairro"
 
@@ -4307,50 +4375,48 @@ msgstr "Assunto:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Submeter"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Submeter alteraçoes"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Submeter questionario"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Submitido"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Subscrever"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr "Subscrever por e-mail"
 
@@ -4363,7 +4429,7 @@ msgstr "Subscrever\\:"
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Os resumos estão limitados a%s caracteres. Por favor reduza seu resumo"
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr "Os resumos estão limitados a%s caracteres. Por favor reduza seu resumo"
@@ -4377,20 +4443,19 @@ msgstr "Os resumos são limitados a {0} caracteres. Reduza seu resumo"
 msgid "Summarise the problem"
 msgstr "Resuma o problema"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Resuma suas alterações"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Resumo"
 
@@ -4401,14 +4466,20 @@ msgstr "Resumo reports"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr "Estatísticas resumidas"
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Superuser"
+msgstr "SuperUtilizador\\:"
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr "SuperUtilizador\\:"
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "Super-utilizadoreshave têm permissão para executar <strong>todas as ações</strong> dentro do administrador."
 
@@ -4426,13 +4497,18 @@ msgstr "Fale nos sobre você"
 msgid "Template &laquo;%s&raquo;"
 msgstr "Modelo «%s»;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Templates"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Atualizado recentemente"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Texto"
@@ -4454,6 +4530,11 @@ msgstr "Somente versao texto"
 msgid "Text:"
 msgstr "Texto:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Texto"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Obrigado por reportar este problema!"
@@ -4483,7 +4564,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Obrigado, gratos em ouvir que o problema foi corrigido! Podemos apenas perguntar se você já relatou um problema para um município antes?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4495,27 +4576,29 @@ msgstr "Essa imagem não parece ter sido  carregada corretamente (%s), por favor
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Esse local não parece ser coberto por um município, talvez seja no mar ou fora do país. Por favor, tente novamente."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Esse local não parece estar em Mindelo, por favor tente novamente."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Esse código postal não foi reconhecido, me desculpe.Tente novamente."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Esse problema foi marcado como enviado."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Esse problema agora será reenviado e reportado ao conselho."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Esse relatório foi removido FixMyStreetMIndelo"
 
@@ -4561,8 +4644,8 @@ msgstr "A <strong> jurisdição </strong> será necessária apenas se o terminal
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4617,7 +4700,7 @@ msgstr "O erro foi: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "Os seguintes atributos Open311 v2 são devolvidos para cada solicitação: service_request_id, descrição, lat, long, MEDIA_URL, status, requested_datetime, updated_datetime, service_code e service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "As seguintes informações sobre a estrada mais próxima pode ser imprecisas ou irrelevantes, se o problema está perto de várias estradas ou perto de uma estrada sem nome registrado no OpenStreetMap."
 
@@ -4680,8 +4763,8 @@ msgstr "O usuário não conseguiu localizar o problema em um mapa, localizar a a
 msgid "The user has been sent a login email"
 msgstr "O utilizador recebeu um email de login"
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4715,7 +4798,7 @@ msgstr "Temos conhecimento de que existem problemas semelhantes nas proximidades
 msgid "There is already a template with that title."
 msgstr "Já existe um modelo de resposta automática para esta categoria / estado."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr "Já existe um modelo de resposta automática para esta categoria / estado."
 
@@ -4733,13 +4816,13 @@ msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mai
 msgid "There was a problem with your login information."
 msgstr "Ocorreu um problema com suas informações de login."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 #, fuzzy
 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 "Verificou-se um problema com os seus dados de login. Se não se lembra da sua password ou a perdeu, preencha a opção 'Não' do formulário."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Houve um problema com a sua atualização. Por favor, tente novamente."
 
@@ -4747,7 +4830,7 @@ msgstr "Houve um problema com a sua atualização. Por favor, tente novamente."
 msgid "There were problems with your report. Please see below."
 msgstr "Houve problemas com o seu relatório. Por favor, veja abaixo."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Houve problemas com a sua atualização. Por favor, veja abaixo."
 
@@ -4823,10 +4906,10 @@ msgstr "Este e-mail foi enviado para ambos os municípios que cobrem o local do
 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 "Este e-mail foi enviado para vários municípios que cobrem o local do problema, uma vez que a categoria selecionada é fornecida para todos eles. Por favor queira ignorar se você não é o município correto para lidar com este problema."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Esta informação é necessária"
 
@@ -4843,19 +4926,23 @@ msgstr "Este é o texto  <strong>público</strong> que será mostrado no site."
 msgid "This is the problem"
 msgstr "Este é o problema"
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr "Esta página é uma maneira rápida de criar vários utilizadores novos de uma só vez."
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Este problema foi resolvido"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Este problema não foi corrigido"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr "Esse problema ainda está em andamento"
 
@@ -4868,26 +4955,26 @@ msgstr "Este relatório"
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr "Este relatório é um duplicado. Por favor deixe as suas atualizações no relatório original:"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Este relatório está aguardando moderação."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Este relatório está marcado como fechado."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Este relatório está marcado como fixo."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Este relatório está marcado como aberto."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr "Este relatório agora está fechado para atualizações."
 
@@ -4895,15 +4982,18 @@ msgstr "Este relatório agora está fechado para atualizações."
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Esta página também contém uma foto do problema, fornecido pelo usuário."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Tempo gasto(em minutos)\\:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4927,6 +5017,10 @@ msgstr "Titulo"
 msgid "Title:"
 msgstr "Titúlo\\:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "Para descobrir quais alertas locais que temos para si, digite o seu código postal %s ou o nome da rua e localização:"
@@ -4953,7 +5047,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "Para ver no mapa a localização exata desse problema"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 #, fuzzy
 msgid "Token"
 msgstr "Token\\:"
@@ -4979,11 +5073,6 @@ msgstr "Top 5 departamentos"
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr "Gestão de tráfego é necessária?"
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr "Tradução"
@@ -5006,17 +5095,17 @@ msgstr "Tente enviar-nos um e-mail diretamente:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 #, fuzzy
 msgid "Two-factor authentication"
 msgstr "Ativar a autenticação dois-factores"
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr "A autenticação de dois fatores foi ativada"
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr "A autenticação de dois fatores foi desativada"
 
@@ -5026,7 +5115,7 @@ msgstr "A autenticação de dois fatores foi desativada"
 msgid "Type"
 msgstr "Tipo"
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr "Desbloquear"
 
@@ -5056,10 +5145,10 @@ msgstr "Erro desconhecido"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "Desconhecido problema com ID"
 
@@ -5071,13 +5160,13 @@ msgstr "ID de atualização desconhecido"
 msgid "Unshortlisted"
 msgstr "Não inscrito na lista"
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr "Um"
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Actualizar"
 
@@ -5128,29 +5217,27 @@ msgstr "Reaberto a actualizaçao do problema"
 msgid "Update statuses"
 msgstr "Atualizar status"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Atualizado"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr "Actualizado por <strong>%s</strong> (%s) em %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr "Actualizado por <strong>%s</strong> em %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Actualizado!"
 
@@ -5161,7 +5248,7 @@ msgstr "Actualizado!"
 msgid "Updates"
 msgstr "Actualizaçoes"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "As atualizações são limitadas a %s caracteres. Reduza sua atualização"
 
@@ -5191,6 +5278,14 @@ msgstr "Use a extensão de envio de atualização do Open311"
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr "ID do utilizador para atribuir comentários pesquisados"
@@ -5204,8 +5299,8 @@ msgstr "Importar o utilizador"
 msgid "User added to abuse list"
 msgstr "Utilizador adicionado à lista de abuso"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr "Utilizador já existe"
 
@@ -5223,7 +5318,7 @@ msgid "User flagged"
 msgstr "Usuário sinalizado"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr "Utilizador já se encontra na lista de suspensa"
@@ -5236,27 +5331,25 @@ msgstr "A pesquisa do utilizador encontra correspondências nos nomes e endereç
 msgid "User's alerts"
 msgstr "Alertas de utilizadores"
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr "Utilizador:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Usuários"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr "Os utilizadores podem executar as seguintes ações na sua zona ou área atribuída."
 
@@ -5265,9 +5358,9 @@ msgstr "Os utilizadores podem executar as seguintes ações na sua zona ou área
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr "Os utilizadores podem executar as seguintes ações na sua zona ou área atribuída."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Valores atualizados"
 
@@ -5293,7 +5386,7 @@ msgstr "Verificar telemóvel"
 msgid "View report on site"
 msgstr "Ver relatório no site"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Exibir relatórios por departamento"
 
@@ -5301,7 +5394,7 @@ msgstr "Exibir relatórios por departamento"
 msgid "View wards"
 msgstr "Vizualizar departamentos"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr "Ver / marcar relatórios privados"
 
@@ -5319,7 +5412,7 @@ msgstr "Visualizando um problema"
 msgid "Ward:"
 msgstr "Departamento:"
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Departamentos deste município "
 
@@ -5389,7 +5482,7 @@ msgstr "Quando enviar"
 msgid "Which problems do you want alerts about?"
 msgstr "Para quais problemas deseja receber alertas?"
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr "Que relatório é um duplicado?"
 
@@ -5409,7 +5502,7 @@ msgstr "Dentro do prazo especificado\\:"
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "Deseja contribuir para o FixMyStreet? O nosso código fonte é de código aberto e está  <a href=\"https://fixmystreet.org\">disponível em fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Gostaria de receber um questionário em 4 semanas, lembrando que você verifique o status?"
 
@@ -5421,7 +5514,6 @@ msgstr "Deseja ser notificado quando este problema for atualizado ou corrigido?"
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Escrever a mensagem inteiramente em letras maiúsculas torna difícil de ler, assim como a falta de pontuação."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5432,12 +5524,12 @@ msgstr "Escrever a mensagem inteiramente em letras maiúsculas torna difícil de
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Sim"
 
@@ -5450,7 +5542,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr "Você está desligado"
 
@@ -5463,7 +5555,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Você está reportando a seguinte atualização por ser abusiva, contendo informações pessoais, ou similar:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr "Pode <a href=\"%s\">criar um novo relatório no mesmo local</a>."
 
@@ -5472,7 +5564,7 @@ msgstr "Pode <a href=\"%s\">criar um novo relatório no mesmo local</a>."
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Você pode <a href=\"%s%s\"> ver o problema neste site </a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Pode adicionar o email de um utilizador abusador à lista de abusos, que oculta automaticamente (e nunca envia) relatórios que eles criem."
 
@@ -5505,7 +5597,7 @@ msgstr "Você pode nos ajudar a encontrar um endereço de e-mail de contato para
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Você pode marcar um organismo como excluído se não quiser que ele seja ativo no site."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5515,7 +5607,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Você recusou, por favor preencha o quadro de cima"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr "Tem <a id=\"oFN\" href=\"\"><span>%s</span> gravados para submeter</a>."
 
@@ -5523,7 +5615,7 @@ msgstr "Tem <a id=\"oFN\" href=\"\"><span>%s</span> gravados para submeter</a>."
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Você já respondeu a este questionário. Se você tem uma pergunta, por favor <a href='%s'> entrar em contato </a>, ou <a href='%s'> ver o seu problema </a>. \n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 #, fuzzy
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Já anexou fotos a este relatório. Atenção que pode anexar no máximo 3 fotos a este relatório (se tentar carregar mais de 3, a mais antiga será removida)."
@@ -5533,8 +5625,7 @@ msgstr "Já anexou fotos a este relatório. Atenção que pode anexar no máximo
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Já anexou fotos a este relatório. Atenção que pode anexar no máximo 3 fotos a este relatório (se tentar carregar mais de 3, a mais antiga será removida)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr "Você já anexou fotos nesta atualização. Atenção que você pode anexar no máximo 3 fotos a esta atualização (se você tentar carregar mais que 3, a mais antiga será removida)."
 
@@ -5601,9 +5692,9 @@ msgstr "Os meus relatórios"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "A minha conta"
@@ -5613,13 +5704,14 @@ msgstr "A minha conta"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr "Desactivar autenticação de dois fatores"
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5648,16 +5740,16 @@ msgstr "Nome"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr "O seu nome já foi enviado para %s, mas podemos ocultá-lo nesta página:"
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr "Seu nome foi oculto de todos os seus relatórios e atualizações."
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr "Seu nome foi ocultado."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr "Os seus relatórios offline"
 
@@ -5678,8 +5770,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr "Faça o login por e-mail, fornecendo uma nova senha. Quando você clica no link do seu email, sua senha será atualizada."
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr "A sua password deverá incluir %d ou mais caractéres."
@@ -5712,7 +5804,7 @@ msgid "Your update"
 msgstr "Atualização"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr "Sua atualização foi salva offline para envio quando voltar a estar online."
 
@@ -5743,19 +5835,19 @@ msgstr "admin"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "todo"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr "um administrador"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr "e um defeito gerado"
 
@@ -5763,8 +5855,8 @@ msgstr "e um defeito gerado"
 msgid "by %s"
 msgstr "por %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "município"
 
@@ -5795,6 +5887,10 @@ msgstr "editar utilizador"
 msgid "from %s different users"
 msgstr "e %s usuários diferentes"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5812,7 +5908,7 @@ msgstr "n / a"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr "nenhuma"
 
@@ -5895,12 +5991,12 @@ msgid "today"
 msgstr "de hoje"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr "atualizar"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr "atualizações"
 
@@ -5925,7 +6021,7 @@ msgid "user removed from abuse list"
 msgstr "utilizador removido da lista de suspenção"
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "departamento"
 
@@ -5985,7 +6081,7 @@ msgid_plural "%d years"
 msgstr[0] "%d ano"
 msgstr[1] "%d anos"
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6006,7 +6102,7 @@ msgid_plural "%s problems reported"
 msgstr[0] "%s problem reportado"
 msgstr[1] "%s problemas reportados"
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6027,21 +6123,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> fixado no mês passado"
 msgstr[1] "<big>%s</big>Arranjado no mês passado"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> Relatório de semana passada"
 msgstr[1] "<big>%s</big> Relatórios da semana passada"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> Relatorio recentemente"
 msgstr[1] "<big>%s</big> Relatorios recentemente"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6076,20 +6172,38 @@ msgid_plural "last updated %d days ago"
 msgstr[0] "atualizado %d dia atrás"
 msgstr[1] "atualizado %d dias atrás"
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mes"
 msgstr[1] "meses"
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] "relatorio"
 msgstr[1] "relatorios"
 
+#~ msgid "Closed by council"
+#~ msgstr "Fechado pelo Município"
+
+#~ msgid "Current token:"
+#~ msgstr "Token atual:"
+
+#~ msgid "Filter report list"
+#~ msgstr "Filtrar relatório"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Agencia_responsavel valor %s inválido"
+
+#~ msgid "Post"
+#~ msgstr "Postar"
+
+#~ msgid "Traffic management required?"
+#~ msgstr "Gestão de tráfego é necessária?"
+
 #~ msgid "(ignored if type is \"String\")"
 #~ msgstr "(ignorado se o tipo for \"String\")"
 
@@ -6102,9 +6216,6 @@ msgstr[1] "relatorios"
 #~ msgid "Automated"
 #~ msgstr "Automatizada"
 
-#~ msgid "Available categories"
-#~ msgstr "Categorias disponíveis"
-
 #~ msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (<code>meta.datatype_description</code>), you must add it in <code>category_extras_fields.html</code>"
 #~ msgstr "Pode ser usado para exibir lateralmente texto extra ao utilizador. Por defeito não é mostrado (<code>meta.datatype_description</code>), terá de adicioná-lo em <code>category_extras_fields.html</code>"
 
diff --git a/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po
index dd50bbcab..d96a8dc8c 100644
--- a/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2020-09-01 17:04-0300\n"
 "Last-Translator: Kennet Calixto <kennet.emerson@gmail.com>\n"
 "Language-Team: English <kde-i18n-doc@kde.org>\n"
@@ -23,15 +23,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.4.1\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714 perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " e "
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:52 templates/web/base/report/new/category_extras.html:17
-#: templates/web/base/report/new/councils_text_all.html:6 templates/web/base/report/new/top_message_none.html:13
-#: templates/web/base/report/new/top_message_none.html:15 templates/web/base/report/new/top_message_some.html:10
+#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/report/new/category_extras.html:17
+#: templates/web/base/report/new/councils_text_all.html:6
+#: templates/web/base/report/new/top_message_none.html:13
+#: templates/web/base/report/new/top_message_none.html:15
+#: templates/web/base/report/new/top_message_some.html:10
 #: templates/web/base/report/new/top_message_some.html:12
 msgid " or "
 msgstr " ou "
@@ -52,8 +56,10 @@ msgstr "%d de %d de %d"
 msgid "%d users already existed"
 msgstr "%d usuários já existem"
 
-#: templates/web/base/dashboard/heatmap.html:0 templates/web/base/dashboard/heatmap.html:9 templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/dashboard/heatmap.html:0
+#: templates/web/base/dashboard/heatmap.html:9
+#: templates/web/base/reports/body.html:0
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "Denúncias resumidas"
 
@@ -70,7 +76,8 @@ msgstr "%s órgãos"
 msgid "%s confirmed alerts, %s unconfirmed"
 msgstr "%s alertas confirmados,%s não confirmados"
 
-#: templates/web/base/status/stats.html:27 templates/web/zurich/admin/index.html:6
+#: templates/web/base/status/stats.html:27
+#: templates/web/zurich/admin/index.html:6
 msgid "%s council contacts &ndash; %s confirmed, %s unconfirmed"
 msgstr "%s contatos de órgãos &ndash; %s confirmado, %s não confirmado"
 
@@ -100,7 +107,8 @@ msgstr ""
 msgid "%s live updates"
 msgstr "%s atualizações"
 
-#: templates/web/base/dashboard/index.html:166 templates/web/base/dashboard/index.html:169
+#: templates/web/base/dashboard/index.html:166
+#: templates/web/base/dashboard/index.html:169
 msgid "%s opened, %s closed, %s fixed"
 msgstr "%s aberto, %s fechado, %s consertado"
 
@@ -112,7 +120,7 @@ msgstr "%s questionários enviados &ndash; %s respondidos (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%sref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contribuidores"
 
@@ -120,11 +128,13 @@ msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap<
 msgid "(Defect &amp; location of defect)"
 msgstr "(Defeito &amp; localização do defeito)"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:50 templates/web/zurich/admin/reports/edit.html:78
+#: templates/web/zurich/admin/report_edit-sdm.html:50
+#: templates/web/zurich/admin/reports/edit.html:78
 msgid "(No name)"
 msgstr "(Sem nome)"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:57 templates/web/zurich/admin/reports/edit.html:85
+#: templates/web/zurich/admin/report_edit-sdm.html:57
+#: templates/web/zurich/admin/reports/edit.html:85
 msgid "(No phone number)"
 msgstr "(Sem número de telefone)"
 
@@ -156,7 +166,10 @@ msgstr "(não existe mais)"
 msgid "(not sent to council)"
 msgstr "(não enviado ao órgão)"
 
-#: templates/web/base/report/new/form_user_loggedin.html:39 templates/web/zurich/report/new/fill_in_details_form.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
+#: templates/web/base/report/new/form_user_loggedin.html:39
+#: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
 msgstr "(opcional)"
 
@@ -173,7 +186,8 @@ msgstr "(enviar ambos)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr "(também temos Feeds RSS para problemas internos %s)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Escolha uma categoria --"
@@ -190,7 +204,8 @@ msgstr "-- Selecione --"
 msgid "--Choose a template--"
 msgstr "-- Escolha um modelo --"
 
-#: templates/web/base/admin/bodies/form.html:50 templates/web/base/admin/bodies/form.html:51
+#: templates/web/base/admin/bodies/form.html:50
+#: templates/web/base/admin/bodies/form.html:51
 msgid ""
 "<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n"
 "              This is probably why \"area covered\" is empty (below).<br>\n"
@@ -201,20 +216,23 @@ msgstr ""
 "              Talvez você deva adicionar<code>MAPIT_TYPES</code> ao seu arquivo de configuração?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr "Denúncias, Estatísticas e Ações para</h2> <h1>%s</h1>"
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23 templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Mostrar</label> %s denúncias <label for=\"filter_categories\">sobre</label> %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> salvo."
 
-#: templates/web/base/status/stats.html:17 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 "<strong>%s</strong> problemas ao vivo"
 
@@ -239,7 +257,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Sim</strong> Eu tenho uma senha"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr "<u>Tire ou escolha uma foto existente</u>"
 
@@ -255,7 +273,8 @@ msgstr "Sobre o problema"
 msgid "Access denied"
 msgstr "Acesso negado"
 
-#: templates/web/base/auth/2fa/intro.html:20 templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/2fa/intro.html:20
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr "Ativar autenticação de duas etapas"
 
@@ -263,7 +282,8 @@ msgstr "Ativar autenticação de duas etapas"
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/web/base/admin/bodies/form.html:3 templates/web/base/admin/bodies/form.html:4
+#: templates/web/base/admin/bodies/form.html:3
+#: templates/web/base/admin/bodies/form.html:4
 msgid ""
 "Add a <strong>body</strong> for each administrative body, such as a council or department\n"
 "          to which problem reports can be sent. You can add one or more contacts (for different\n"
@@ -277,16 +297,18 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Adicione um contato usando o formulário abaixo."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 msgid "Add another parent category"
 msgstr "Adicionar nova categoria pai"
 
-#: templates/web/base/admin/bodies/form.html:139 templates/web/base/admin/bodies/index.html:78
+#: templates/web/base/admin/bodies/form.html:139
+#: templates/web/base/admin/bodies/index.html:78
 #: templates/web/zurich/admin/bodies/form.html:63
 msgid "Add body"
 msgstr "Adicionar corpo"
 
-#: templates/web/base/auth/change_email.html:2 templates/web/base/auth/change_email.html:7
+#: templates/web/base/auth/change_email.html:2
+#: templates/web/base/auth/change_email.html:7
 msgid "Add email address"
 msgstr "Adicionar endereço de e-mail"
 
@@ -302,36 +324,43 @@ msgstr "Adicionar campo"
 msgid "Add fixed state"
 msgstr "Adicionar estado fixo"
 
-#: templates/web/base/admin/bodies/body.html:146 templates/web/zurich/admin/bodies/body.html:33
+#: templates/web/base/admin/bodies/body.html:146
+#: templates/web/zurich/admin/bodies/body.html:33
 msgid "Add new category"
 msgstr "Adicionar nova categoria"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "Adicionar opção"
 
-#: templates/web/base/auth/change_phone.html:2 templates/web/base/auth/change_phone.html:7
+#: templates/web/base/auth/change_phone.html:2
+#: templates/web/base/auth/change_phone.html:7
 msgid "Add phone number"
 msgstr "Adicionar número de telefone"
 
-#: templates/web/base/report/_item.html:10 templates/web/base/report/_item.html:16 templates/web/base/report/_main.html:149
-#: templates/web/base/report/_main.html:25 templates/web/base/report/_main.html:36
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_main.html:149
+#: templates/web/base/report/_main.html:25
+#: templates/web/base/report/_main.html:36
 msgid "Add to shortlist"
 msgstr "Adicione para lista de atalhos"
 
-#: templates/web/base/admin/users/edit.html:4 templates/web/base/admin/users/index.html:95 templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/edit.html:4
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Adicione usuário"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777 perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Adicionar / editar categorias de problemas"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Adicionar / editar prioridades de resposta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Adicionar / editar modelos de resposta"
 
@@ -347,6 +376,12 @@ msgstr "Adicionar esta denúncia à sua lista de atalhos a removerá da lista de
 msgid "Admin"
 msgstr "Administrador"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Novamente:"
@@ -359,7 +394,8 @@ msgstr "Alerta %d criado para %s, tipo %s, parâmetros %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Alerta %d desativado (criado %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46 templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Alerte me para futuras atualizações"
 
@@ -367,11 +403,16 @@ msgstr "Alerte me para futuras atualizações"
 msgid "Alerts:"
 msgstr "Alertas:"
 
-#: templates/web/base/dashboard/index.html:40 templates/web/base/dashboard/index.html:52 templates/web/base/dashboard/index.html:65
-#: templates/web/base/reports/_list-filter-status.html:4 templates/web/zurich/reports/_list-filter-status.html:2
+#: templates/web/base/dashboard/index.html:40
+#: templates/web/base/dashboard/index.html:52
+#: templates/web/base/dashboard/index.html:65
+#: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
+#: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Tudo"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Todos as Denúncias"
@@ -380,7 +421,8 @@ msgstr "Todos as Denúncias"
 msgid "All Reports as CSV"
 msgstr "Todos as denúncias em CSV"
 
-#: templates/web/base/admin/category-multiselect.html:5 templates/web/base/admin/responsepriorities/index.html:26
+#: templates/web/base/admin/category-multiselect.html:5
+#: templates/web/base/admin/responsepriorities/index.html:26
 #: templates/web/base/admin/templates/view.html:19
 msgid "All categories"
 msgstr "Todas categorias"
@@ -393,8 +435,11 @@ msgstr "Todas as cobranças"
 msgid "All languages"
 msgstr "Todas as línguas"
 
-#: templates/web/base/navigation/_all_reports.html:0 templates/web/base/navigation/_all_reports.html:12
-#: templates/web/zurich/admin/index-dm.html:14 templates/web/zurich/admin/stats/index.html:11 templates/web/zurich/footer.html:20
+#: templates/web/base/navigation/_all_reports.html:0
+#: templates/web/base/navigation/_all_reports.html:12
+#: templates/web/zurich/admin/index-dm.html:14
+#: templates/web/zurich/admin/stats/index.html:11
+#: templates/web/zurich/footer.html:20
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Todos as denúncias"
@@ -407,6 +452,11 @@ msgstr "Todas as denúncias entre %s e %s"
 msgid "All time"
 msgstr "Todo o período"
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Esconder denúncias feitas nesta categoria"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr "Já foi relatado?"
@@ -419,7 +469,8 @@ msgstr "Como alternativa, podemos ocultar o seu nome de <strong>todas as suas de
 msgid "Always fetch all problems"
 msgstr "Sempre buscar todos os problemas"
 
-#: templates/web/base/admin/bodies/contact-form.html:10 templates/web/base/admin/bodies/contact-form.html:16
+#: templates/web/base/admin/bodies/contact-form.html:10
+#: templates/web/base/admin/bodies/contact-form.html:16
 msgid "An email address or service ID (Open311 or similar)."
 msgstr "Um endereço de e-mail ou ID de serviço (Open311 ou similar)."
 
@@ -431,94 +482,102 @@ msgstr "Adicionar e-mail."
 msgid "An update marked this problem as fixed."
 msgstr "Uma atualização marcou este problema como solucionado."
 
-#: templates/web/base/admin/list_updates.html:33 templates/web/base/admin/problem_row.html:20
+#: templates/web/base/admin/list_updates.html:33
+#: templates/web/base/admin/problem_row.html:20
 msgid "Anonymous"
 msgstr "Anônimo"
 
-#: templates/web/base/report/new/form_user_loggedin.html:22 templates/web/base/report/update/form_user_loggedin.html:19
+#: templates/web/base/report/new/form_user_loggedin.html:22
+#: templates/web/base/report/update/form_user_loggedin.html:19
 msgid "Anonymous user"
 msgstr "Usuário anônimo"
 
-#: templates/web/base/admin/reports/edit.html:135 templates/web/base/admin/update_edit.html:23
-#: templates/web/base/admin/update_edit.html:96 templates/web/base/report/update/moderation_diff.html:5
+#: templates/web/base/admin/reports/edit.html:148
+#: templates/web/base/admin/update_edit.html:23
+#: templates/web/base/admin/update_edit.html:96
+#: templates/web/base/report/update/moderation_diff.html:5
 msgid "Anonymous:"
 msgstr "Anônimo:"
 
-#: templates/web/base/report/new/form_user_loggedin.html:25 templates/web/base/report/update/form_user_loggedin.html:16
+#: templates/web/base/report/new/form_user_loggedin.html:25
+#: templates/web/base/report/update/form_user_loggedin.html:16
 msgid "Another user"
 msgstr "Outro usuário"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Tem certeza de que deseja cancelar este upload?"
 
 #. ("JS")
-#: templates/web/base/admin/manifesttheme/form.html:62 templates/web/base/admin/reports/edit.html:85
-#: templates/web/base/admin/roles/form.html:25 templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88 templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/manifesttheme/form.html:62
+#: templates/web/base/admin/reports/edit.html:85
+#: templates/web/base/admin/roles/form.html:25
+#: templates/web/base/admin/states/index.html:48
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Você tem certeza?"
 
-#: templates/web/base/admin/bodies/body.html:21 templates/web/base/admin/bodies/form.html:77
+#: templates/web/base/admin/bodies/body.html:21
+#: templates/web/base/admin/bodies/form.html:77
 #: templates/web/zurich/admin/bodies/form.html:36
 msgid "Area covered"
 msgstr "Área coberta"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Área:"
 
-#: templates/web/base/admin/bodies/body.html:65 templates/web/base/admin/bodies/index.html:19
-msgid ""
-"As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for "
-"the report’s category."
-msgstr ""
-"Como este é um site de testes e %s é falso, as denúncias feitas neste site serão enviadas para o relator do problema, não para o "
-"contato fornecido na categoria da denúncia."
+#: templates/web/base/admin/bodies/body.html:65
+#: templates/web/base/admin/bodies/index.html:19
+msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category."
+msgstr "Como este é um site de testes e %s é falso, as denúncias feitas neste site serão enviadas para o relator do problema, não para o contato fornecido na categoria da denúncia."
 
 #: templates/web/base/admin/users/index.html:73
 msgid "Assign selected to role:"
 msgstr "Atribuir usuários à áreas:"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Atribuir ao órgão competente:"
 
-#: templates/web/zurich/admin/reports/edit.html:158 templates/web/zurich/admin/stats/index.html:57
+#: templates/web/zurich/admin/reports/edit.html:162
+#: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Atribuir a uma categoria diferente:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Atribuir a um órgão externo:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Atribuir a subdivisão:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "Atribuir usuários à áreas"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Categorias disponíveis"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Atribuído a: %s"
 
 #: templates/web/base/open311/index.html:76
-msgid ""
-"At most %d requests are returned in each query.  The returned requests are ordered by requested_datetime, so to get all requests, do "
-"several searches with rolling start_date and end_date."
-msgstr ""
-"No máximo %d requisições são retornadas em cada consulta. As requisições retornadas são ordenadas por requested_datetime, e para "
-"pegar todas as requisições, faça várias consultas com start_date e end_date."
+msgid "At most %d requests are returned in each query.  The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date."
+msgstr "No máximo %d requisições são retornadas em cada consulta. As requisições retornadas são ordenadas por requested_datetime, e para pegar todas as requisições, faça várias consultas com start_date e end_date."
 
 #: templates/web/base/open311/index.html:68
 msgid "At the moment only searching for and looking at reports work."
 msgstr "No momento, apenas a pesquisa e a visualização de denúncias funcionam."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr "Usuários autorizados podem ser associados às categorias em que operam."
 
@@ -526,11 +585,11 @@ msgstr "Usuários autorizados podem ser associados às categorias em que operam.
 msgid "Auto Response"
 msgstr "Auto Resposta"
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Auto-repsosta:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr "Preencher automaticamente o detalhe/assunto da denúncia"
 
@@ -542,11 +601,13 @@ msgstr "Tempo médio entre a denúncia de um problema e a solução das últimas
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Evite informações pessoais e números de placa de veículos"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342 templates/web/zurich/report/_item.html:11
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
+#: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Aguardando moderação"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Voltar"
@@ -567,23 +628,31 @@ msgstr "Banir usuário"
 msgid "Behaviour"
 msgstr "Comportamento"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693 perllib/FixMyStreet/Cobrand/Default.pm:776 perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325 perllib/FixMyStreet/Cobrand/Zurich.pm:418 templates/web/base/admin/bodies/index.html:1
-#: templates/web/base/admin/reports/edit.html:56 templates/web/zurich/header.html:52
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
+#: templates/web/base/admin/bodies/index.html:1
+#: templates/web/base/admin/reports/edit.html:56
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Órgãos"
 
-#: templates/web/base/admin/flagged.html:17 templates/web/base/admin/index.html:69 templates/web/base/admin/reports/index.html:15
-#: templates/web/base/admin/users/import.html:25 templates/web/base/admin/users/import.html:48
+#: templates/web/base/admin/flagged.html:17
+#: templates/web/base/admin/index.html:69
+#: templates/web/base/admin/reports/index.html:15
+#: templates/web/base/admin/users/import.html:25
+#: templates/web/base/admin/users/import.html:48
 #: templates/web/base/admin/users/index.html:45
 msgid "Body"
 msgstr "Órgão"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Órgão:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr "Arquivo CSV"
 
@@ -595,23 +664,31 @@ msgstr "Não encontrou nosso e-mail? Cheque sua pasta de spam&nbsp;&ndash; esta
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Não consegue ver o mapa? <em>Pular este passo</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693 perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: templates/web/base/admin/responsepriorities/index.html:8 templates/web/base/admin/templates/view.html:7
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: templates/web/base/admin/responsepriorities/index.html:8
+#: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
 msgstr "Categorias"
 
-#: templates/web/base/admin/category-checkboxes.html:26 templates/web/base/admin/category-multiselect.html:2
+#: templates/web/base/admin/category-checkboxes.html:26
+#: templates/web/base/admin/category-multiselect.html:2
 #: templates/web/base/admin/responsepriorities/edit.html:31
 msgid "Categories:"
 msgstr "Categorias:"
 
-#: templates/web/base/admin/bodies/_category_field.html:12 templates/web/base/admin/bodies/body.html:73
-#: templates/web/base/admin/stats/fix_rate.html:4 templates/web/base/dashboard/index.html:101 templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74 templates/web/base/report/new/category.html:23
-#: templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/bodies/body.html:14
-#: templates/web/zurich/admin/bodies/form.html:25 templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports/index.html:13
-#: templates/web/zurich/admin/stats/index.html:26 templates/web/zurich/admin/stats/index.html:71
+#: templates/web/base/admin/bodies/_category_field.html:12
+#: templates/web/base/admin/bodies/body.html:73
+#: templates/web/base/admin/stats/fix_rate.html:4
+#: templates/web/base/dashboard/index.html:101
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
+#: templates/web/base/report/new/category.html:23
+#: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
+#: templates/web/zurich/admin/bodies/body.html:14
+#: templates/web/zurich/admin/bodies/form.html:25
+#: templates/web/zurich/admin/stats/index.html:26
+#: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
 msgstr "Categoria"
 
@@ -619,38 +696,51 @@ msgstr "Categoria"
 msgid "Category and State"
 msgstr "Categoria e estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Categoria alterada de ‘%s’ para ‘%s’"
 
-#: templates/web/base/admin/stats/fix_rate.html:1 templates/web/base/admin/stats/index.html:14
+#: 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 "Taxa de correção para categoria de problemas > 4 semanas"
 
-#: templates/web/base/admin/reports/edit.html:131 templates/web/base/dashboard/index.html:39
-#: templates/web/base/report/update/moderation_diff.html:7 templates/web/zurich/admin/bodies/contact-form.html:8
-#: templates/web/zurich/admin/report_edit-sdm.html:60 templates/web/zurich/admin/reports/edit.html:88
+#: templates/web/base/admin/reports/edit.html:131
+#: templates/web/base/dashboard/index.html:39
+#: templates/web/base/report/update/moderation_diff.html:7
+#: templates/web/zurich/admin/bodies/contact-form.html:8
+#: templates/web/zurich/admin/report_edit-sdm.html:60
+#: templates/web/zurich/admin/reports/edit.html:88
 msgid "Category:"
 msgstr "Categoria:"
 
-#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 templates/web/base/my/my.html:52 templates/web/base/my/my.html:57
+#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44
+#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57
 msgid "Change"
 msgstr "Alterar"
 
-#: templates/web/base/auth/change_email.html:2 templates/web/base/auth/change_email.html:3
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Alterar senha"
+
+#: templates/web/base/auth/change_email.html:2
+#: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
 msgstr "Alterar e-mail"
 
-#: templates/web/base/auth/change_password.html:2 templates/web/base/auth/change_password.html:5 templates/web/base/my/my.html:64
-#: templates/web/base/my/my.html:68
+#: templates/web/base/auth/change_password.html:2
+#: templates/web/base/auth/change_password.html:5
+#: templates/web/base/my/my.html:64 templates/web/base/my/my.html:68
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/web/base/auth/change_phone.html:2 templates/web/base/auth/change_phone.html:3
+#: templates/web/base/auth/change_phone.html:2
+#: templates/web/base/auth/change_phone.html:3
 msgid "Change phone number"
 msgstr "Alterar o número do telefone"
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr "Ativar autenticação de dois fatores"
 
@@ -658,16 +748,14 @@ msgstr "Ativar autenticação de dois fatores"
 msgid ""
 "Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n"
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
-msgstr ""
-"Escolha o nome de uma <strong>categoria</strong> que faça sentido para o público (por exemplo, \"Buraco na rua\", \"Iluminação pública"
-"\") mas que  também seja útil para o órgão. Elas aparecerão no menu suspenso da página de denunciar um problema."
+msgstr "Escolha o nome de uma <strong>categoria</strong> que faça sentido para o público (por exemplo, \"Buraco na rua\", \"Iluminação pública\") mas que  também seja útil para o órgão. Elas aparecerão no menu suspenso da página de denunciar um problema."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr "Escolher outro(a)"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr "Limpar dados offline"
 
@@ -703,18 +791,19 @@ msgstr "Clique no mapa ou arraste o pino para ajustar a localização"
 msgid "Close"
 msgstr "Fechar"
 
-#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 perllib/FixMyStreet/Cobrand/Zurich.pm:158 perllib/FixMyStreet/Cobrand/Zurich.pm:161
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:72 templates/web/base/admin/states/index.html:103
-#: templates/web/base/admin/states/index.html:27 templates/web/base/admin/states/index.html:33
-#: templates/web/base/dashboard/index.html:118 templates/web/zurich/admin/stats/index.html:52
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:72
+#: templates/web/base/admin/states/index.html:103
+#: templates/web/base/admin/states/index.html:27
+#: templates/web/base/admin/states/index.html:33
+#: templates/web/base/dashboard/index.html:118
+#: templates/web/zurich/admin/stats/index.html:52
 msgid "Closed"
 msgstr "Fechado"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Fechado pelo órgão responsável"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr "Fechado para atualizações"
 
@@ -722,30 +811,37 @@ msgstr "Fechado para atualizações"
 msgid "Co-ordinates:"
 msgstr "Coordenadas:"
 
-#: templates/web/base/admin/list_updates.html:10 templates/web/base/admin/manifesttheme/index.html:6
-#: templates/web/base/admin/reportextrafields/edit.html:24 templates/web/base/admin/reportextrafields/index.html:7
+#: templates/web/base/admin/list_updates.html:10
+#: templates/web/base/admin/manifesttheme/index.html:6
+#: templates/web/base/admin/reportextrafields/edit.html:24
+#: templates/web/base/admin/reportextrafields/index.html:7
 msgid "Cobrand"
 msgstr "Multimarca"
 
-#: templates/web/base/admin/reports/edit.html:99 templates/web/base/admin/update_edit.html:54
+#: templates/web/base/admin/reports/edit.html:99
+#: templates/web/base/admin/update_edit.html:54
 msgid "Cobrand data:"
 msgstr "Dados multimarca:"
 
-#: templates/web/base/admin/reports/edit.html:98 templates/web/base/admin/update_edit.html:53
+#: templates/web/base/admin/reports/edit.html:98
+#: templates/web/base/admin/update_edit.html:53
 msgid "Cobrand:"
 msgstr "Multimarca:"
 
-#: templates/web/base/admin/extra-metadata-item.html:29 templates/web/base/auth/2fa/form-add.html:11
-#: templates/web/base/auth/2fa/form.html:17 templates/web/base/auth/smsform.html:24
+#: templates/web/base/admin/extra-metadata-item.html:29
+#: templates/web/base/auth/2fa/form-add.html:11
+#: templates/web/base/auth/2fa/form.html:17
+#: templates/web/base/auth/smsform.html:24
 msgid "Code"
 msgstr "Código"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr "Recolher mapa"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687 perllib/FixMyStreet/Cobrand/KiitC.pm:321 perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Configuração"
@@ -754,7 +850,8 @@ msgstr "Configuração"
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: templates/web/base/auth/2fa/form.html:1 templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1
+#: templates/web/base/auth/2fa/form.html:1
+#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1
 msgid "Confirm account"
 msgstr "Confirmar conta"
 
@@ -762,18 +859,23 @@ msgstr "Confirmar conta"
 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated."
 msgstr "Confirme por e-mail, fornecendo uma nova senha nesse ponto. Quando você confirmar, sua senha será atualizada."
 
-#: templates/web/base/questionnaire/creator_fixed.html:1 templates/web/base/tokens/confirm_problem.html:1
-#: templates/web/base/tokens/confirm_update.html:1 templates/web/zurich/tokens/confirm_problem.html:1
+#: templates/web/base/questionnaire/creator_fixed.html:1
+#: templates/web/base/tokens/confirm_problem.html:1
+#: templates/web/base/tokens/confirm_update.html:1
+#: templates/web/zurich/tokens/confirm_problem.html:1
 #: templates/web/zurich/tokens/confirm_problem.html:3
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: templates/web/base/admin/bodies/contact-form.html:30 templates/web/base/admin/users/alerts.html:10
-#: templates/web/zurich/admin/bodies/contact-form.html:39 templates/web/zurich/admin/stats/index.html:61
+#: templates/web/base/admin/bodies/contact-form.html:30
+#: templates/web/base/admin/users/alerts.html:10
+#: templates/web/zurich/admin/bodies/contact-form.html:39
+#: templates/web/zurich/admin/stats/index.html:61
 msgid "Confirmed"
 msgstr "Confirmado"
 
-#: templates/web/base/admin/list_updates.html:40 templates/web/base/admin/problem_row.html:36
+#: templates/web/base/admin/list_updates.html:40
+#: templates/web/base/admin/problem_row.html:36
 #: templates/web/base/admin/reports/edit.html:79
 msgid "Confirmed:"
 msgstr "Confirmado:"
@@ -783,7 +885,9 @@ msgstr "Confirmado:"
 msgid "Contact %s"
 msgstr "Contato"
 
-#: templates/web/base/contact/index.html:4 templates/web/base/contact/index.html:5 templates/web/base/contact/submit.html:1
+#: templates/web/base/contact/index.html:4
+#: templates/web/base/contact/index.html:5
+#: templates/web/base/contact/submit.html:1
 msgid "Contact Us"
 msgstr "Contate-nos"
 
@@ -792,7 +896,8 @@ msgid "Contact the team"
 msgstr "Contactar o time"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:62 templates/web/base/report/form/user.html:8
+#: templates/web/base/js/translation_strings.html:62
+#: templates/web/base/report/form/user.html:8
 msgid "Continue"
 msgstr "Continuar"
 
@@ -804,7 +909,8 @@ msgstr "Continuar - denunciar um novo problema"
 msgid "Convert location from Easting/Northing"
 msgstr "Converter localização de Leste/Norte"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:723 perllib/FixMyStreet/App/Controller/Admin/Users.pm:753
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:723
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:753
 msgid "Could not find user"
 msgstr "Não foi possível encontrar o usuário"
 
@@ -817,8 +923,10 @@ msgstr "Não foi possível encontrar a localização"
 msgid "Council"
 msgstr "Órgão"
 
-#: templates/web/base/admin/bodies/body.html:1 templates/web/base/admin/bodies/body.html:2
-#: templates/web/base/admin/bodies/category.html:1 templates/web/base/admin/bodies/category.html:2
+#: templates/web/base/admin/bodies/body.html:1
+#: templates/web/base/admin/bodies/body.html:2
+#: templates/web/base/admin/bodies/category.html:1
+#: templates/web/base/admin/bodies/category.html:2
 #: templates/web/zurich/admin/bodies/body.html:1
 msgid "Council contacts for %s"
 msgstr "Contratos municipais para %s"
@@ -831,11 +939,13 @@ msgstr "Ref municipal:&nbsp;%s"
 msgid "Council:"
 msgstr "Órgão responsável:"
 
-#: templates/web/zurich/admin/stats/index.html:66 templates/web/zurich/admin/stats/index.html:71
+#: templates/web/zurich/admin/stats/index.html:66
+#: templates/web/zurich/admin/stats/index.html:71
 msgid "Count"
 msgstr "Contar"
 
-#: templates/web/base/admin/manifesttheme/index.html:31 templates/web/base/admin/roles/index.html:32
+#: templates/web/base/admin/manifesttheme/index.html:31
+#: templates/web/base/admin/roles/index.html:32
 #: templates/web/base/admin/states/index.html:114
 msgid "Create"
 msgstr "Criar"
@@ -848,31 +958,36 @@ msgstr "Criar uma denúncia"
 msgid "Create an account"
 msgstr "Criar uma conta"
 
-#: templates/web/base/admin/bodies/contact-form.html:131 templates/web/zurich/admin/bodies/contact-form.html:51
+#: templates/web/base/admin/bodies/contact-form.html:164
+#: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Criar uma categoria"
 
-#: templates/web/base/admin/responsepriorities/edit.html:41 templates/web/base/admin/responsepriorities/index.html:41
+#: templates/web/base/admin/responsepriorities/edit.html:41
+#: templates/web/base/admin/responsepriorities/index.html:41
 msgid "Create priority"
 msgstr "Criar prioridade"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765 perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr "Criar denúncias/atualizações como usuário anônimo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766 perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "Criar denúncias/atualizações como o órgão"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764 perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "Criar denúncia/atualização em nome de um usuário"
 
-#: templates/web/base/admin/templates/edit.html:84 templates/web/zurich/admin/templates/edit.html:32
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Criar template"
 
-#: templates/web/base/admin/problem_row.html:34 templates/web/zurich/admin/templates/view.html:10
+#: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
+#: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Criado"
 
@@ -880,8 +995,21 @@ msgstr "Criado"
 msgid "Created %d new users"
 msgstr "%d novos usuários criados"
 
-#: templates/web/base/admin/list_updates.html:39 templates/web/base/admin/reports/edit.html:78
-#: templates/web/base/admin/update_edit.html:55 templates/web/zurich/admin/update_edit.html:29
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Criado"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Criado"
+
+#: templates/web/base/admin/list_updates.html:39
+#: templates/web/base/admin/reports/edit.html:78
+#: templates/web/base/admin/update_edit.html:55
+#: templates/web/zurich/admin/update_edit.html:29
 msgid "Created:"
 msgstr "Criado:"
 
@@ -889,28 +1017,30 @@ msgstr "Criado:"
 msgid "Current password:"
 msgstr "Senha atual:"
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr "Código de acesso atual:"
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr "Atualmente agrupado por %s"
 
-#: templates/web/base/admin/bodies/index.html:9 templates/web/base/admin/index.html:17
+#: templates/web/base/admin/bodies/index.html:9
+#: templates/web/base/admin/index.html:17
 msgid "Currently no bodies have been created."
 msgstr "Atualmente nenhum corpo foi criado."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Cliente não contatável"
 
-#: templates/web/base/dashboard/index.html:8 templates/web/base/dashboard/index.html:9 templates/web/base/reports/index.html:15
+#: templates/web/base/dashboard/index.html:8
+#: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
+#: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Painel de Controle"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr "Desativar autenticação de duas etapas"
 
@@ -922,15 +1052,17 @@ msgstr "Processado por subdivisão em 5 dias úteis"
 msgid "Default"
 msgstr "Padrão"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr "Padrão para criação de denúncias/atualizações como o: órgão"
 
-#: templates/web/base/admin/roles/form.html:25 templates/web/base/admin/users/alerts.html:15
+#: templates/web/base/admin/roles/form.html:25
+#: templates/web/base/admin/users/alerts.html:15
 msgid "Delete"
 msgstr "Excluír"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79 templates/web/base/admin/templates/edit.html:88
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Deletar template"
@@ -939,17 +1071,19 @@ msgstr "Deletar template"
 msgid "Delete theme"
 msgstr "Deletar tema"
 
-#: templates/web/base/admin/bodies/contact-form.html:40 templates/web/base/admin/bodies/index.html:31
+#: templates/web/base/admin/bodies/contact-form.html:40
+#: templates/web/base/admin/bodies/index.html:31
 #: templates/web/zurich/admin/bodies/contact-form.html:41
 msgid "Deleted"
 msgstr "Deletado"
 
-#: templates/web/base/report/_main.html:125 templates/web/base/report/update.html:56
+#: templates/web/base/report/_main.html:125
+#: templates/web/base/report/update.html:56
 msgid "Describe why you are moderating this"
 msgstr "Descreva por que você está moderando isto"
 
-#: templates/web/base/admin/responsepriorities/index.html:7 templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports/index.html:12
+#: templates/web/base/admin/responsepriorities/index.html:7
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Descrição"
 
@@ -957,18 +1091,21 @@ msgstr "Descrição"
 msgid "Destination"
 msgstr "Destino"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr "Informações detalhadas são limitadas a %d caracteres."
 
 #. ("JS")
-#: templates/web/base/admin/users/alerts.html:12 templates/web/base/js/translation_strings.html:47
+#: templates/web/base/admin/users/alerts.html:12
+#: templates/web/base/js/translation_strings.html:47
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
 msgid "Details"
 msgstr "Detalhes"
 
-#: templates/web/base/admin/reports/edit.html:124 templates/web/base/report/update/moderation_diff.html:3
-#: templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/reports/edit.html:31
+#: templates/web/base/admin/reports/edit.html:124
+#: templates/web/base/report/update/moderation_diff.html:3
+#: templates/web/zurich/admin/report_edit-sdm.html:29
+#: templates/web/zurich/admin/reports/edit.html:31
 #: templates/web/zurich/admin/reports/edit.html:45
 msgid "Details:"
 msgstr "Detalhes:"
@@ -989,7 +1126,8 @@ msgstr "Tabela da liga de prêmios de diligência"
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: templates/web/base/admin/bodies/contact-form.html:58 templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/bodies/contact-form.html:58
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr "Desabilitar formulário quando esta categoria é selecionada"
 
@@ -997,11 +1135,22 @@ msgstr "Desabilitar formulário quando esta categoria é selecionada"
 msgid "Disable form when this option is selected"
 msgstr "Desabilitar formulário quando esta opção é selecionada"
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Esconder denúncias feitas nesta categoria"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Esconder denúncias feitas nesta categoria"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr "Desabilitado:"
 
-#: templates/web/base/report/_main.html:130 templates/web/base/report/update.html:59
+#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/update.html:59
 msgid "Discard changes"
 msgstr "Descartar mudanças"
 
@@ -1030,24 +1179,24 @@ msgstr "Não sabe"
 msgid "Don't like forms?"
 msgstr "Não gosta de formulários?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr "Descer um"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Arraste e solte as fotos aqui ou <u>clique para enviar</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr "Menu Suspenso"
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr "Duplicado de"
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr "Duplicados"
 
@@ -1063,27 +1212,34 @@ msgstr ""
 "            Isso significa que você pode adicionar muitas categorias, mesmo se você tiver apenas um contato para o órgão.\n"
 "     "
 
-#: templates/web/base/report/_item.html:65 templates/web/base/report/inspect/information.html:22
+#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr "Leste/Norte:"
 
-#: templates/web/base/admin/list_updates.html:44 templates/web/base/admin/manifesttheme/index.html:22
-#: templates/web/base/admin/problem_row.html:43 templates/web/base/admin/responsepriorities/index.html:34
-#: templates/web/base/admin/roles/index.html:24 templates/web/base/admin/templates/view.html:31
-#: templates/web/base/admin/users/index.html:67 templates/web/zurich/admin/problem_row.html:49
+#: templates/web/base/admin/list_updates.html:44
+#: templates/web/base/admin/manifesttheme/index.html:22
+#: templates/web/base/admin/problem_row.html:43
+#: templates/web/base/admin/responsepriorities/index.html:34
+#: templates/web/base/admin/roles/index.html:24
+#: templates/web/base/admin/templates/view.html:31
+#: templates/web/base/admin/users/index.html:67
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/web/base/admin/bodies/body.html:161 templates/web/base/admin/index.html:43 templates/web/zurich/admin/bodies/body.html:47
+#: templates/web/base/admin/bodies/body.html:161
+#: templates/web/base/admin/index.html:43
+#: templates/web/zurich/admin/bodies/body.html:47
 msgid "Edit body details"
 msgstr "Editar detalhes do órgão"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772 perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "Editar a permissão de outros usuários"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Editar categoria da denúncia"
 
@@ -1091,15 +1247,15 @@ msgstr "Editar categoria da denúncia"
 msgid "Edit report details"
 msgstr "Editar detalhes da denúncia"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Editar prioridade da denúncia"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756 perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Editar denúncias"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771 perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr "Editar os detalhes dos usuários/pesquisas para suas denúncias"
 
@@ -1107,14 +1263,18 @@ msgstr "Editar os detalhes dos usuários/pesquisas para suas denúncias"
 msgid "Edit your update"
 msgstr "Editar sua atualização"
 
-#: templates/web/base/admin/reports/edit.html:0 templates/web/base/admin/reports/edit.html:15
-#: templates/web/base/admin/reports/edit.html:6 templates/web/zurich/admin/report_edit-sdm.html:2
-#: templates/web/zurich/admin/report_edit-sdm.html:6 templates/web/zurich/admin/reports/edit.html:2
+#: templates/web/base/admin/reports/edit.html:0
+#: templates/web/base/admin/reports/edit.html:15
+#: templates/web/base/admin/reports/edit.html:6
+#: templates/web/zurich/admin/report_edit-sdm.html:2
+#: templates/web/zurich/admin/report_edit-sdm.html:6
+#: templates/web/zurich/admin/reports/edit.html:2
 #: templates/web/zurich/admin/reports/edit.html:6
 msgid "Editing problem %d"
 msgstr "Editando problema %d"
 
-#: templates/web/base/admin/update_edit.html:1 templates/web/zurich/admin/update_edit.html:1
+#: templates/web/base/admin/update_edit.html:1
+#: templates/web/zurich/admin/update_edit.html:1
 msgid "Editing update %d"
 msgstr "Editando atualização %d"
 
@@ -1126,20 +1286,31 @@ msgstr "Editando usuário %d"
 msgid "Editor"
 msgstr "Editor"
 
-#: templates/web/base/admin/bodies/category.html:29 templates/web/base/admin/bodies/index.html:27
-#: templates/web/base/admin/flagged.html:38 templates/web/base/admin/users/import.html:24 templates/web/base/admin/users/import.html:47
-#: templates/web/base/admin/users/index.html:44 templates/web/base/alert/updates.html:21 templates/web/base/report/display_tools.html:50
-#: templates/web/base/report/new/duplicate_suggestions.html:33 templates/web/zurich/admin/bodies/body.html:15
-#: templates/web/zurich/admin/bodies/form.html:9 templates/web/zurich/auth/general.html:14 templates/web/zurich/auth/general.html:37
+#: templates/web/base/admin/bodies/category.html:29
+#: templates/web/base/admin/bodies/index.html:27
+#: templates/web/base/admin/flagged.html:38
+#: templates/web/base/admin/users/import.html:24
+#: templates/web/base/admin/users/import.html:47
+#: templates/web/base/admin/users/index.html:44
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
+#: templates/web/base/report/new/duplicate_suggestions.html:33
+#: templates/web/zurich/admin/bodies/body.html:15
+#: templates/web/zurich/admin/bodies/form.html:9
+#: templates/web/zurich/auth/general.html:14
+#: templates/web/zurich/auth/general.html:37
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/web/base/alert/_list.html:69 templates/web/base/auth/change_email.html:37
-#: templates/web/base/report/new/form_user_loggedin.html:39 templates/web/base/report/update/form_user_loggedin.html:25
+#: templates/web/base/alert/_list.html:70
+#: templates/web/base/auth/change_email.html:37
+#: templates/web/base/report/new/form_user_loggedin.html:39
+#: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Endereço de e-mail"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38 templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr "Endereço de e-mail (opcional)"
 
@@ -1159,11 +1330,13 @@ msgstr "Me envie um e-mail ou um código por mensagem de texto para entrar"
 msgid "Email me a link to sign in"
 msgstr "Me envie um e-mail para entrar"
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "E-mail verificado:"
 
-#: templates/web/base/admin/reports/edit.html:151 templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "E-mail:"
@@ -1172,7 +1345,8 @@ msgstr "E-mail:"
 msgid "Enable"
 msgstr "Habilitar"
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:156 templates/web/base/admin/bodies/open311-form-fields.html:157
+#: templates/web/base/admin/bodies/open311-form-fields.html:156
+#: templates/web/base/admin/bodies/open311-form-fields.html:157
 msgid ""
 "Enable <strong>Always fetch all problems</strong> if you've enabled Open311 problem-fetching above\n"
 "                and the endpoint always returns a list of all problems. This will suppress error messages about\n"
@@ -1182,7 +1356,8 @@ msgstr ""
 "                e o endereço sempre retornará uma lista de todos os problemas. Isso suprimirá mensagens de erro sobre\n"
 "                dados ruins nos problemas buscados."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:143 templates/web/base/admin/bodies/open311-form-fields.html:144
+#: templates/web/base/admin/bodies/open311-form-fields.html:143
+#: templates/web/base/admin/bodies/open311-form-fields.html:144
 msgid ""
 "Enable <strong>Convert location from Easting/Northing</strong> if you've enabled Open311 problem-fetching above\n"
 "                and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude."
@@ -1190,7 +1365,8 @@ msgstr ""
 "Habilite <strong>Converter localização de Leste / Norte</strong> se você habilitou a busca de problemas do Open311 acima\n"
 "                e os problemas buscados têm a localização em Leste / Norte e não em Latitude / Longitude."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:127 templates/web/base/admin/bodies/open311-form-fields.html:128
+#: templates/web/base/admin/bodies/open311-form-fields.html:127
+#: templates/web/base/admin/bodies/open311-form-fields.html:128
 msgid ""
 "Enable <strong>Open311 problem-fetching</strong> if you want to display reports created at\n"
 "          the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n"
@@ -1202,7 +1378,8 @@ msgstr ""
 "          Para obter mais informações, consulte \n"
 "          <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>este artigo</a>."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:66 templates/web/base/admin/bodies/open311-form-fields.html:67
+#: templates/web/base/admin/bodies/open311-form-fields.html:66
+#: templates/web/base/admin/bodies/open311-form-fields.html:67
 msgid ""
 "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n"
 "          updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n"
@@ -1210,12 +1387,12 @@ msgid ""
 "          <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>."
 msgstr ""
 "Habilite o <strong>envio de atualizações do Open311</strong> se o caminho envia e recebe\n"
-"          atualizações para denúncias existentes. Se você não tem certeza, provavelmente não deve habilitar, então deixe isso "
-"desmarcado.\n"
+"          atualizações para denúncias existentes. Se você não tem certeza, provavelmente não deve habilitar, então deixe isso desmarcado.\n"
 "          Para obter mais informações, consulte \n"
 "          <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>este artigo</a>."
 
-#: templates/web/base/admin/bodies/form.html:121 templates/web/base/admin/bodies/form.html:122
+#: templates/web/base/admin/bodies/form.html:121
+#: templates/web/base/admin/bodies/form.html:122
 msgid ""
 "Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n"
 "          different endpoint (and send method) from the body's. For example, if reports for some categories of\n"
@@ -1225,7 +1402,8 @@ msgstr ""
 "          caminho diferente (e método de envio) do órgão. Por exemplo, se as denúncias para algumas categorias de\n"
 "          problema deve ser enviado por e-mail, enquanto outros podem ser enviados pelo Open311."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:54 templates/web/base/admin/bodies/open311-form-fields.html:55
+#: templates/web/base/admin/bodies/open311-form-fields.html:54
+#: templates/web/base/admin/bodies/open311-form-fields.html:55
 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description"
 msgstr "Habilitar isto irá suprimir a mensagem de erro que normalmente é mostrada quando uma atualização não tem descrição"
 
@@ -1237,15 +1415,16 @@ msgstr "Data Final"
 msgid "Endpoint"
 msgstr "Endereço"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
 msgstr "Digite um nome da rua"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Digite um CEP próximo a sua região, ou nome de rua e bairro"
 
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21
 msgid "Enter a nearby postcode, or street name and area"
 msgstr "Especifique um CEP, Nome de Rua ou Bairro"
 
@@ -1258,17 +1437,24 @@ msgid "Enter details of the problem"
 msgstr "Digite detalhes do problema"
 
 #. ("JS")
-#: templates/web/base/errors/generic.html:1 templates/web/base/js/translation_strings.html:7 templates/web/base/tokens/abuse.html:1
-#: templates/web/base/tokens/abuse.html:3 templates/web/base/tokens/error.html:1 templates/web/base/tokens/error.html:5
+#: templates/web/base/errors/generic.html:1
+#: templates/web/base/js/translation_strings.html:7
+#: templates/web/base/tokens/abuse.html:1
+#: templates/web/base/tokens/abuse.html:3
+#: templates/web/base/tokens/error.html:1
+#: templates/web/base/tokens/error.html:5
 msgid "Error"
 msgstr "Erro"
 
-#: templates/web/base/admin/triage/_list-filters.html:12 templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16 templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:13
+#: templates/web/base/admin/triage/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Tudo"
 
-#: templates/web/base/admin/bodies/body.html:19 templates/web/base/admin/bodies/category.html:19
+#: templates/web/base/admin/bodies/body.html:19
+#: templates/web/base/admin/bodies/category.html:19
 msgid "Example postcode %s"
 msgstr "CEP exemplo %s"
 
@@ -1276,7 +1462,7 @@ msgstr "CEP exemplo %s"
 msgid "Examples:"
 msgstr "Exemplos:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Categoria existente"
 
@@ -1285,7 +1471,7 @@ msgid "Existing users won't be modified."
 msgstr "Usuários existentes não serão modificados."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr "Expandir mapa"
 
@@ -1309,7 +1495,8 @@ msgstr "URL Externa"
 msgid "External body"
 msgstr "Corpo externo"
 
-#: templates/web/base/admin/reports/edit.html:112 templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/reports/edit.html:112
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr "Código de status externo"
 
@@ -1321,17 +1508,21 @@ msgstr "Código de status externo:"
 msgid "External team"
 msgstr "Time externo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718 templates/web/base/admin/reportextrafields/edit.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
+#: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "Campos Extras"
 
-#: 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
+#: templates/web/base/admin/bodies/contact-form.html:146
+#: templates/web/base/admin/reports/edit.html:134
+#: templates/web/base/admin/update_edit.html:97
+#: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Dados extra:"
 
-#: templates/web/base/report/_item.html:90 templates/web/base/report/inspect/_extra_details_field.html:2
+#: templates/web/base/report/_item.html:99
+#: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
 msgstr "Detalhes extras"
@@ -1348,7 +1539,8 @@ msgstr "Questão extra mostrada ao usuário"
 msgid "Failed to send message"
 msgstr "Falhou ao enviar a mensagem"
 
-#: templates/web/base/admin/reportextrafields/edit.html:58 templates/web/base/admin/reportextrafields/index.html:9
+#: templates/web/base/admin/reportextrafields/edit.html:58
+#: templates/web/base/admin/reportextrafields/index.html:9
 msgid "Fields"
 msgstr "Campos"
 
@@ -1356,29 +1548,39 @@ msgstr "Campos"
 msgid "File type not recognised. Please upload an image."
 msgstr "Tipo de arquivo não reconhecido. Por favor, carregue uma imagem."
 
-#: templates/web/base/report/form/user_loggedout_password.html:21 templates/web/base/report/form/user_loggedout_password.html:8
+#: templates/web/base/report/form/user_loggedout_password.html:21
+#: templates/web/base/report/form/user_loggedout_password.html:8
 msgid "Fill in your details manually."
 msgstr "Preencha seus detalhes manualmente."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr "Filtro"
 
-#: templates/web/zurich/admin/index-dm.html:35 templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filtrar lista de denúncias"
-
-#: templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:68
+#: templates/web/base/questionnaire/creator_fixed.html:16
+#: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Primeira vez"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Fotos das denúncias recentes nas proximidades"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Novas denúncias"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Corriga isto escolhendo uma <strong>área coberta</strong> no formulário <em>Editar detalhes do órgão</em> abaixo."
 
-#: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:179
-#: templates/web/base/admin/states/index.html:29 templates/web/base/admin/stats/fix_rate.html:4
+#: perllib/FixMyStreet/App/Controller/Admin/States.pm:35
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:179
+#: templates/web/base/admin/states/index.html:29
+#: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:119
 msgid "Fixed"
 msgstr "Resolvido"
@@ -1391,7 +1593,8 @@ msgstr "Resolvido - Órgão"
 msgid "Fixed - User"
 msgstr "Resolvido - Usuário"
 
-#: templates/web/base/admin/bodies/form.html:96 templates/web/zurich/admin/bodies/form.html:47
+#: templates/web/base/admin/bodies/form.html:96
+#: templates/web/zurich/admin/bodies/form.html:47
 msgid "Flag as deleted"
 msgstr "Marcar como deletado"
 
@@ -1399,7 +1602,8 @@ msgstr "Marcar como deletado"
 msgid "Flag user"
 msgstr "Marcar usuário"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685 templates/web/base/admin/users/index.html:47
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
+#: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Marcado"
 
@@ -1407,7 +1611,7 @@ msgstr "Marcado"
 msgid "Flagged reports and users"
 msgstr "Usuários e denúncias marcadas"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Usuários marcados são listados na página <a href='%s'>de marcação</a>."
 
@@ -1415,7 +1619,8 @@ msgstr "Usuários marcados são listados na página <a href='%s'>de marcação</
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Os usuários marcados não são restritos de forma alguma. Esta é apenas uma lista de usuários que foram marcados para atenção."
 
-#: templates/web/base/admin/reports/edit.html:155 templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Marcado:"
 
@@ -1428,57 +1633,69 @@ msgid "For best results include a close-up and a wide shot"
 msgstr "Para melhores resultados inclua fotos de perto e na horizontal"
 
 #: templates/web/base/admin/bodies/form.html:73
-msgid ""
-"For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses "
-"Mapit</a>."
-msgstr ""
-"Para mais informações, veja <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Como o "
-"AjeitaMinhaRua usa Mapit</a>."
+msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
+msgstr "Para mais informações, veja <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Como o AjeitaMinhaRua usa Mapit</a>."
 
 #: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:3
 msgid "Forgot password"
 msgstr "Esqueceu a senha"
 
-#: templates/web/base/auth/general.html:98 templates/web/base/report/form/user_loggedout_password.html:20
+#: templates/web/base/auth/general.html:98
+#: templates/web/base/report/form/user_loggedout_password.html:20
 #: templates/web/base/report/form/user_loggedout_password.html:25
 msgid "Forgotten your password?"
 msgstr "Esqueceu sua senha?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Encaminhado ao órgão externo"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Desejo encaminhado para órgão externo"
 
-#: templates/web/base/about/_sidebar.html:4 templates/web/base/about/faq-en-gb.html:1 templates/web/base/about/faq-en-gb.html:5
+#: templates/web/base/about/_sidebar.html:4
+#: templates/web/base/about/faq-en-gb.html:1
+#: templates/web/base/about/faq-en-gb.html:5
 msgid "Frequently Asked Questions"
 msgstr "Perguntas Frequentes"
 
-#: templates/web/base/contact/enquiry/index.html:1 templates/web/base/contact/enquiry/index.html:3
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
+#: templates/web/base/contact/enquiry/index.html:1
+#: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr "Inquérito geral"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr "Gerar token"
 
-#: templates/web/base/around/_updates.html:3 templates/web/base/report/display_tools.html:15
-#: templates/web/base/report/new/duplicate_suggestions.html:36 templates/web/base/report/new/duplicate_suggestions.html:39
+#: templates/web/base/around/_updates.html:3
+#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/new/duplicate_suggestions.html:36
+#: templates/web/base/report/new/duplicate_suggestions.html:39
 #: templates/web/base/report/new/duplicate_suggestions.html:45
 msgid "Get updates"
 msgstr "Receber atualizações"
 
-#: templates/web/base/reports/_rss.html:12 templates/web/base/reports/_rss.html:4
+#: templates/web/base/reports/_rss.html:12
+#: templates/web/base/reports/_rss.html:4
 msgid "Get updates of %s problems"
 msgstr "Receber atualizações de %s problemas"
 
-#: templates/web/base/reports/_rss.html:14 templates/web/base/reports/_rss.html:4
+#: templates/web/base/reports/_rss.html:14
+#: templates/web/base/reports/_rss.html:4
 msgid "Get updates of problems in this %s"
 msgstr "Receber atualizações de problemas em %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Incluir em um Feed RSS"
 
@@ -1490,13 +1707,21 @@ msgstr "Dê um nome a essa coleção de campos. Ela não é mostrado publicament
 msgid "Glad to hear it’s been fixed!"
 msgstr "Ficamos felizes em saber que foi solucionado!"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/index.html:37 templates/web/base/admin/index.html:54
-#: templates/web/base/admin/responsepriorities/index.html:48 templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39 templates/web/base/admin/triage/_list-filters.html:45
-#: templates/web/base/admin/users/index.html:32 templates/web/base/around/_postcode_submit_button.html:2
-#: templates/web/base/around/_postcode_submit_button.html:5 templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40 templates/web/base/reports/_list-filters.html:49
-#: templates/web/base/reports/index.html:89 templates/web/zurich/admin/stats/index.html:37
+#: templates/web/base/admin/index.html:29
+#: templates/web/base/admin/index.html:37
+#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/responsepriorities/index.html:48
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
+#: templates/web/base/admin/users/index.html:32
+#: templates/web/base/around/_postcode_submit_button.html:2
+#: templates/web/base/around/_postcode_submit_button.html:5
+#: templates/web/base/reports/_list-filters-sort.html:13
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
+#: templates/web/base/reports/index.html:89
+#: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
 msgstr "Ir"
 
@@ -1504,7 +1729,7 @@ msgstr "Ir"
 msgid "Going to send questionnaire?"
 msgstr "Vai enviar questionário?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr "Garantir acesso ao administrador"
 
@@ -1528,22 +1753,23 @@ msgstr "Este problema foi solucionado?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Você já denunciou um problema para um município antes, ou esta é sua primeira vez?"
 
-#: templates/web/base/admin/stats/index.html:17 templates/web/base/admin/stats/index.html:23
+#: templates/web/base/admin/stats/index.html:17
+#: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr "Mapa de calor"
 
-#: 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/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 "Ajuda"
 
-#: templates/web/base/report/new/category_extras.html:17 templates/web/base/report/new/category_extras.html:18
-msgid ""
-"Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published "
-"online."
-msgstr ""
-"Ajude <string>%s</strong> a resolver seu problema mais rápido, fornecendo alguns detalhes extras. Estas informações não serão "
-"publicadas no site."
+#: templates/web/base/report/new/category_extras.html:17
+#: templates/web/base/report/new/category_extras.html:18
+msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online."
+msgstr "Ajude <string>%s</strong> a resolver seu problema mais rápido, fornecendo alguns detalhes extras. Estas informações não serão publicadas no site."
 
 #: templates/web/base/around/on_map_list_items.html:8
 msgid "Here are some other nearby reports:"
@@ -1553,8 +1779,10 @@ msgstr "Aqui estão algumas das denúncias nas redondezas:"
 msgid "Hi %s"
 msgstr "Oi %s"
 
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 templates/web/base/admin/update_edit.html:30
-#: templates/web/zurich/admin/stats/index.html:53 templates/web/zurich/admin/update_edit.html:18
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:65
+#: templates/web/base/admin/update_edit.html:30
+#: templates/web/zurich/admin/stats/index.html:53
+#: templates/web/zurich/admin/update_edit.html:18
 msgid "Hidden"
 msgstr "Escondido"
 
@@ -1562,7 +1790,8 @@ msgstr "Escondido"
 msgid "Hidden data in reporting form"
 msgstr "Dados ocultos no formulário de denúncia"
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr "Esconder todas as denúncias e atualizações"
 
@@ -1570,7 +1799,8 @@ msgstr "Esconder todas as denúncias e atualizações"
 msgid "Hide entire report"
 msgstr "Esconder toda a denúncia"
 
-#: templates/web/base/my/anonymize.html:1 templates/web/base/my/anonymize.html:2
+#: templates/web/base/my/anonymize.html:1
+#: templates/web/base/my/anonymize.html:2
 msgid "Hide my name"
 msgstr "Esconder meu nome"
 
@@ -1587,8 +1817,9 @@ msgid "Hide my name on this report"
 msgstr "Esconder meu nome nesta denúncia"
 
 #. ("JS")
-#: templates/web/base/around/display_location.html:65 templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/around/display_location.html:65
+#: templates/web/base/around/display_location.html:73
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Esconder marcadores"
 
@@ -1600,7 +1831,8 @@ msgstr "Esconder denúncias feitas nesta categoria"
 msgid "Hide update completely?"
 msgstr "Esconder toda a atualização?"
 
-#: templates/web/base/report/_report_meta_info.html:3 templates/web/base/report/_update_state.html:16
+#: templates/web/base/report/_report_meta_info.html:3
+#: templates/web/base/report/_update_state.html:16
 msgid "Hide your name?"
 msgstr "Esconder seu nome?"
 
@@ -1621,11 +1853,13 @@ msgstr "Como denunciar um problema"
 msgid "How to send successful reports"
 msgstr "Como enviar denúncias com sucesso"
 
-#: templates/web/base/tokens/confirm_problem.html:46 templates/web/base/tokens/confirm_problem.html:51
+#: templates/web/base/tokens/confirm_problem.html:46
+#: templates/web/base/tokens/confirm_problem.html:51
 msgid "I just reported a problem on @fixmystreet"
 msgstr "Acabei de denunciar um problema no @ajeitaMinhaRua"
 
-#: templates/web/base/tokens/confirm_update.html:20 templates/web/base/tokens/confirm_update.html:25
+#: templates/web/base/tokens/confirm_update.html:20
+#: templates/web/base/tokens/confirm_update.html:25
 msgid "I just updated a problem on @fixmystreet"
 msgstr "Acabei de atualizar um problema no @ajeitaMinhaRua"
 
@@ -1633,15 +1867,19 @@ msgstr "Acabei de atualizar um problema no @ajeitaMinhaRua"
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Nós não conseguimos localizar seu problema no banco de dados.\n"
 
-#: templates/web/base/admin/flagged.html:14 templates/web/base/admin/index.html:66 templates/web/base/admin/list_updates.html:6
-#: templates/web/base/admin/reports/index.html:12 templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:19
-#: templates/web/zurich/admin/list_updates.html:24 templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
+#: templates/web/base/admin/flagged.html:14
+#: templates/web/base/admin/index.html:66
+#: templates/web/base/admin/list_updates.html:6
+#: templates/web/base/admin/reports/index.html:12
+#: templates/web/base/admin/users/alerts.html:8
+#: templates/web/zurich/admin/_index_table.html:3
+#: templates/web/zurich/admin/list_updates.html:24
+#: templates/web/zurich/admin/list_updates.html:38
 msgid "ID"
 msgstr "ID"
 
-#: templates/web/base/admin/bodies/form.html:32 templates/web/base/admin/bodies/form.html:33
+#: templates/web/base/admin/bodies/form.html:32
+#: templates/web/base/admin/bodies/form.html:33
 msgid ""
 "Identify a <strong>parent</strong> if this body is itself part of another body.\n"
 "          For basic installations, you don't need to join bodies in this way."
@@ -1657,15 +1895,15 @@ msgstr "Se houver um usuário associado ao endereço inserido, enviaremos um e-m
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr "Se esta prioridade é passada a um serviço externo, especifique aqui o código de prioridade a ser usado neste serviço."
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr "Se marcado, o formulário será desativado e o texto de aviso deste item será exibido."
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr "Se marcado, esses dados extras não serão editados ou excluídos pelo script do Open311."
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr "Se selecionado, este modelo será usado para atualizações do Open311 que colocam problemas neste estado."
 
@@ -1681,7 +1919,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr "Se você está nos contatando sobre uma denúncia ou atualização específica, por favor, inclua o link para a denúncia na mensagem."
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr "Se você gerou um novo código de acesso, o código antigo não funcionará mais."
 
@@ -1694,36 +1932,24 @@ msgid "If you let us know your email address, we’ll notify you when this probl
 msgstr "Se você nos informar seu endereço de e-mail, nós notificaremos você quando este problema for resolvido ou atualizado."
 
 #: templates/web/base/admin/responsepriorities/edit.html:28
-msgid ""
-"If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories."
-msgstr ""
-"Se você deseja que esta prioridade seja uma opção para categorias específicas, escolha elas aqui. Por padrão ela será mostrada para "
-"todas as categorias."
+msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories."
+msgstr "Se você deseja que esta prioridade seja uma opção para categorias específicas, escolha elas aqui. Por padrão ela será mostrada para todas as categorias."
 
 #: templates/web/base/admin/templates/edit.html:39
-msgid ""
-"If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories."
-msgstr ""
-"Se você deseja que este modelo seja uma opção para categorias específicas, escolha-os aqui. Por padrão, eles serão exibidos para "
-"todas as categorias."
+msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories."
+msgstr "Se você deseja que este modelo seja uma opção para categorias específicas, escolha-os aqui. Por padrão, eles serão exibidos para todas as categorias."
 
 #: templates/web/base/report/new/top_message_none.html:10
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "Se você enviar um problema aqui, o problema <strong>não</strong> será denunciado para o órgão."
 
-#: templates/web/base/admin/templates/edit.html:59
-msgid ""
-"If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status "
-"code changes, enter the status code here."
-msgstr ""
-"Se você deseja usar este modelo para preencher previamente o campo de atualização quando o código de status<strong>externo</strong> "
-"de uma denúncia (ex.: Confirmar) muda, insira o código de status aqui."
+#: templates/web/base/admin/templates/_external.html:6
+msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
+msgstr "Se você deseja usar este modelo para preencher previamente o campo de atualização quando o código de status<strong>externo</strong> de uma denúncia (ex.: Confirmar) muda, insira o código de status aqui."
 
 #: templates/web/base/admin/templates/edit.html:46
 msgid "If you want to use this template to prefill the update field when changing a report&rsquo;s state, select the state here."
-msgstr ""
-"Se você deseja usar este modelo para preencher previamente o campo de atualização ao mudar o estado da denúncia, selecione o estado "
-"aqui."
+msgstr "Se você deseja usar este modelo para preencher previamente o campo de atualização ao mudar o estado da denúncia, selecione o estado aqui."
 
 #: templates/web/base/questionnaire/index.html:72
 msgid ""
@@ -1733,18 +1959,19 @@ msgstr ""
 "Se você deseja deixar uma atualização pública no problema, por favor, especifique-a aqui\n"
 "(note que esta atualização não será enviada ao órgão)."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:112 templates/web/base/admin/bodies/open311-form-fields.html:113
+#: templates/web/base/admin/bodies/open311-form-fields.html:112
+#: templates/web/base/admin/bodies/open311-form-fields.html:113
 msgid ""
 "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n"
 "              its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n"
 "              Check that your cobrand supports this feature before switching it on."
 msgstr ""
 "Se você habilitou o envio de atualizações do Open311 acima, o Open311 geralmente só aceitará status ABERTO ou FECHADO em \n"
-"              suas atualizações. Habilite <strong>os statuses Open311 estendidos</strong> se você quiser permitir que estados extras "
-"sejam aprovados.\n"
+"              suas atualizações. Habilite <strong>os statuses Open311 estendidos</strong> se você quiser permitir que estados extras sejam aprovados.\n"
 "              Verifique se sua multimarca suporta esse recurso antes de ligá-lo."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:100 templates/web/base/admin/bodies/open311-form-fields.html:99
+#: templates/web/base/admin/bodies/open311-form-fields.html:100
+#: templates/web/base/admin/bodies/open311-form-fields.html:99
 msgid ""
 "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n"
 "              if you do <strong>not</strong> want that user to be notified whenever these updates are created."
@@ -1752,7 +1979,8 @@ msgstr ""
 "Se você habilitou o envio de atualizações do Open311 acima, habilite <strong>a supressão de alertas</strong> \n"
 "              se você <strong>não</strong> quiser que esse usuário seja notificado sempre que essas atualizações forem criadas."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:82 templates/web/base/admin/bodies/open311-form-fields.html:83
+#: templates/web/base/admin/bodies/open311-form-fields.html:82
+#: templates/web/base/admin/bodies/open311-form-fields.html:83
 msgid ""
 "If you've enabled Open311 update-sending above, you must identify which \n"
 "              FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n"
@@ -1762,7 +1990,7 @@ msgstr ""
 "              <strong>usuário</strong> AjeitaMinhaRua será atribuído como o criador dessas atualizações\n"
 "              quando eles são mostrados no site. Digite o ID (número) desse usuário."
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr "Se você fez mudanças, deixe uma descrição explicando o que foi modificado, para que outros administradores vejam."
 
@@ -1783,16 +2011,22 @@ msgid "In abuse table?"
 msgstr "Na tabela de abuso?"
 
 #: templates/web/base/open311/index.html:80
-msgid ""
-"In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title "
-"(also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to "
-"be shown on this site)."
+msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
+msgstr "Além disso, os seguintes atributos que não fazem parte da especificação Open311 v2 são retornados: agency_sent_datetime, título (também retornados como parte da descrição), interface_used, comment_count, requestor_name (só presentes se o solicitante permitisse que o nome fosse mostrado neste site)."
+
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
 msgstr ""
-"Além disso, os seguintes atributos que não fazem parte da especificação Open311 v2 são retornados: agency_sent_datetime, título "
-"(também retornados como parte da descrição), interface_used, comment_count, requestor_name (só presentes se o solicitante permitisse "
-"que o nome fosse mostrado neste site)."
 
-#: templates/web/base/admin/bodies/contact-form.html:35 templates/web/zurich/admin/bodies/contact-form.html:40
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "Ver sinalizadores"
+
+#: templates/web/base/admin/bodies/contact-form.html:35
+#: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
 msgstr "Inativo"
 
@@ -1800,19 +2034,20 @@ msgstr "Inativo"
 msgid "Inbox zero, here we come!"
 msgstr "Inbox zero, vamos lá!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Incluir detalhes pessuais de quem fez a denúncia"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Valor %s incorreto para o campo has_photo"
 
-#: templates/web/base/admin/triage/_inspect.html:31 templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr "Inspecionar denúncia"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "Instruir empreiteiros para corrigir o problema"
 
@@ -1828,15 +2063,12 @@ msgstr "Chave interna"
 msgid "Internal notes"
 msgstr "Notas internas"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Valor %s incorreto para o campo agency_responsible"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Fromato inválido % especificado."
 
-#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Moderate.pm:305
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Localização inválida. A nova localização deve ser coberta pelo mesmo deparatmento/secretaria."
 
@@ -1848,11 +2080,13 @@ msgstr "Normalmente é bem mais rápido <a href=\"%s\">checar nossas Perguntas F
 msgid "It’s on its way to the council right now."
 msgstr "Está a caminho do órgão."
 
-#: templates/web/base/admin/states/index.html:9 templates/web/base/admin/states/index.html:95
+#: templates/web/base/admin/states/index.html:9
+#: templates/web/base/admin/states/index.html:95
 msgid "Label"
 msgstr "Etiqueta"
 
-#: templates/web/base/admin/bodies/_translations.html:6 templates/web/base/admin/reportextrafields/edit.html:45
+#: templates/web/base/admin/bodies/_translations.html:6
+#: templates/web/base/admin/reportextrafields/edit.html:45
 msgid "Language"
 msgstr "<br>"
 
@@ -1864,7 +2098,8 @@ msgstr "Linguagens"
 msgid "Last 7 days"
 msgstr "Últimos 7 dias"
 
-#: templates/web/base/admin/bodies/body.html:75 templates/web/zurich/admin/bodies/body.html:16
+#: templates/web/base/admin/bodies/body.html:75
+#: templates/web/zurich/admin/bodies/body.html:16
 msgid "Last editor"
 msgstr "Último editor"
 
@@ -1884,12 +2119,14 @@ msgstr "Última atualização:"
 msgid "Last&nbsp;update:"
 msgstr "Última&nbsp;atualização:"
 
-#: templates/web/base/report/_item.html:70 templates/web/base/report/inspect/information.html:26
+#: templates/web/base/report/_item.html:83
+#: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Latitude/Longitude:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36 templates/web/base/reports/_list-filters-sort.html:10
+#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Menos atualizado recentemente"
 
@@ -1905,22 +2142,26 @@ msgstr "Listar todas os problemas denunciados"
 msgid "Loading reports…"
 msgstr "Carregando denúncias…"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 templates/web/base/report/new/category_wrapper.html:9
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Carregando..."
 
-#: templates/web/base/alert/choose.html:2 templates/web/base/alert/choose.html:4 templates/web/base/alert/index.html:2
-#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1 templates/web/base/tokens/confirm_alert.html:1
+#: templates/web/base/alert/choose.html:2
+#: templates/web/base/alert/choose.html:4 templates/web/base/alert/index.html:2
+#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:2
+#: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1
+#: templates/web/base/tokens/confirm_alert.html:1
 msgid "Local RSS feeds and email alerts"
 msgstr "Feeds RSS locais e alertas de e-mail"
 
-#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:2
-#: templates/web/base/alert/list.html:3
+#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14
+#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Feeds RSS locais e alertas de e-mail para ''%s''"
 
-#: templates/web/base/main_nav_items.html:16 templates/web/base/main_nav_items.html:21
+#: templates/web/base/main_nav_items.html:16
+#: templates/web/base/main_nav_items.html:21
 msgid "Local alerts"
 msgstr "Alertas locais"
 
@@ -1928,29 +2169,34 @@ msgstr "Alertas locais"
 msgid "Locate the problem on a map of the area"
 msgstr "Localize o problema no mapa da área"
 
-#: templates/web/base/auth/general.html:29 templates/web/base/report/form/user.html:13
+#: templates/web/base/auth/general.html:29
+#: templates/web/base/report/form/user.html:13
 msgid "Log in with Facebook"
 msgstr "Entrar com o Facebook"
 
-#: templates/web/base/auth/general.html:44 templates/web/base/report/form/user.html:24
+#: templates/web/base/auth/general.html:44
+#: templates/web/base/report/form/user.html:24
 msgid "Log in with Twitter"
 msgstr "Entrar com o Twitter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85 templates/web/base/report/form/user.html:27
+#: templates/web/base/js/translation_strings.html:87
+#: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "Entrar com o e-mail"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr "Entrar com e-mail/sms"
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr "Sair de todas as sessões"
 
-#: templates/web/base/auth/general.html:36 templates/web/base/report/form/user.html:18
+#: templates/web/base/auth/general.html:36
+#: templates/web/base/report/form/user.html:18
 msgid "Login with %s"
 msgstr "Logado como %s"
 
@@ -1963,19 +2209,21 @@ msgstr "Procurar"
 msgid "MAP"
 msgstr "MAPA"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr "Tornar anônimo em todas as denúncias e atualizações"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr "Gerenciar lista de atalhos"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr "Tema de Manifesto"
 
-#: templates/web/base/admin/triage/_list-filters.html:31 templates/web/base/reports/_list-filters-sort.html:5
+#: templates/web/base/admin/triage/_list-filters.html:32
+#: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr "Ordem manual"
 
@@ -1988,27 +2236,29 @@ msgstr "Mapa"
 msgid "Mark as sent"
 msgstr "Marcar como enviado"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Marcar usuários cujo comportamento você deseja uma verificação sobre como <strong>sinalizado</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr "Detalhes do problema de marcação"
 
-#: templates/web/base/contact/enquiry/index.html:41 templates/web/base/contact/index.html:109
+#: templates/web/base/contact/enquiry/index.html:42
+#: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Mensagem"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Mensagem ao organismo competente:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Mensagem para o corpo externo:"
 
-#: templates/web/base/admin/bodies/contact-form.html:62 templates/web/base/admin/extra-metadata-option.html:21
+#: templates/web/base/admin/bodies/contact-form.html:62
+#: templates/web/base/admin/extra-metadata-option.html:21
 msgid "Message to show when form is disabled (HTML permitted)"
 msgstr "Mensagem a ser mostrada quando o formulário é desabilitado (HTML é permitido)"
 
@@ -2016,7 +2266,7 @@ msgstr "Mensagem a ser mostrada quando o formulário é desabilitado (HTML é pe
 msgid "Missing bodies:"
 msgstr "Corpos ausentes:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Ausência do campo: jurisdiction_id"
 
@@ -2024,7 +2274,7 @@ msgstr "Ausência do campo: jurisdiction_id"
 msgid "Moderate"
 msgstr "Moderado"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755 perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Detalhes moderados da denúncia"
 
@@ -2036,7 +2286,9 @@ msgstr "Moderar esta denúncia"
 msgid "Moderate this update"
 msgstr "Moderar esta atualização"
 
-#: templates/web/base/admin/update_edit.html:92 templates/web/base/report/_main.html:85 templates/web/base/report/_update_state.html:19
+#: templates/web/base/admin/update_edit.html:92
+#: templates/web/base/report/_main.html:85
+#: templates/web/base/report/_update_state.html:19
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "Moderated by %s at %s"
 msgstr "Moderado por %s às %s"
@@ -2045,41 +2297,61 @@ msgstr "Moderado por %s às %s"
 msgid "Moderated by division within one working day"
 msgstr "Moderado por divisão dentro de um dia útil"
 
-#: templates/web/base/admin/reports/edit.html:193 templates/web/base/admin/update_edit.html:86
+#: templates/web/base/admin/reports/edit.html:206
+#: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr "Histórico de moderação"
 
-#: templates/web/base/dashboard/index.html:103 templates/web/zurich/admin/stats/index.html:9
+#: templates/web/base/dashboard/index.html:103
+#: templates/web/zurich/admin/stats/index.html:9
 msgid "Month"
 msgstr "Mês"
 
-#: templates/web/base/admin/triage/_list-filters.html:37 templates/web/base/reports/_list-filters-sort.html:11
+#: templates/web/base/admin/triage/_list-filters.html:38
+#: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Mais comentados"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696 perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707 templates/web/base/admin/category-checkboxes.html:32
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
+#: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr "Múltiplos Grupos"
 
-#: templates/web/base/admin/bodies/form.html:24 templates/web/base/admin/bodies/index.html:25 templates/web/base/admin/flagged.html:16
-#: templates/web/base/admin/flagged.html:37 templates/web/base/admin/index.html:68 templates/web/base/admin/list_updates.html:7
-#: templates/web/base/admin/manifesttheme/index.html:7 templates/web/base/admin/reportextrafields/edit.html:11
-#: templates/web/base/admin/reportextrafields/index.html:6 templates/web/base/admin/reports/index.html:14
-#: templates/web/base/admin/responsepriorities/index.html:6 templates/web/base/admin/states/index.html:108
-#: templates/web/base/admin/states/index.html:11 templates/web/base/admin/users/import.html:23
-#: templates/web/base/admin/users/import.html:46 templates/web/base/admin/users/index.html:43
-#: templates/web/base/report/form/user_name.html:2 templates/web/zurich/admin/bodies/form.html:4
-#: templates/web/zurich/auth/general.html:43 templates/web/zurich/report/new/fill_in_details_form.html:59
+#: templates/web/base/admin/bodies/form.html:24
+#: templates/web/base/admin/bodies/index.html:25
+#: templates/web/base/admin/flagged.html:16
+#: templates/web/base/admin/flagged.html:37
+#: templates/web/base/admin/index.html:68
+#: templates/web/base/admin/list_updates.html:7
+#: templates/web/base/admin/manifesttheme/index.html:7
+#: templates/web/base/admin/reportextrafields/edit.html:11
+#: templates/web/base/admin/reportextrafields/index.html:6
+#: templates/web/base/admin/reports/index.html:14
+#: templates/web/base/admin/responsepriorities/index.html:6
+#: templates/web/base/admin/states/index.html:108
+#: templates/web/base/admin/states/index.html:11
+#: templates/web/base/admin/users/import.html:23
+#: templates/web/base/admin/users/import.html:46
+#: templates/web/base/admin/users/index.html:43
+#: templates/web/base/report/form/user_name.html:2
+#: templates/web/zurich/admin/bodies/form.html:4
+#: templates/web/zurich/auth/general.html:43
+#: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "Name"
 msgstr "Nome"
 
-#: templates/web/base/admin/reports/edit.html:140 templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35 templates/web/zurich/admin/stats/index.html:62
+#: templates/web/base/admin/reports/edit.html:153
+#: templates/web/base/admin/update_edit.html:34
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
+#: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Nome:"
 
-#: perllib/FixMyStreet/Cobrand/Rutland.pm:20 perllib/FixMyStreet/Roles/ConfirmValidation.pm:26
+#: perllib/FixMyStreet/Cobrand/Rutland.pm:20
+#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:26
 msgid "Names are limited to %d characters in length."
 msgstr "Os nomes são limitados a %d caracteres de comprimento."
 
@@ -2091,7 +2363,7 @@ msgstr "Navegar para este problema"
 msgid "Nearest calculated address:"
 msgstr "Endereço calculado mais próximo:"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Estrada com nome mais próximo do marcador colocado no mapa (gerado automaticamente usando o OpenStreetMap): %s"
 
@@ -2099,11 +2371,12 @@ msgstr "Estrada com nome mais próximo do marcador colocado no mapa (gerado auto
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Código postal mais próximo do marcador colocado no mapa (gerado automaticamente): %s (%sm de distância)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607 perllib/FixMyStreet/Geocode/Address.pm:17
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
+#: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Estrada mais próxima do marcador colocado no mapa (gerado automaticamente pelo Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2119,7 +2392,8 @@ msgstr "Quase pronto!"
 msgid "Nearly done! Now check your email&hellip;"
 msgstr "Quase pronto! Agora verifique seu e-mail&hellip;"
 
-#: templates/web/base/auth/2fa/form.html:8 templates/web/base/auth/smsform.html:19
+#: templates/web/base/auth/2fa/form.html:8
+#: templates/web/base/auth/smsform.html:19
 msgid "Nearly done! Now check your phone&hellip;"
 msgstr "Quase pronto! Agora verifique seu telefone&hellip;"
 
@@ -2127,7 +2401,7 @@ msgstr "Quase pronto! Agora verifique seu telefone&hellip;"
 msgid "New body added"
 msgstr "Novo órgão adicionado"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Nova categoria de contato adicionada"
 
@@ -2135,11 +2409,13 @@ msgstr "Nova categoria de contato adicionada"
 msgid "New email address:"
 msgstr "Novo endereço de e-mail:"
 
-#: templates/web/base/admin/extra-metadata-item.html:14 templates/web/base/admin/extra-metadata-item.html:20
+#: templates/web/base/admin/extra-metadata-item.html:14
+#: templates/web/base/admin/extra-metadata-item.html:20
 msgid "New field"
 msgstr "Novo campo"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96 templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nova nota interna:"
 
@@ -2147,12 +2423,13 @@ msgstr "Nova nota interna:"
 msgid "New local problems on FixMyStreet"
 msgstr "Novos problemas locais no AjeitaMinhaRua"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Nova nota para DM:"
 
-#: templates/web/base/auth/change_password.html:47 templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/auth/change_password.html:47
+#: templates/web/base/auth/create.html:64
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Nova senha:"
 
@@ -2160,7 +2437,8 @@ msgstr "Nova senha:"
 msgid "New phone number:"
 msgstr "Novo número de telefone:"
 
-#: templates/web/base/admin/responsepriorities/edit.html:3 templates/web/base/admin/responsepriorities/index.html:52
+#: templates/web/base/admin/responsepriorities/edit.html:3
+#: templates/web/base/admin/responsepriorities/index.html:52
 msgid "New priority"
 msgstr "Nova prioridade"
 
@@ -2212,12 +2490,15 @@ msgstr "Novos problemas nas imediações de {{NAME}} no AjeitaMinhaRua"
 msgid "New reports"
 msgstr "Novas denúncias"
 
-#: templates/web/base/admin/states/index.html:91 templates/web/base/admin/stats/questionnaire.html:24
+#: templates/web/base/admin/states/index.html:91
+#: templates/web/base/admin/stats/questionnaire.html:24
 msgid "New state"
 msgstr "Novo estado"
 
-#: templates/web/base/admin/templates/edit.html:4 templates/web/base/admin/templates/view.html:37
-#: templates/web/zurich/admin/templates/edit.html:9 templates/web/zurich/admin/templates/view.html:26
+#: templates/web/base/admin/templates/edit.html:4
+#: templates/web/base/admin/templates/view.html:37
+#: templates/web/zurich/admin/templates/edit.html:9
+#: templates/web/zurich/admin/templates/view.html:26
 msgid "New template"
 msgstr "Novo template"
 
@@ -2225,7 +2506,8 @@ msgstr "Novo template"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr "Novas atualizações na denúncia <a href=\"%s\">%s</a>"
 
-#: templates/web/base/admin/triage/_list-filters.html:33 templates/web/base/reports/_list-filters-sort.html:7
+#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Mais novo"
 
@@ -2237,13 +2519,19 @@ msgstr "Próximo"
 msgid "Next:"
 msgstr "Próximo:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
-#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122 templates/web/base/admin/bodies/category.html:5
-#: templates/web/base/admin/list_updates.html:33 templates/web/base/admin/list_updates.html:35
-#: templates/web/base/admin/list_updates.html:36 templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/reports/edit.html:101 templates/web/base/admin/reports/edit.html:138
-#: templates/web/base/admin/update_edit.html:26 templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108 templates/web/base/questionnaire/index.html:41
+#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
+#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
+#: templates/web/base/admin/bodies/category.html:5
+#: templates/web/base/admin/list_updates.html:33
+#: templates/web/base/admin/list_updates.html:35
+#: templates/web/base/admin/list_updates.html:36
+#: templates/web/base/admin/problem_row.html:20
+#: templates/web/base/admin/reports/edit.html:101
+#: templates/web/base/admin/reports/edit.html:151
+#: templates/web/base/admin/update_edit.html:26
+#: templates/web/base/admin/users/alerts.html:21
+#: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Não"
 
@@ -2255,11 +2543,12 @@ msgstr "Sem grupo"
 msgid "No account?"
 msgstr "Sem conta?"
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Nenhum órgão"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Nenhum órgão selecionado"
 
@@ -2275,11 +2564,13 @@ msgstr "Nenhum problema sinalizado foi encontrado."
 msgid "No flagged users found."
 msgstr "Nenhum usuário sinalizado foi encontrado."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112 templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Nenhuma atualização adicional"
 
-#: templates/web/base/report/form/user.html:33 templates/web/base/report/form/user.html:40
+#: templates/web/base/report/form/user.html:33
+#: templates/web/base/report/form/user.html:40
 msgid "No personal details will be stored, and you will not receive updates about this report."
 msgstr "Nenhum dado pessoal será guardado, e você não receberá atualizações sobre  esta denúncia."
 
@@ -2292,7 +2583,8 @@ msgstr "Não há denúncias para mostrar no mapa, aqui estão alguns nas proximi
 msgid "No result returned"
 msgstr "Nenhum resultado retornado"
 
-#: templates/web/base/admin/bodies/form.html:68 templates/web/base/admin/bodies/form.html:69
+#: templates/web/base/admin/bodies/form.html:68
+#: templates/web/base/admin/bodies/form.html:69
 msgid ""
 "No specific areas are currently available, because the <code>MAPIT_URL</code> in\n"
 "            your config file is not pointing to a live MapIt service."
@@ -2300,16 +2592,19 @@ msgstr ""
 "Não há áreas específicas disponíveis no momento, porque o no<code>MAPIT_URL</code> no\n"
 "seu arquivo de configuração não está apontando para um serviço válido no MapIt."
 
-#: templates/web/base/report/_support.html:3 templates/web/base/report/_support.html:4
+#: templates/web/base/report/_support.html:3
+#: templates/web/base/report/_support.html:4
 msgid "No supporters"
 msgstr "Sem apoiadores"
 
-#: templates/web/base/admin/reports/edit.html:67 templates/web/base/admin/reports/edit.html:97
+#: templates/web/base/admin/reports/edit.html:67
+#: templates/web/base/admin/reports/edit.html:97
 #: templates/web/base/admin/reports/edit.html:99
 msgid "None"
 msgstr "Nada"
 
-#: templates/web/base/admin/users/form.html:79 templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
@@ -2317,7 +2612,8 @@ msgstr ""
 "Usuários normais (públicos) não devem ser associados a nenhuma <strong>área</strong>.\n"
 "                  Os usuários autorizados da equipe podem ser associados à área na qual operam."
 
-#: templates/web/base/admin/users/form.html:45 templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2329,10 +2625,14 @@ msgstr ""
 "                 Dependendo da implementação, os usuários da equipe podem ter acesso ao painel (resumo da atividade \n"
 "em todo o corpo), a capacidade de ocultar denúncias ou definir status de denúncias especiais."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Não para minha subdivisão"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Não denunciado antes"
@@ -2341,7 +2641,8 @@ msgstr "Não denunciado antes"
 msgid "Not reported to council"
 msgstr "Não denunciado para o órgão"
 
-#: templates/web/base/admin/bodies/body.html:76 templates/web/base/admin/bodies/category.html:32
+#: templates/web/base/admin/bodies/body.html:76
+#: templates/web/base/admin/bodies/category.html:32
 #: templates/web/zurich/admin/bodies/body.html:17
 msgid "Note"
 msgstr "Nota"
@@ -2379,12 +2680,12 @@ msgid "Offline"
 msgstr "Offline"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr "Dado offline limpo"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr "Dados de atualização off-line salvos"
 
@@ -2392,11 +2693,12 @@ msgstr "Dados de atualização off-line salvos"
 msgid "Old state"
 msgstr "Estado antigo"
 
-#: templates/web/base/admin/triage/_list-filters.html:34 templates/web/base/reports/_list-filters-sort.html:8
+#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Mais antigo"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr "Em nome de %s"
 
@@ -2404,10 +2706,15 @@ msgstr "Em nome de %s"
 msgid "Only staff users will be able to add reports in this category."
 msgstr "Apenas membros da equipe serão capazes de adicionar denúncias nesta categoria."
 
-#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 perllib/FixMyStreet/Cobrand/Zurich.pm:156 perllib/FixMyStreet/DB/ResultSet/State.pm:71
-#: templates/web/base/admin/states/index.html:102 templates/web/base/admin/states/index.html:25
-#: templates/web/base/admin/states/index.html:32 templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:117 templates/web/zurich/admin/update_edit.html:18
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:71
+#: templates/web/base/admin/states/index.html:102
+#: templates/web/base/admin/states/index.html:25
+#: templates/web/base/admin/states/index.html:32
+#: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/dashboard/index.html:117
+#: templates/web/zurich/admin/update_edit.html:18
 msgid "Open"
 msgstr "Abrir"
 
@@ -2431,7 +2738,7 @@ msgstr "Página web inativa Open311"
 msgid "Open311 specification"
 msgstr "Especificação Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr "Opções"
 
@@ -2443,7 +2750,7 @@ msgstr "Ou <a href=\"/\">buscar por uma localização diferente</a>"
 msgid "Or sign in with password to prefill this information."
 msgstr "Ou entre com uma senha para preencher previamente essas informações."
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr "Ou se inscreva pelo RSS"
 
@@ -2451,12 +2758,18 @@ msgstr "Ou se inscreva pelo RSS"
 msgid "Order"
 msgstr "Ordem"
 
-#: 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
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
+#: perllib/FixMyStreet/Queue/Item/Report.pm:132
+#: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
 msgstr "Outro"
 
@@ -2476,15 +2789,17 @@ msgstr "Média geral"
 msgid "Owner"
 msgstr "Dono"
 
-#: templates/web/base/errors/page_error_404_not_found.html:1 templates/web/base/errors/page_error_404_not_found.html:4
+#: templates/web/base/errors/page_error_404_not_found.html:1
+#: templates/web/base/errors/page_error_404_not_found.html:4
 msgid "Page Not Found"
 msgstr "Página Não Encontrada"
 
-#: templates/web/base/admin/bodies/form.html:39 templates/web/zurich/admin/bodies/form.html:14
+#: templates/web/base/admin/bodies/form.html:39
+#: templates/web/zurich/admin/bodies/form.html:14
 msgid "Parent"
 msgstr "Pai"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 msgid "Parent categories"
 msgstr "Categoria Pai"
 
@@ -2492,12 +2807,13 @@ msgstr "Categoria Pai"
 msgid "Partial"
 msgstr "Parcial"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51 templates/web/zurich/auth/general.html:20
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
+#: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Senha (opcional)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
 msgstr "Mudança de senha cancelada."
 
@@ -2509,7 +2825,7 @@ msgstr "Senha expirada"
 msgid "Permissions"
 msgstr "Permissões"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Permissões:"
 
@@ -2517,17 +2833,24 @@ msgstr "Permissões:"
 msgid "Permit blank updates"
 msgstr "Permitir atualizações em branco"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefone:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr "Quem fez a denúncia:"
 
-#: templates/web/base/auth/change_phone.html:36 templates/web/base/report/new/form_user_loggedin.html:34
+#: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
+#: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Número de telefone"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13 templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Número de telefone (opcional)"
 
@@ -2535,24 +2858,30 @@ msgstr "Número de telefone (opcional)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr "Números de telefone são limitados a %s caracteres."
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr "Telefone verificado:"
 
-#: templates/web/base/admin/reports/edit.html:148 templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefone:"
 
-#: templates/web/base/admin/update_edit.html:95 templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95 templates/web/base/questionnaire/index.html:97
-#: templates/web/base/report/new/form_report.html:41 templates/web/base/report/new/form_report.html:56
-#: templates/web/base/report/new/form_report.html:58 templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24 templates/web/base/report/update/form_update.html:7
-#: templates/web/base/report/update/moderation_diff.html:4 templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24 templates/web/zurich/admin/reports/index.html:16
-#: templates/web/zurich/admin/stats/index.html:58 templates/web/zurich/report/new/fill_in_details_form.html:20
-#: templates/web/zurich/report/new/fill_in_details_form.html:36 templates/web/zurich/report/new/fill_in_details_form.html:38
+#: templates/web/base/admin/update_edit.html:95
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
+#: templates/web/base/report/new/form_report.html:41
+#: templates/web/base/report/new/form_report.html:56
+#: templates/web/base/report/new/form_report.html:58
+#: templates/web/base/report/update/moderation_diff.html:4
+#: templates/web/zurich/admin/_index_table.html:11
+#: templates/web/zurich/admin/stats/index.html:58
+#: templates/web/zurich/report/new/fill_in_details_form.html:20
+#: templates/web/zurich/report/new/fill_in_details_form.html:36
+#: templates/web/zurich/report/new/fill_in_details_form.html:38
 msgid "Photo"
 msgstr "Foto"
 
@@ -2568,8 +2897,9 @@ msgstr "Foto requerida"
 msgid "Photo upload failed."
 msgstr "Falha ao enviar a foto."
 
-#: templates/web/base/questionnaire/index.html:80 templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7 templates/web/zurich/report/new/fill_in_details_form.html:20
+#: templates/web/base/report/form/photo_upload.html:4
+#: templates/web/base/report/new/form_report.html:41
+#: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Fotos"
 
@@ -2577,20 +2907,28 @@ msgstr "Fotos"
 msgid "Photos of recent nearby reports"
 msgstr "Fotos das denúncias recentes nas proximidades"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr "Fotos/Documentos"
 
-#: templates/web/base/reports/index.html:76 templates/web/base/reports/index.html:79
+#: templates/web/base/reports/index.html:76
+#: templates/web/base/reports/index.html:79
 msgid "Pick your council"
 msgstr "Escolha um órgão"
 
-#: templates/web/base/reports/index.html:66 templates/web/base/reports/index.html:69
+#: templates/web/base/reports/index.html:66
+#: templates/web/base/reports/index.html:69
 msgid "Pick your ward"
 msgstr "Escolha seu sinalizador"
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Coloque o pino no mapa"
+
 #. ("JS")
-#: templates/web/base/around/display_location.html:79 templates/web/base/js/translation_strings.html:44
+#: templates/web/base/around/display_location.html:79
+#: templates/web/base/js/translation_strings.html:44
 msgid "Place pin on map"
 msgstr "Coloque o pino no mapa"
 
@@ -2602,33 +2940,42 @@ msgstr "Por favor, <a href=\"#%s\">cheque as mudanças</a> e resolva qualquer di
 msgid "Please be polite, concise and to the point."
 msgstr "Por favor, seja educado, conciso e objetivo."
 
-#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:31
+#: templates/web/base/auth/change_password.html:26
+#: templates/web/base/auth/change_password.html:31
 msgid "Please check the passwords and try again"
 msgstr "Por favor, verifique a senha e tente novamente"
 
-#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:9
-#: templates/web/base/auth/change_email.html:24 templates/web/base/auth/change_email.html:27
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:9
+#: templates/web/base/auth/change_email.html:24
+#: templates/web/base/auth/change_email.html:27
 msgid "Please check your email address is correct"
 msgstr "Por favor, verifique se seu e-mail está correto"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521 perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264 templates/web/base/auth/_username_error.html:1
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
+#: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr "Por favor, verifique se seu telefone está correto"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077 templates/web/base/js/translation_strings.html:21
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
+#: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Por favor escolha uma categoria"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471 perllib/FixMyStreet/App/Controller/Auth.pm:497
+#: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr "Por favor, escolha uma senha menos comum"
 
-#: 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
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
+#: templates/web/base/admin/bodies/body.html:12
+#: templates/web/base/admin/bodies/index.html:4
+#: templates/web/base/admin/templates/edit.html:13
 msgid "Please correct the errors below"
 msgstr "Por favor, corrija os erros abaixo"
 
@@ -2647,62 +2994,79 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Por favor, não seja desrespeitoso&nbsp;&mdash; desrespeitar um órgão tira a credibilidade do serviço para todos os usuários."
 
 #. ("JS")
-#: 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
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
+#: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Por favor, especifique uma mensagem"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519 perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267 templates/web/base/auth/_username_error.html:1
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
+#: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr "Por favor, digite um número de telefone"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Por favor, digite um nome"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "Por favor, digite um nome para este órgão"
 
 #. ("JS")
-#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:29
+#: templates/web/base/auth/change_password.html:26
+#: templates/web/base/auth/change_password.html:29
 #: templates/web/base/js/translation_strings.html:31
 msgid "Please enter a password"
 msgstr "Por favor, especifique uma senha"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Contact.pm:147 perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/App/Controller/Contact.pm:147
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Por favor, digite um assunto"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255 perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261 perllib/FixMyStreet/DB/Result/User.pm:256
-#: templates/web/base/js/translation_strings.html:24 templates/web/base/js/translation_strings.html:28
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
+#: templates/web/base/js/translation_strings.html:24
+#: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
 msgstr "Por favor, especifique um e-mail válido"
 
-#: perllib/FixMyStreet/App/Controller/Alert.pm:355 perllib/FixMyStreet/App/Controller/Contact.pm:157
+#: perllib/FixMyStreet/App/Controller/Alert.pm:355
+#: perllib/FixMyStreet/App/Controller/Contact.pm:157
 msgid "Please enter a valid email address"
 msgstr "Por favor, digite um endereço de e-mail válido"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139 perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr "Por favor, digite um e-mail válido ou número de telefone"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371 templates/web/base/js/translation_strings.html:14
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
+#: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Por favor, especifique alguns detalhes"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Contact.pm:146 perllib/FixMyStreet/DB/Result/User.pm:254
-#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:8
-#: templates/web/base/auth/change_email.html:24 templates/web/base/auth/change_email.html:26
-#: templates/web/base/js/translation_strings.html:23 templates/web/base/js/translation_strings.html:27
+#: perllib/FixMyStreet/App/Controller/Contact.pm:146
+#: perllib/FixMyStreet/DB/Result/User.pm:259
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:8
+#: templates/web/base/auth/change_email.html:24
+#: templates/web/base/auth/change_email.html:26
+#: templates/web/base/js/translation_strings.html:23
+#: templates/web/base/js/translation_strings.html:27
 msgid "Please enter your email"
 msgstr "Por favor, especifique seu e-mail"
 
@@ -2712,27 +3076,27 @@ msgid "Please enter your first name"
 msgstr "Por favor, digite seu primeiro nome"
 
 #. ("JS")
-#: 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 ""
-"Por favor, especifique seu nome completo, órgãos precisam desta informação – se você não deseja que seu nome seja mostrado no site, "
-"desmarque a caixa abaixo"
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
+#: templates/web/base/js/translation_strings.html:19
+msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
+msgstr "Por favor, especifique seu nome completo, órgãos precisam desta informação – se você não deseja que seu nome seja mostrado no site, desmarque a caixa abaixo"
 
 #: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:35
 msgid "Please enter your full name."
 msgstr "Por favor, digite seu nome."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Contact.pm:145 perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379 perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/App/Controller/Contact.pm:145
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Por favor, digite seu nome"
 
 #. ("JS")
-#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:6
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:6
 #: templates/web/base/js/translation_strings.html:37
 msgid "Please enter your phone number"
 msgstr "Por favor, digite seu número de telefone"
@@ -2747,36 +3111,38 @@ msgstr "Por favor, especifique seu segundo nome"
 msgid "Please enter your title"
 msgstr "Por favor, digite seu título"
 
-#: templates/web/base/auth/sign_out.html:5 templates/web/zurich/auth/sign_out.html:5
+#: templates/web/base/auth/sign_out.html:5
+#: templates/web/zurich/auth/sign_out.html:5
 msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>."
 msgstr "Sinta-se a vontade para <a href=\"%s\">entrar novamente</a>, ou voltara para a <a href=\"/\">página inicial</a>."
 
-#: templates/web/base/report/new/fill_in_details_text.html:2 templates/web/base/report/new/fill_in_details_text.html:8
+#: templates/web/base/report/new/fill_in_details_text.html:2
+#: templates/web/base/report/new/fill_in_details_text.html:8
 msgid "Please fill in details of the problem below."
 msgstr "Por favor, descreva em detalhes o problema abaiixo."
 
-#: templates/web/base/report/new/sidebar.html:7 templates/web/zurich/report/new/sidebar.html:14
-msgid ""
-"Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
-msgstr ""
-"Por favor, preencha o formulário abaixo com detalhes do problema, e descreva a localização da forma mais precisa possível na caixa de "
-"detalhes."
+#: templates/web/base/report/new/sidebar.html:7
+#: templates/web/zurich/report/new/sidebar.html:14
+msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
+msgstr "Por favor, preencha o formulário abaixo com detalhes do problema, e descreva a localização da forma mais precisa possível na caixa de detalhes."
 
 #: templates/web/base/auth/2fa/form.html:9
 msgid "Please generate a two-factor code and enter it below:"
 msgstr "Por favor, gere um código de duas etapas e digite-o abaixo:"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Por favor, indique se você gostaria de receber outro questionário"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368 templates/web/base/js/translation_strings.html:11
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
+#: templates/web/base/js/translation_strings.html:11
 msgid "Please make sure you are not including an email address"
 msgstr "Por favor, certifique-se que não está digitando um endereço de e-mail"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494 templates/web/base/js/translation_strings.html:34
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
+#: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr "Por favor,  certifique-se que sua senha tem pelo menos %d caracteres"
 
@@ -2788,48 +3154,50 @@ msgstr "Atenção: as atualizações não são enviadas ao órgão."
 msgid "Please note your report has <strong>not yet been sent</strong>."
 msgstr "Atenção: sua denúncia <strong>ainda não foi enviada</strong>."
 
-#: templates/web/base/report/new/fill_in_details_form.html:23 templates/web/zurich/report/new/sidebar.html:5
-msgid ""
-"Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit."
-msgstr ""
-"Atenção: sua denúncia <strong>ainda não foi enviada</strong>. Escolha uma categoria e adicione mais informações abaixo, e então enive."
+#: templates/web/base/report/new/fill_in_details_form.html:23
+#: templates/web/zurich/report/new/sidebar.html:5
+msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit."
+msgstr "Atenção: sua denúncia <strong>ainda não foi enviada</strong>. Escolha uma categoria e adicione mais informações abaixo, e então enive."
 
 #: templates/web/base/report/display.html:34
 msgid "Please note your update has <strong>not yet been posted</strong>."
 msgstr "Atenção: sua atualização <strong>ainda não foi postada</strong>."
 
-#: templates/web/base/report/new/notes.html:1 templates/web/zurich/report/new/notes.html:1
+#: templates/web/base/report/new/notes.html:1
+#: templates/web/zurich/report/new/notes.html:1
 msgid "Please note:"
 msgstr "Atenção:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr "Por favor, forneça um ID ou uma atualização pública para esta denúncia."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr "Por favor, forneça uma atualização pública para esta denúncia."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Por favor, explique o motivo pelo qual você está reabrindo esta denúncia"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Por favor, forneça uma descrição e uma foto também"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114 perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Por favor, nos diga se você já denunciou um problema ao seu órgão antes"
 
 #: templates/web/base/auth/2fa/form-add.html:1
-msgid ""
-"Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
-msgstr ""
-"Por favor, escaneie esta imagem com seu aplicativo ou insira o código em seu aplicativo e, em seguida, gere um novo código único e "
-"insira-o abaixo:"
+msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
+msgstr "Por favor, escaneie esta imagem com seu aplicativo ou insira o código em seu aplicativo e, em seguida, gere um novo código único e insira-o abaixo:"
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Por favor, selecione um órgão."
 
@@ -2841,17 +3209,20 @@ msgstr "Por favor, selecione o feed que você qyer"
 msgid "Please select the type of alert you want"
 msgstr "Por favor, selecione o tipo de alerta que você quer"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Por favor, indique se o problema foi corrigido ou não"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:119 perllib/FixMyStreet/App/Model/PhotoSet.pm:138
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:140 templates/web/base/js/translation_strings.html:80
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Por favor, envie apenas uma imagem"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142 perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr "Por favor, confirme pelo menos um dos e-mail/telefone"
 
@@ -2859,27 +3230,23 @@ msgstr "Por favor, confirme pelo menos um dos e-mail/telefone"
 msgid "Please write a message"
 msgstr "Por favor, digite uma mensagem"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Postar"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr "CEP ou nome da rua e bairro"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Postado anonimamente às %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Postado por %s às %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Postado por <strong>%s</strong> (%s) às %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Postado por <strong>%s</strong> às %s"
 
@@ -2895,7 +3262,7 @@ msgstr "Impede que esta categoria seja usada em novas denúncias, <em>e</em> tam
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr "Impede que esta categoria seja usada em novas denúncias, mas se mantém ativa no filtro dos mapas."
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr "Impede que o usuário envie o formulário sem preencher este campo."
 
@@ -2903,11 +3270,12 @@ msgstr "Impede que o usuário envie o formulário sem preencher este campo."
 msgid "Previous"
 msgstr "Anterior"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Prioridades"
 
-#: templates/web/base/report/_item.html:82 templates/web/base/report/inspect/extra_details.html:2
+#: templates/web/base/report/_item.html:95
+#: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -2915,12 +3283,16 @@ msgstr "Prioridade"
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: templates/web/base/about/_sidebar.html:5 templates/web/base/about/privacy.html:1 templates/web/base/about/privacy.html:2
+#: templates/web/base/about/_sidebar.html:5
+#: templates/web/base/about/privacy.html:1
+#: templates/web/base/about/privacy.html:2
 msgid "Privacy and cookies"
 msgstr "Cookies e Privacidade"
 
-#: 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
+#: templates/web/base/admin/bodies/body.html:90
+#: templates/web/base/admin/reports/edit.html:170
+#: templates/web/base/report/inspect/information.html:3
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privado"
 
@@ -2960,11 +3332,13 @@ msgstr "Problema %s removido da lista de atalhos"
 msgid "Problem %s sent to council %s"
 msgstr "Problema % enviado ao órgão %s"
 
-#: templates/web/base/admin/stats/index.html:13 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 "Problemas separados por estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problema marcado em aberto."
 
@@ -2972,7 +3346,8 @@ msgstr "Problema marcado em aberto."
 msgid "Problem state change based on survey results"
 msgstr "O estado do problema muda de acordo com o resultado das pesquisas"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754 perllib/FixMyStreet/Cobrand/KiitC.pm:196 templates/web/base/admin/flagged.html:10
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
+#: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemas"
 
@@ -2996,22 +3371,26 @@ msgstr "Problemas recentes resolvidos que foram denúnciados no AjeitaMinhaRua"
 msgid "Problems within %.1fkm of %s"
 msgstr "Problemas dentro de %.1fkm de %s"
 
-#: 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
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemas em %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemas no sinalizador %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr "Problemas no sinalizador %s, %s"
 
 #. ("First %s is the body name, second %s the site name")
-#: templates/web/base/admin/triage/index.html:0 templates/web/base/admin/triage/index.html:14 templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/admin/triage/index.html:0
+#: templates/web/base/admin/triage/index.html:14
+#: templates/web/base/reports/body.html:0
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Problemas em %s, %s"
 
@@ -3019,15 +3398,21 @@ msgstr "Problemas em %s, %s"
 msgid "Property address:"
 msgstr "Endereço da propriedade:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr "Proteger de mudanças no Open311"
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+#, fuzzy
+msgid "Protect this category from being re-named"
+msgstr "Proteger o nome desta categoria e grupos de mudanças no Open311"
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr "Proteger o nome desta categoria e grupos de mudanças no Open311"
 
-#: templates/web/base/report/duplicate-no-updates.html:3 templates/web/base/report/update-form-wrapper.html:9
+#: 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 "Forneça uma atualização"
@@ -3036,34 +3421,29 @@ msgstr "Forneça uma atualização"
 msgid "Provide update as"
 msgstr "Forneça uma atualização como"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-msgid ""
-"Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your "
-"reports."
-msgstr ""
-"Fornecer uma senha é opcional, mas definir uma vai te denunciar problemas no futuro, assim como atualizar e administrar suas "
-"denúncias com mais facilidade."
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
+msgstr "Fornecer uma senha é opcional, mas definir uma vai te denunciar problemas no futuro, assim como atualizar e administrar suas denúncias com mais facilidade."
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
-msgid ""
-"Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
-msgstr ""
-"Fornecer um nome e uma senha é opcional, mas isto te permitirá denunciar problemas, fornecer atualizações ou administrar suas "
-"denúncias de maneira mais fácil."
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
+msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
+msgstr "Fornecer um nome e uma senha é opcional, mas isto te permitirá denunciar problemas, fornecer atualizações ou administrar suas denúncias de maneira mais fácil."
 
 #: templates/web/base/report/new/form_public_councils_text.html:2
 msgid "Public details"
 msgstr "Detalhes públicos"
 
-#: templates/web/zurich/admin/reports/edit.html:230 templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Resposta pública:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Atualização pública:"
 
-#: templates/web/zurich/admin/reports/edit.html:110 templates/web/zurich/admin/stats/index.html:59
+#: templates/web/zurich/admin/reports/edit.html:110
+#: templates/web/zurich/admin/stats/index.html:59
 msgid "Publish photo"
 msgstr "Publicar foto"
 
@@ -3071,8 +3451,10 @@ msgstr "Publicar foto"
 msgid "Question text"
 msgstr "Questionário"
 
-#: templates/web/base/questionnaire/completed.html:1 templates/web/base/questionnaire/index.html:0
-#: templates/web/base/questionnaire/index.html:14 templates/web/base/questionnaire/index.html:5
+#: templates/web/base/questionnaire/completed.html:1
+#: templates/web/base/questionnaire/index.html:0
+#: templates/web/base/questionnaire/index.html:14
+#: templates/web/base/questionnaire/index.html:5
 msgid "Questionnaire"
 msgstr "Questionário"
 
@@ -3084,31 +3466,37 @@ msgstr "Questionário %d respondido para o problema %d,%s para %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Questionário %s enviado para o problema %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 templates/web/base/report/updates.html:20
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205
+#: templates/web/base/report/updates.html:20
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Questionário preenchido pelo relator do problema"
 
-#: templates/web/base/alert/_list.html:35 templates/web/base/alert/_list.html:53 templates/web/base/alert/_list_rss_local.html:3
-#: templates/web/base/alert/updates.html:9 templates/web/base/around/display_location.html:3
+#: templates/web/base/alert/_list.html:35
+#: templates/web/base/alert/_list.html:53
+#: templates/web/base/alert/_list_rss_local.html:3
+#: templates/web/base/alert/updates.html:9
+#: templates/web/base/around/display_location.html:3
 #: templates/web/base/report/display_tools.html:44
 msgid "RSS feed"
 msgstr "Feed RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "Feed RSS para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "Feed RSS para sinalizador %s, %s"
 
-#: 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
+#: 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:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "Feed RSS de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "Feed RSS no %s, dentro do sinalizador %s"
 
@@ -3116,27 +3504,31 @@ msgstr "Feed RSS no %s, dentro do sinalizador %s"
 msgid "RSS feed of nearby problems"
 msgstr "Feed RSS de problemas próximos"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "Feed RSS de problemas em %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "Feed RSS de problemas no sinalizador %s"
 
-#: templates/web/base/around/display_location.html:3 templates/web/base/around/display_location.html:4
+#: templates/web/base/around/display_location.html:3
+#: templates/web/base/around/display_location.html:4
 msgid "RSS feed of recent local problems"
 msgstr "Feed RSS de problemas locais recentes"
 
-#: templates/web/base/alert/updates.html:9 templates/web/base/report/display_tools.html:44
+#: templates/web/base/alert/updates.html:9
+#: templates/web/base/report/display_tools.html:44
 msgid "RSS feed of updates to this problem"
 msgstr "Feed RSS de atualizações deste problema"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr "Ler menos"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr "Ler mais"
 
@@ -3144,16 +3536,18 @@ msgstr "Ler mais"
 msgid "Reason:"
 msgstr "Razão:"
 
-#: templates/web/base/alert/updates.html:14 templates/web/base/report/display_tools.html:46
+#: templates/web/base/alert/updates.html:14
+#: templates/web/base/report/display_tools.html:46
 msgid "Receive email when updates are left on this problem."
 msgstr "Receber e-mails quando atualizações forem cadastradas neste problema."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr "Recebido por %s momentos depois"
 
 #. ("%s is the site name")
-#: templates/web/base/around/display_location.html:0 templates/web/base/around/display_location.html:35
+#: templates/web/base/around/display_location.html:0
+#: templates/web/base/around/display_location.html:35
 msgid "Recent local problems, %s"
 msgstr "Problemas locais recentes, %s"
 
@@ -3161,7 +3555,8 @@ msgstr "Problemas locais recentes, %s"
 msgid "Recently reported problems"
 msgstr "Problemas denunciados recentemente"
 
-#: templates/web/base/admin/triage/_list-filters.html:35 templates/web/base/reports/_list-filters-sort.html:9
+#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Atualizados recentemente"
 
@@ -3170,15 +3565,11 @@ msgid "Reject report"
 msgstr "Rejeitar denúncia"
 
 #: templates/web/zurich/report/new/notes.html:5
-msgid ""
-"Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for "
-"submission via this site remember that you can contact your council directly using their own website."
-msgstr ""
-"Lembre-se de que o AjeitaMinhaRua é usado para relatar problemas físicos que podem ser corrigidos. Se o seu problema não for "
-"apropriado para ser submetido através deste site, você pode entrar em contato com o seu município diretamente usando o próprio site "
-"da prefeitura."
+msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
+msgstr "Lembre-se de que o AjeitaMinhaRua é usado para relatar problemas físicos que podem ser corrigidos. Se o seu problema não for apropriado para ser submetido através deste site, você pode entrar em contato com o seu município diretamente usando o próprio site da prefeitura."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr "Remover detalhes da conta"
 
@@ -3190,8 +3581,11 @@ msgstr "Remover campo"
 msgid "Remove flag"
 msgstr "Remover marcação"
 
-#: templates/web/base/report/_item.html:12 templates/web/base/report/_item.html:9 templates/web/base/report/_main.html:147
-#: templates/web/base/report/_main.html:24 templates/web/base/report/_main.html:32
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
+#: templates/web/base/report/_main.html:147
+#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:32
 msgid "Remove from shortlist"
 msgstr "Remover da lista de atalhos"
 
@@ -3203,16 +3597,22 @@ msgstr "Remover do site"
 msgid "Remove option"
 msgstr "Remover opção"
 
-#: templates/web/base/admin/reports/edit.html:174 templates/web/base/admin/update_edit.html:74
+#: templates/web/base/admin/reports/edit.html:187
+#: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Remover foto (não pode ser desfeito!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Editar a permissão de outros usuários"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr "Substituir código de acesso"
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Responder ao usuário:"
 
@@ -3220,18 +3620,24 @@ msgstr "Responder ao usuário:"
 msgid "Report"
 msgstr "Denunciar"
 
-#: templates/web/base/report/_item.html:60 templates/web/base/report/inspect/information.html:7
+#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "ID da Denúncia:"
 
 #. ("JS")
-#: 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
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/navigation/_report.html:6
+#: templates/web/base/navigation/_report.html:8
+#: templates/web/zurich/footer.html:18
+#: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Denunciar um problema"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90 templates/web/base/navigation/_report.html:4
+#: templates/web/base/js/translation_strings.html:92
+#: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr "Denunciar um problema aqui"
 
@@ -3239,12 +3645,14 @@ msgstr "Denunciar um problema aqui"
 msgid "Report abuse"
 msgstr "Denunciar abuso"
 
-#: templates/web/base/report/form/user.html:32 templates/web/base/report/form/user.html:39
+#: templates/web/base/report/form/user.html:32
+#: templates/web/base/report/form/user.html:39
 msgid "Report anonymously"
 msgstr "Denunciado anonimamente"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91 templates/web/base/navigation/_report.html:2
+#: templates/web/base/js/translation_strings.html:93
+#: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
 msgstr "Denunciar outro problema aqui"
@@ -3273,24 +3681,29 @@ msgstr "Denuncie seu problema"
 msgid "Report, view, and discuss local street-related problems."
 msgstr "Denuncie, veja e discuta problemas locais."
 
-#: templates/web/base/around/intro.html:1 templates/web/zurich/around/intro.html:1
+#: templates/web/base/around/intro.html:1
+#: templates/web/zurich/around/intro.html:1
 msgid "Report, view, or discuss local problems"
 msgstr "Denuncie, veja ou discuta problemas locais"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652 templates/web/base/contact/index.html:64
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
+#: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Denunciado anonimamente às %s"
 
-#: templates/web/base/admin/stats/questionnaire.html:5 templates/web/base/questionnaire/creator_fixed.html:14
+#: templates/web/base/admin/stats/questionnaire.html:5
+#: templates/web/base/questionnaire/creator_fixed.html:14
 #: templates/web/base/questionnaire/index.html:66
 msgid "Reported before"
 msgstr "Denunciado antes"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676 templates/web/base/contact/index.html:66
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
+#: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Denunciado por %s às %s"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:48 templates/web/zurich/admin/reports/edit.html:76
+#: templates/web/zurich/admin/report_edit-sdm.html:48
+#: templates/web/zurich/admin/reports/edit.html:76
 msgid "Reported by:"
 msgstr "Denunciado por:"
 
@@ -3298,48 +3711,55 @@ msgstr "Denunciado por:"
 msgid "Reported in the %s category"
 msgstr "Denunciado na categoria %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Denunciado anonimamente às %s na categoria %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Denunciado por %s às %s na categoria %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Denunciado anonimamente às %s via %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Denunciado por %s às %s via %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Denúnciado anonimamente as %s via %s na categoria %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Denunciado via %s na categoria %s por %s as %s"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:38 templates/web/zurich/admin/reports/edit.html:57
+#: templates/web/zurich/admin/report_edit-sdm.html:38
+#: templates/web/zurich/admin/reports/edit.html:57
 msgid "Reported:"
 msgstr "Denunciado:"
 
 #. ("JS")
-#: templates/web/base/around/index.html:3 templates/web/base/around/lookup_by_ref.html:3
-#: templates/web/base/js/translation_strings.html:61 templates/web/base/report/new/fill_in_details.html:0
-#: templates/web/base/report/new/fill_in_details.html:10 templates/web/zurich/report/new/fill_in_details_form.html:4
+#: templates/web/base/around/index.html:3
+#: templates/web/base/around/lookup_by_ref.html:3
+#: templates/web/base/js/translation_strings.html:61
+#: templates/web/base/report/new/fill_in_details.html:0
+#: templates/web/base/report/new/fill_in_details.html:10
+#: templates/web/zurich/report/new/fill_in_details_form.html:4
 msgid "Reporting a problem"
 msgstr "Denunciando um problema"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698 perllib/FixMyStreet/Cobrand/Default.pm:712 perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 templates/web/base/around/tabbed_lists.html:3 templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
+#: templates/web/base/around/tabbed_lists.html:3
+#: templates/web/base/dashboard/index.html:108
 msgid "Reports"
 msgstr "Denúncias"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
+#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Denúncias são limitados a %s caracteres. Por favor, seja mais breve"
@@ -3366,15 +3786,15 @@ msgid "Reports published"
 msgstr "Denúncias publicadas"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr "Denúncias salvas offline."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr "Denúncias enviadas para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr "Denúncia enviada à %s, no sinalizador %s"
 
@@ -3387,7 +3807,7 @@ msgstr "Denúncias aguardando para serem enviadas"
 msgid "Reposition if needed, then hit Continue"
 msgstr "Reposicione se necessário e clique em Continuar"
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr "Obrigatório"
 
@@ -3415,8 +3835,10 @@ msgstr "Modelo de Reposta para %s"
 msgid "Response Templates"
 msgstr "Modelos de Repostas"
 
-#: templates/web/base/admin/templates/view.html:1 templates/web/zurich/admin/templates/edit.html:1
-#: templates/web/zurich/admin/templates/edit.html:4 templates/web/zurich/admin/templates/view.html:1
+#: templates/web/base/admin/templates/view.html:1
+#: templates/web/zurich/admin/templates/edit.html:1
+#: templates/web/zurich/admin/templates/edit.html:4
+#: templates/web/zurich/admin/templates/view.html:1
 #: templates/web/zurich/admin/templates/view.html:3
 msgid "Response Templates for %s"
 msgstr "Modelos de Repostas para %s"
@@ -3438,34 +3860,47 @@ msgstr "Reverter para o título original"
 msgid "Right place?"
 msgstr "Lugar certo?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Operador da estrada para esta estrada nomeada (derivado do número e tipo de referência da estrada): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operador rodoviário para esta estrada nomeada (a partir do OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr "Função"
 
-#: templates/web/base/admin/users/form.html:143 templates/web/base/admin/users/index.html:29
+#: templates/web/base/admin/users/form.html:128
+#: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr "Função:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714 templates/web/base/admin/roles/form.html:1 templates/web/base/admin/roles/index.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: templates/web/base/admin/roles/form.html:1
+#: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr "Funções"
 
-#: 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
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
+#: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Girar Para a Esquerda"
 
-#: 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
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/update_edit.html:72
+#: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
 msgstr "Girar Para a Direita"
 
@@ -3474,20 +3909,29 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Rotacionar esta foto fará com que você perca mudanças não salvas na denúncia."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:66 templates/web/base/maps/google-ol.html:2
+#: templates/web/base/js/translation_strings.html:66
+#: templates/web/base/maps/google-ol.html:2
 msgid "Satellite"
 msgstr "Satélite"
 
-#: templates/web/base/admin/triage/_inspect.html:69 templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr "Salvar + fechar como duplicado"
 
-#: 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
+#: templates/web/base/admin/bodies/contact-form.html:164
+#: templates/web/base/admin/manifesttheme/form.html:58
+#: templates/web/base/admin/reportextrafields/edit.html:64
+#: templates/web/base/admin/responsepriorities/edit.html:41
+#: templates/web/base/admin/roles/form.html:21
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
+#: templates/web/base/report/_main.html:129
+#: templates/web/base/report/update.html:58
+#: templates/web/zurich/admin/bodies/contact-form.html:51
+#: templates/web/zurich/admin/templates/edit.html:32
 msgid "Save changes"
 msgstr "Salvar mudanças"
 
@@ -3500,15 +3944,17 @@ msgid "Save with a public update"
 msgstr "Salvar como uma atualização pública"
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr "Salvar denúncias offline"
 
-#: templates/web/base/admin/index.html:26 templates/web/base/admin/reports/index.html:1 templates/web/zurich/admin/reports/index.html:1
+#: templates/web/base/admin/index.html:26
+#: templates/web/base/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Buscar Denúncias"
 
-#: templates/web/base/admin/index.html:34 templates/web/base/admin/users/index.html:1
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/users/index.html:1
 msgid "Search Users"
 msgstr "Buscar Usuários"
 
@@ -3516,40 +3962,47 @@ msgstr "Buscar Usuários"
 msgid "Search for location of email alert or RSS feed"
 msgstr "Pesquise a localização de alerta de e-mail ou feed RSS"
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Buscar denúncias"
 
-#: templates/web/base/admin/reports/index.html:5 templates/web/base/admin/users/index.html:26
+#: templates/web/base/admin/reports/index.html:5
+#: templates/web/base/admin/users/index.html:26
 #: templates/web/zurich/admin/reports/index.html:5
 msgid "Search:"
 msgstr "Buscar:"
 
-#: templates/web/base/admin/reports/index.html:27 templates/web/base/around/lookup_by_ref.html:18
+#: templates/web/base/admin/reports/index.html:27
+#: templates/web/base/around/lookup_by_ref.html:18
 msgid "Searching found no reports."
 msgstr "A busca não encontrou nenhuma denúncia."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "A busca não encontrou nenhum usuário."
 
-#: templates/web/base/auth/generate_token.html:2 templates/web/base/auth/generate_token.html:45 templates/web/base/my/my.html:75
+#: templates/web/base/auth/generate_token.html:2
+#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/web/base/report/form/private_details.html:14 templates/web/base/report/new/councils_text_private.html:8
+#: templates/web/base/report/form/private_details.html:14
+#: templates/web/base/report/new/councils_text_private.html:8
 msgid "See our privacy policy"
 msgstr "Veja nossa poítica de privacidade"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768 perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr "Veja detalhes do usuário para dennúncias criadas como: órgão"
 
-#: templates/web/base/admin/bodies/form.html:41 templates/web/zurich/admin/bodies/form.html:16
+#: templates/web/base/admin/bodies/form.html:41
+#: templates/web/zurich/admin/bodies/form.html:16
 msgid "Select a body"
 msgstr "Selecionar um órgão"
 
-#: templates/web/base/admin/bodies/form.html:78 templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/bodies/form.html:78
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Selecionar uma área"
@@ -3570,7 +4023,8 @@ msgstr "Selecionar múltiplos sinalizadores?"
 msgid "Select:"
 msgstr "Selecionar:"
 
-#: templates/web/base/contact/enquiry/index.html:75 templates/web/base/contact/index.html:120
+#: templates/web/base/contact/enquiry/index.html:76
+#: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr "Enviar"
 
@@ -3582,19 +4036,20 @@ msgstr "Enviar contagem de falhas:"
 msgid "Send extended Open311 statuses with service request updates"
 msgstr "Envie status estendidos do Open311 com atualizações de solicitação de serviço"
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr "Enviar e-mail de login"
 
-#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:5
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:5
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr "O envio de um texto de confirmação falhou: \"%s\""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "Enviado denúncia de volta"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Enviar para %s %s depois"
 
@@ -3602,11 +4057,14 @@ msgstr "Enviar para %s %s depois"
 msgid "Sent:"
 msgstr "Enviado:"
 
-#: templates/web/base/admin/reports/edit.html:97 templates/web/zurich/admin/stats/index.html:66
+#: templates/web/base/admin/reports/edit.html:97
+#: templates/web/zurich/admin/stats/index.html:66
 msgid "Service:"
 msgstr "Serviço:"
 
-#: templates/web/base/auth/change_password.html:2 templates/web/base/auth/change_password.html:4 templates/web/base/my/my.html:70
+#: templates/web/base/auth/change_password.html:2
+#: templates/web/base/auth/change_password.html:4
+#: templates/web/base/my/my.html:70
 msgid "Set password"
 msgstr "Definir senha"
 
@@ -3622,21 +4080,26 @@ msgstr "Compartilhar"
 msgid "Short Name"
 msgstr "Abreviação"
 
-#: 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/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 "Lista de atalhos"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr "Lista toda visível"
 
-#: templates/web/base/report/_main.html:147 templates/web/base/report/_main.html:26 templates/web/base/report/_main.html:31
+#: templates/web/base/report/_main.html:147
+#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:31
 #: templates/web/base/reports/_list-filter-status.html:24
 msgid "Shortlisted"
 msgstr "Favoritado"
 
-#: templates/web/base/report/_item.html:15 templates/web/base/report/_main.html:157
+#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr "Listado por %s"
 
@@ -3660,7 +4123,8 @@ msgstr "Mostrar nome publicamente?"
 msgid "Show older"
 msgstr "Mostrar antigo"
 
-#: templates/web/base/admin/triage/_list-filters.html:43 templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr "Mostrar denúncias antigas"
 
@@ -3669,8 +4133,9 @@ msgid "Show photo"
 msgstr "Mostrar foto"
 
 #. ("JS")
-#: templates/web/base/around/display_location.html:63 templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/around/display_location.html:63
+#: templates/web/base/around/display_location.html:71
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Mostrar marcadores"
 
@@ -3682,8 +4147,12 @@ msgstr "Mostrar nome de de quem denunciou"
 msgid "Show reports in your area"
 msgstr "Mostrar denúncias em sua área"
 
-#: 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
+#: 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 "Entrar"
 
@@ -3692,14 +4161,11 @@ msgid "Sign in by email instead, providing a new password. When you click the li
 msgstr "Entre por email alternativamente, criando uma nova senha. Ao clicar no link em seu e-mail, sua senha será atualizada."
 
 #: templates/web/base/auth/create.html:24
-msgid ""
-"Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your "
-"password will be updated."
-msgstr ""
-"Faça login por e-mail ou sms, fornecendo uma nova senha. Quando você clicar no link em seu e-mail ou digitar o código de autenticação "
-"do SMS, sua senha será atualizada."
+msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated."
+msgstr "Faça login por e-mail ou sms, fornecendo uma nova senha. Quando você clicar no link em seu e-mail ou digitar o código de autenticação do SMS, sua senha será atualizada."
 
-#: templates/web/base/auth/general.html:1 templates/web/zurich/auth/general.html:1
+#: templates/web/base/auth/general.html:1
+#: templates/web/zurich/auth/general.html:1
 msgid "Sign in or create an account"
 msgstr "Entrar ou criar uma conta"
 
@@ -3707,7 +4173,8 @@ msgstr "Entrar ou criar uma conta"
 msgid "Sign in with a password"
 msgstr "Entrar com uma senha"
 
-#: templates/web/base/auth/create.html:31 templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:77
+#: templates/web/base/auth/create.html:31
+#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:77
 #: templates/web/zurich/auth/sign_out.html:1
 msgid "Sign out"
 msgstr "Sair"
@@ -3716,7 +4183,8 @@ msgstr "Sair"
 msgid "Some categories may require additional information."
 msgstr "Algumas categorias podem requerer informação adicional."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:40 templates/web/base/admin/bodies/open311-form-fields.html:41
+#: templates/web/base/admin/bodies/open311-form-fields.html:40
+#: templates/web/base/admin/bodies/open311-form-fields.html:41
 msgid ""
 "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n"
 "          sent from your FixMyStreet installation."
@@ -3729,7 +4197,7 @@ msgid "Some photos of recent reports"
 msgstr "Fotos de denúncias recentes"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Algum texto para localizar"
 
@@ -3738,11 +4206,11 @@ msgid "Someone has moderated this report since you started."
 msgstr "Alguém moderou esta denúncia desde que você começou."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr "Ops! Você alcançou o limite de imagens que podem ser adicionadas em uma denúncia."
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100 perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Desculpe, parece ser um código postal ou uma cidade que ainda não cobrimos."
 
@@ -3750,7 +4218,9 @@ msgstr "Desculpe, parece ser um código postal ou uma cidade que ainda não cobr
 msgid "Sorry, that wasn&rsquo;t a valid link"
 msgstr "Ops! Este não é um link válido"
 
-#: templates/web/base/auth/2fa/form-add.html:7 templates/web/base/auth/2fa/form.html:5 templates/web/base/auth/smsform.html:16
+#: templates/web/base/auth/2fa/form-add.html:7
+#: templates/web/base/auth/2fa/form.html:5
+#: templates/web/base/auth/smsform.html:16
 msgid "Sorry, that wasn&rsquo;t the correct code"
 msgstr "Ops! Este não é o código correto"
 
@@ -3758,21 +4228,26 @@ msgstr "Ops! Este não é o código correto"
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Desculpe, houve um erro ao confirmar seu 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/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Desculpe, nós não conseguimos encontrar esta localização."
 
-#: templates/web/base/auth/general.html:16 templates/web/base/report/display.html:29
+#: templates/web/base/auth/general.html:16
+#: templates/web/base/report/display.html:29
 #: templates/web/base/report/new/fill_in_details_form.html:26
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr "Desculpe, não conseguimod fazer seu login. Preencha o formulário abaixo."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44 perllib/FixMyStreet/Geocode/Google.pm:56 perllib/FixMyStreet/Geocode/Zurich.pm:119
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
+#: perllib/FixMyStreet/Geocode/Google.pm:56
+#: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Desculpe, não foi possível encontrar esta localização. Por favor tente novamente."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108 perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
+#: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
 msgstr "Desculpe, não conseguimos salvar seus arquivos, por favor tente novamente."
@@ -3785,15 +4260,12 @@ msgstr "Desculpe, não conseguimos abrir a página por problema de conexão."
 msgid "Sorry, you don't have permission to do that."
 msgstr "Desculpe, você não tem permissão para fazer isto."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
-msgid ""
-"Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> "
-"to view this report."
-msgstr ""
-"Ops! Você não tem permissão para fazer isso. Se você denunciou o problema, ou é um membro da equipe, por favor clique em <a href=\"%s"
-"\">Entrar</a> para ver esta denúncia."
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
+msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
+msgstr "Ops! Você não tem permissão para fazer isso. Se você denunciou o problema, ou é um membro da equipe, por favor clique em <a href=\"%s\">Entrar</a> para ver esta denúncia."
 
-#: templates/web/base/admin/triage/_list-filters.html:28 templates/web/base/reports/_list-filters-sort.html:2
+#: templates/web/base/admin/triage/_list-filters.html:29
+#: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Ordenar por"
 
@@ -3801,11 +4273,11 @@ msgstr "Ordenar por"
 msgid "Staff only"
 msgstr "Apenas a equipe"
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr "Os usuários da equipe têm permissão para fazer login no painel de administração."
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr "Equipe:"
 
@@ -3817,50 +4289,70 @@ msgstr "Área de teste"
 msgid "Start Date"
 msgstr "Data Início"
 
-#: templates/web/base/admin/bodies/body.html:74 templates/web/base/admin/bodies/category.html:30
-#: templates/web/base/admin/bodies/contact-form.html:22 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:70
-#: templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports/index.html:16
-#: templates/web/base/admin/templates/edit.html:50 templates/web/base/admin/templates/view.html:8
-#: templates/web/base/admin/users/alerts.html:11 templates/web/base/dashboard/index.html:102 templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78 templates/web/base/report/update/form_update.html:41
+#: templates/web/base/admin/bodies/body.html:74
+#: templates/web/base/admin/bodies/category.html:30
+#: templates/web/base/admin/bodies/contact-form.html:22
+#: templates/web/base/admin/flagged.html:18
+#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/list_updates.html:11
+#: templates/web/base/admin/reports/index.html:16
+#: templates/web/base/admin/templates/edit.html:50
+#: templates/web/base/admin/templates/view.html:8
+#: templates/web/base/admin/users/alerts.html:11
+#: templates/web/base/dashboard/index.html:102
+#: templates/web/base/report/_inspect.html:34
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107 perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr "O estado e o código de status externo não podem ser usados ​​simultaneamente."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106 templates/web/base/report/_update_state.html:7 templates/web/base/report/updates.html:21
+#: perllib/FixMyStreet/Script/Alerts.pm:107
+#: templates/web/base/report/_update_state.html:7
+#: templates/web/base/report/updates.html:21
 msgid "State changed to:"
 msgstr "Estado modificado para:"
 
-#: templates/web/base/admin/reports/edit.html:128 templates/web/base/admin/update_edit.html:28
-#: templates/web/zurich/admin/report_edit-sdm.html:63 templates/web/zurich/admin/reports/edit.html:139
-#: templates/web/zurich/admin/reports/edit.html:91 templates/web/zurich/admin/update_edit.html:17
+#: templates/web/base/admin/reports/edit.html:128
+#: templates/web/base/admin/update_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:63
+#: templates/web/zurich/admin/reports/edit.html:143
+#: templates/web/zurich/admin/reports/edit.html:91
+#: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Estado:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686 perllib/FixMyStreet/Cobrand/KiitC.pm:320 perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr "Estados"
 
-#: 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
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/admin/stats/index.html:1
+#: templates/web/base/admin/stats/state.html:1
+#: templates/web/zurich/admin/stats/index.html:1
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Estatísticas"
 
-#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Status"
 
-#: templates/web/base/report/_update_state.html:22 templates/web/base/report/updates.html:25
+#: templates/web/base/report/_update_state.html:22
+#: templates/web/base/report/updates.html:25
 msgid "Still open, via questionnaire"
 msgstr "Ainda aberto, via questionário"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/reports/edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:27
+#: templates/web/zurich/admin/reports/edit.html:28
 msgid "Street View"
 msgstr "Visão da Rua"
 
@@ -3868,51 +4360,67 @@ msgstr "Visão da Rua"
 msgid "Subcategory"
 msgstr "Subcategoria"
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Subdivisão/Órgão"
 
-#: templates/web/base/contact/enquiry/index.html:30 templates/web/base/contact/index.html:103
+#: templates/web/base/contact/enquiry/index.html:30
+#: templates/web/base/contact/index.html:103
 msgid "Subject"
 msgstr "Assunto"
 
-#: templates/web/base/admin/reports/edit.html:122 templates/web/base/report/update/moderation_diff.html:2
+#: templates/web/base/admin/reports/edit.html:122
+#: templates/web/base/report/update/moderation_diff.html:2
 #: templates/web/zurich/admin/reports/edit.html:41
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: 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
+#: 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/submit.html:1
+#: templates/web/base/report/form/submit.html:2
+#: templates/web/base/report/form/user_loggedout_password.html:29
+#: templates/web/base/report/new/form_report.html:21
+#: templates/web/base/report/new/report_import.html:103
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/web/base/admin/reports/edit.html:185 templates/web/base/admin/reports/edit.html:25
-#: templates/web/base/admin/update_edit.html:82 templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111 templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/reports/edit.html:198
+#: templates/web/base/admin/reports/edit.html:25
+#: templates/web/base/admin/update_edit.html:82
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Enviar mudanças"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Enviar questionário"
 
-#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-dm.html:8 templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
+#: templates/web/zurich/admin/index-dm.html:8
 msgid "Submitted"
 msgstr "Enviado"
 
-#: templates/web/base/alert/_list.html:72 templates/web/base/alert/_list.html:75 templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27 templates/web/base/alert/updates.html:34 templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56 templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Se inscreva"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr "Se inscreva por e-mail"
 
@@ -3924,7 +4432,8 @@ msgstr "Inscrito:"
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Resumos são limitados a %d caracteres. Por favor, seja mais breve"
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138 perllib/FixMyStreet/Cobrand/Rutland.pm:16
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
+#: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr "Resumos são limitados a %s caracteres. Por favor, seja mais breve"
 
@@ -3937,38 +4446,53 @@ msgstr "Resumos são limitados a {0} caracteres. Por favor, seja mais breve"
 msgid "Summarise the problem"
 msgstr "Resumir o problema"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Resumir suas mudanças"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678 perllib/FixMyStreet/Cobrand/KiitC.pm:314 perllib/FixMyStreet/Cobrand/Zurich.pm:409
-#: templates/web/base/admin/bodies/index.html:29 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
-#: templates/web/base/status/index.html:3 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1
-#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:45
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
+#: templates/web/base/admin/bodies/index.html:29
+#: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
+#: templates/web/base/status/index.html:3
+#: templates/web/zurich/admin/index-dm.html:1
+#: templates/web/zurich/admin/index-sdm.html:1
+#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Resumo"
 
-#: templates/web/zurich/reports/index.html:0 templates/web/zurich/reports/index.html:6
+#: templates/web/zurich/reports/index.html:0
+#: templates/web/zurich/reports/index.html:6
 msgid "Summary reports"
 msgstr "Resumo de denúncias"
 
-#: templates/web/base/admin/stats/index.html:15 templates/web/base/dashboard/index.html:21
+#: templates/web/base/admin/stats/index.html:15
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr "Resumo de estatísticas"
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Superuser"
+msgstr "Superusuário:"
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr "Superusuário:"
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "Superusuários tem permissão para executar <strong>qualquer ação</strong> dentro da administração."
 
-#: templates/web/base/admin/stats/index.html:12 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 "Resultados da Pesquisa"
 
-#: templates/web/base/report/form/private_details.html:2 templates/web/base/report/form/user.html:5
+#: templates/web/base/report/form/private_details.html:2
+#: templates/web/base/report/form/user.html:5
 msgid "Tell us about you"
 msgstr "Nos conte sobre você"
 
@@ -3976,11 +4500,18 @@ msgstr "Nos conte sobre você"
 msgid "Template &laquo;%s&raquo;"
 msgstr "Modelo &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704 perllib/FixMyStreet/Cobrand/Zurich.pm:420 templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
+#: templates/web/base/develop/email_list.html:3
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Modelos"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Menos atualizado recentemente"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Texto"
@@ -3993,23 +4524,26 @@ msgstr "Campo de texto"
 msgid "Text only version"
 msgstr "Versão de texto"
 
-#: templates/web/base/admin/templates/edit.html:35 templates/web/base/admin/update_edit.html:20
-#: templates/web/base/admin/update_edit.html:94 templates/web/zurich/admin/templates/edit.html:27
+#: templates/web/base/admin/templates/edit.html:35
+#: templates/web/base/admin/update_edit.html:20
+#: templates/web/base/admin/update_edit.html:94
+#: templates/web/zurich/admin/templates/edit.html:27
 #: templates/web/zurich/admin/update_edit.html:12
 msgid "Text:"
 msgstr "Texto:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Texto"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Obrigado por denunciar este problema!"
 
 #: templates/web/base/tokens/error.html:6
-msgid ""
-"Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us "
-"know what went on</a> and we'll look into it."
-msgstr ""
-"Obrigado por tentar confirmar sua atualização ou problema. Parece que aconteceu algum erro, então <a href=\"%s\">por favor, deixe-"
-"nossaber o que aconteceu</a> e nós iremos dar uma olhada."
+msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
+msgstr "Obrigado por tentar confirmar sua atualização ou problema. Parece que aconteceu algum erro, então <a href=\"%s\">por favor, deixe-nossaber o que aconteceu</a> e nós iremos dar uma olhada."
 
 #: templates/web/base/tokens/confirm_update.html:16
 msgid "Thank you for updating this issue!"
@@ -4024,18 +4558,15 @@ msgid "Thank you for your feedback"
 msgstr "Obrigado por sua opinião"
 
 #: templates/web/base/around/_error_multiple.html:26
-msgid ""
-"Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box "
-"above&nbsp;:"
-msgstr ""
-"Obrigado por enviar sua foto. Agora precisamos localizar o seu problema, então insira o nome de uma rua próxima ou cep na caixaacima:"
+msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:"
+msgstr "Obrigado por enviar sua foto. Agora precisamos localizar o seu problema, então insira o nome de uma rua próxima ou cep na caixaacima:"
 
 #: templates/web/base/questionnaire/creator_fixed.html:9
 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 ""
-"Obrigado, ficamos felizes em saber que foi corrigido! Podería apenas nos dizer se você já denunciou um problema para um órgão antes?"
+msgstr "Obrigado, ficamos felizes em saber que foi corrigido! Podería apenas nos dizer se você já denunciou um problema para um órgão antes?"
 
-#: templates/web/base/auth/2fa/intro.html:11 templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/2fa/intro.html:11
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr "Obrigado, você habilitou com sucesso a autenticação em duas etapas para sua conta."
 
@@ -4045,28 +4576,31 @@ msgstr "Esta imagem parece não ter sido enviada corretamente (%s), por favor te
 
 #: perllib/FixMyStreet/App/Controller/Council.pm:105
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
-msgstr ""
-"Esta localização não parece ser coberta por um órgão; talvez seja fora da área que o AjeitaMinhaRua cobre, ou fora do país. Por "
-"favor, tente novamente."
+msgstr "Esta localização não parece ser coberta por um órgão; talvez seja fora da área que o AjeitaMinhaRua cobre, ou fora do país. Por favor, tente novamente."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Esse local não parece ser no Brasil; Por favor, tente novamente."
 
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93 perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "O CEP não foi encontrado, desculpe."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "O problema foi marcado como enviado."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Este problema será reenviado."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "A denúncia foi removida do AjeitaMinhaRua."
 
@@ -4087,16 +4621,11 @@ msgid "That user’s reports and updates have been hidden."
 msgstr "As denúncias e atualizações desse usuário foram escondidos."
 
 #: templates/web/base/admin/manifesttheme/form.html:20
-msgid ""
-"The <strong>background colour</strong> defines a placeholder background colour for the application splash screen before it has "
-"loaded.  Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</"
-"code></strong> or a named colour like <strong><code>fuchsia</code></strong>."
-msgstr ""
-"A <strong>cor de fundo</strong> define uma cor de fundo do espaço reservado para a tela de carregamento do aplicativo antes de ser "
-"carregada.  As cores devem ser especificadas com sintaxe CSS, por exemplo <strong><code>#ff00ff</code></strong>, ou "
-"<strong><code>rgb(255, 0, 255)</code></strong> uma cor nomeada como <strong><code>fuchsia</code></strong> ."
+msgid "The <strong>background colour</strong> defines a placeholder background colour for the application splash screen before it has loaded.  Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</code></strong>."
+msgstr "A <strong>cor de fundo</strong> define uma cor de fundo do espaço reservado para a tela de carregamento do aplicativo antes de ser carregada.  As cores devem ser especificadas com sintaxe CSS, por exemplo <strong><code>#ff00ff</code></strong>, ou <strong><code>rgb(255, 0, 255)</code></strong> uma cor nomeada como <strong><code>fuchsia</code></strong> ."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:14 templates/web/base/admin/bodies/open311-form-fields.html:15
+#: templates/web/base/admin/bodies/open311-form-fields.html:14
+#: templates/web/base/admin/bodies/open311-form-fields.html:15
 msgid ""
 "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n"
 "            when sending reports to this body."
@@ -4105,14 +4634,11 @@ msgstr ""
 "            para enviar denúncias a este órgão."
 
 #: templates/web/base/admin/manifesttheme/form.html:49
-msgid ""
-"The <strong>icons</strong> are used when the application is installed to the user's home screen. Icons must be <strong>square</"
-"strong>, with <strong>512x512</strong>px and <strong>192x192</strong>px being the most common sizes."
-msgstr ""
-"Os <strong>ícones</strong> são usados quando a aplicação é instalada na tela inicial do usuário. Os ícones precisam ser "
-"<strong>quadrados</strong>, e medirem <strong>512x512</strong>px e <strong>192x192</strong>px."
+msgid "The <strong>icons</strong> are used when the application is installed to the user's home screen. Icons must be <strong>square</strong>, with <strong>512x512</strong>px and <strong>192x192</strong>px being the most common sizes."
+msgstr "Os <strong>ícones</strong> são usados quando a aplicação é instalada na tela inicial do usuário. Os ícones precisam ser <strong>quadrados</strong>, e medirem <strong>512x512</strong>px e <strong>192x192</strong>px."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:27 templates/web/base/admin/bodies/open311-form-fields.html:28
+#: templates/web/base/admin/bodies/open311-form-fields.html:27
+#: templates/web/base/admin/bodies/open311-form-fields.html:28
 msgid ""
 "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n"
 "          than one. If the body is running its own endpoint, you can usually leave this blank."
@@ -4121,15 +4647,13 @@ msgstr ""
 "          de um. Se o órgão têm seu próprio caminho, você pode deixar isto em branco."
 
 #: templates/web/base/admin/manifesttheme/form.html:5
-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 ""
-"O <strong>name</strong> é uma cadeia de caracteres que representa o nome da aplicação  web como é mostrada para o usuário (ex., numa "
-"lista de  aplicativos, ou como um rótulo para um ícone)."
+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 "O <strong>name</strong> é uma cadeia de caracteres que representa o nome da aplicação  web como é mostrada para o usuário (ex., numa lista de  aplicativos, ou como um rótulo para um ícone)."
 
-#: 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
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
+#: templates/web/base/admin/bodies/form.html:101
+#: templates/web/base/admin/bodies/form.html:102
 msgid ""
 "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>."
@@ -4138,40 +4662,24 @@ msgstr ""
 "           Se você deixar este campo em branco, <strong>o método padrão de envio será email</strong>."
 
 #: templates/web/base/admin/manifesttheme/form.html:10
-msgid ""
-"The <strong>short name</strong> is a string that represents the name of the web application displayed to the user if there is not "
-"enough space to display name (e.g., as a label for an icon on the phone home screen)."
-msgstr ""
-"O <strong>nome curto</strong> é uma string que representa o nome do aplicativo web exibido ao usuário se não houver espaço suficiente "
-"para exibir o nome (por exemplo, como um nome para um ícone na tela inicial do telefone)."
+msgid "The <strong>short name</strong> is a string that represents the name of the web application displayed to the user if there is not enough space to display name (e.g., as a label for an icon on the phone home screen)."
+msgstr "O <strong>nome curto</strong> é uma string que representa o nome do aplicativo web exibido ao usuário se não houver espaço suficiente para exibir o nome (por exemplo, como um nome para um ícone na tela inicial do telefone)."
 
 #: templates/web/base/admin/manifesttheme/form.html:15
-msgid ""
-"The <strong>theme colour</strong> defines the default theme colour for the application. This sometimes affects how the OS displays "
-"the site (e.g., on Android's task switcher, the theme colour surrounds the site). Colours should be specified with CSS syntax, e.g. "
-"<strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</"
-"code></strong>."
-msgstr ""
-"A <strong>cor do tema</strong> define a cor do tema padrão para a aplicação. Isso às vezes afeta a forma como o SISTEMA OPERACIONAL "
-"exibe o site (por exemplo, no gerenciador de tarefas do Android, a cor do tema envolve o site). As cores devem ser especificadas com "
-"sintaxe CSS, por exemplo<strong><code>#ff00ff</code></strong> , ou <strong><code>rgb(255, 0, 255)</code></strong> uma cor nomeada "
-"como <strong><code>fuchsia</code></strong> ."
+msgid "The <strong>theme colour</strong> defines the default theme colour for the application. This sometimes affects how the OS displays the site (e.g., on Android's task switcher, the theme colour surrounds the site). Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</code></strong>."
+msgstr "A <strong>cor do tema</strong> define a cor do tema padrão para a aplicação. Isso às vezes afeta a forma como o SISTEMA OPERACIONAL exibe o site (por exemplo, no gerenciador de tarefas do Android, a cor do tema envolve o site). As cores devem ser especificadas com sintaxe CSS, por exemplo<strong><code>#ff00ff</code></strong> , ou <strong><code>rgb(255, 0, 255)</code></strong> uma cor nomeada como <strong><code>fuchsia</code></strong> ."
 
 #: templates/web/base/open311/index.html:82
-msgid ""
-"The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite "
-"the way the attribute is defined in the Open311 v2 specification."
-msgstr ""
-"O atributo Open311 v2 agency_responsible é usado para listar as administrações que receberam a denúncia do problema, que não é bem a "
-"maneira como o atributo é definido na especificação Open311 v2."
+msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification."
+msgstr "O atributo Open311 v2 agency_responsible é usado para listar as administrações que receberam a denúncia do problema, que não é bem a maneira como o atributo é definido na especificação Open311 v2."
 
-#: templates/web/base/admin/bodies/form.html:17 templates/web/base/admin/bodies/form.html:18
+#: templates/web/base/admin/bodies/form.html:17
+#: templates/web/base/admin/bodies/form.html:18
 msgid ""
 "The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n"
 "          and may be displayed publically."
 msgstr ""
-"O <strong>nome</strong> do órgão identifica ele (por exemplo, <em>Secretaria Municipal de Segurança Pública de Juazeiro do Norte</"
-"em>)\n"
+"O <strong>nome</strong> do órgão identifica ele (por exemplo, <em>Secretaria Municipal de Segurança Pública de Juazeiro do Norte</em>)\n"
 "           e podem ser exibidos publicamente."
 
 #: templates/web/base/admin/extra-metadata-item.html:30
@@ -4182,40 +4690,31 @@ msgstr "O código usado para armazenar o valor deste campo no banco de dados."
 msgid "The contact has been confirmed as correct."
 msgstr "O contato foi confirmado como correto."
 
-#: templates/web/base/report/new/fill_in_details_text.html:2 templates/web/base/report/new/fill_in_details_text.html:3
-msgid ""
-"The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem "
-"(e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
-msgstr ""
-"O órgão não será capaz de ajudar a menos que você especifique o máximo de detalhes que puder. Por favor, descreva a localização exata "
-"do problema (ex.: em uma parede, perto do poste), o que é, quanto tempo está lá, uma descrição (e uma foto do problema se você tiver "
-"uma), etc."
+#: templates/web/base/report/new/fill_in_details_text.html:2
+#: templates/web/base/report/new/fill_in_details_text.html:3
+msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
+msgstr "O órgão não será capaz de ajudar a menos que você especifique o máximo de detalhes que puder. Por favor, descreva a localização exata do problema (ex.: em uma parede, perto do poste), o que é, quanto tempo está lá, uma descrição (e uma foto do problema se você tiver uma), etc."
 
-#: templates/web/base/admin/bodies/edit-league.html:3 templates/web/base/admin/bodies/edit-league.html:4
+#: templates/web/base/admin/bodies/edit-league.html:3
+#: templates/web/base/admin/bodies/edit-league.html:4
 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
 msgstr "A tabela da liga do prêmio de diligência mostra a atividade dos editores (quem tem editado a maioria dos registros)."
 
-#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 perllib/FixMyStreet/App/Controller/Reports.pm:58
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45
+#: perllib/FixMyStreet/App/Controller/Reports.pm:58
 msgid "The error was: %s"
 msgstr "O erro foi: %s"
 
 #: templates/web/base/open311/index.html:78
-msgid ""
-"The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, "
-"requested_datetime, updated_datetime, service_code and service_name."
-msgstr ""
-"Os seguintes atributos v2 Open311 são retornados em cada requisição:  service_request_id, description, lat, long, media_url, status, "
-"requested_datetime, updated_datetime, service_code and service_name."
+msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
+msgstr "Os seguintes atributos v2 Open311 são retornados em cada requisição:  service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
-msgid ""
-"The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close "
-"to a road without a name registered in OpenStreetMap."
-msgstr ""
-"As seguintes informações sobre a estrada mais próxima podem ser imprecisas ou irrelevantes, em caso do problema se encontrar perto de "
-"várias estradas ou perto de uma estrada sem um nome registrado no OpenStreetMap."
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
+msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
+msgstr "As seguintes informações sobre a estrada mais próxima podem ser imprecisas ou irrelevantes, em caso do problema se encontrar perto de várias estradas ou perto de uma estrada sem um nome registrado no OpenStreetMap."
 
-#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27 db/alert_types.pl:31
+#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27
+#: db/alert_types.pl:31
 msgid "The latest local problems reported by users"
 msgstr "Os últimos problemas locais denunciados pelos usuários"
 
@@ -4247,7 +4746,8 @@ msgstr "O link pode ter expirado, ou talvez você não tenha copiado e colado co
 msgid "The list of available areas is being provided by the MapIt service at %s."
 msgstr "A lista de áreas disponíveis está sendo fornecida pelo serviço MapIt em %s."
 
-#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:30
+#: templates/web/base/auth/change_password.html:26
+#: templates/web/base/auth/change_password.html:30
 msgid "The passwords do not match"
 msgstr "As senhas não são iguais"
 
@@ -4257,8 +4757,7 @@ msgstr "O endereço '%s' não foi encontrado neste servidor"
 
 #: templates/web/base/admin/roles/form.html:5
 msgid "The role's <strong>name</strong> is used to refer to this group of permissions elsewhere in the admin."
-msgstr ""
-"O <strong>nome</strong> da função name é usado para se referir a este grupo de permissões, em qualquer lugar do painel administrativo."
+msgstr "O <strong>nome</strong> da função name é usado para se referir a este grupo de permissões, em qualquer lugar do painel administrativo."
 
 #: templates/web/base/admin/users/import.html:68
 msgid "The uploaded CSV file must contain a header row, and records can have the following fields:"
@@ -4272,7 +4771,8 @@ msgstr "O usuário não conseguiu localizar o problema no mapa, apenas a área a
 msgid "The user has been sent a login email"
 msgstr "O usuário recebeu um e-mail de login"
 
-#: templates/web/base/admin/users/form.html:13 templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4292,8 +4792,10 @@ msgstr "Cor do Tema"
 msgid "Themes"
 msgstr "Temas"
 
-#: templates/web/base/around/_on_map_empty.html:1 templates/web/base/dashboard/heatmap-list.html:21
-#: templates/web/base/my/_problem-list.html:8 templates/web/base/reports/_problem-list.html:13
+#: templates/web/base/around/_on_map_empty.html:1
+#: templates/web/base/dashboard/heatmap-list.html:21
+#: templates/web/base/my/_problem-list.html:8
+#: templates/web/base/reports/_problem-list.html:13
 msgid "There are no reports to show."
 msgstr "Não há denúncias para mostrar."
 
@@ -4305,7 +4807,7 @@ msgstr "Existem problemas semelhantes nas proximidades, e já estamos cientes, a
 msgid "There is already a template with that title."
 msgstr "Já existe um modelo com esse título."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr "Já existe um modelo de resposta automática para esta categoria/estado."
 
@@ -4313,23 +4815,22 @@ msgstr "Já existe um modelo de resposta automática para esta categoria/estado.
 msgid "There was a problem showing the All Reports page. Please try again later."
 msgstr "Houve um problema ao tentar mostrar a página de Todos as Denúncias. Por favor tente novamente mais tarde."
 
-#: perllib/FixMyStreet/App/Controller/Contact.pm:170 perllib/FixMyStreet/App/Controller/Dashboard.pm:44
+#: perllib/FixMyStreet/App/Controller/Contact.pm:170
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Houve um problema ao tentar mostrar esta página. Por favor tente novamente mais tarde."
 
-#: templates/web/base/auth/_username_error.html:0 templates/web/base/auth/_username_error.html:14
+#: templates/web/base/auth/_username_error.html:0
+#: templates/web/base/auth/_username_error.html:14
 msgid "There was a problem with your login information."
 msgstr "Houve um problema com sua informação de login."
 
-#: 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 ""
-"Houve um problema com suas informações de login. Se você não se lembrar de sua senha ou não tiver uma, preencha a seção 'Não' do "
-"formulário."
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
+msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
+msgstr "Houve um problema com suas informações de login. Se você não se lembrar de sua senha ou não tiver uma, preencha a seção 'Não' do formulário."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Houve um problema com sua atualização. Por favor tente novamente."
 
@@ -4337,7 +4838,7 @@ msgstr "Houve um problema com sua atualização. Por favor tente novamente."
 msgid "There were problems with your report. Please see below."
 msgstr "Houveram problemas com o sua denúncia. Por favor veja abaixo."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Houveram problemas com o sua atualização. Por favor veja abaixo."
 
@@ -4345,7 +4846,8 @@ msgstr "Houveram problemas com o sua atualização. Por favor veja abaixo."
 msgid "These categories appear in more than one group:"
 msgstr "Essas categorias aparecem em mais de um grupo:"
 
-#: templates/web/base/report/form/private_details.html:13 templates/web/base/report/new/councils_text_private.html:6
+#: templates/web/base/report/form/private_details.html:13
+#: templates/web/base/report/new/councils_text_private.html:6
 msgid "These details will be sent to the council, but will never be shown online without your permission."
 msgstr "Estes detalhes serão enviados ao órgão responsável, mas nunca serão mostrados online sem sua permissão."
 
@@ -4353,7 +4855,8 @@ msgstr "Estes detalhes serão enviados ao órgão responsável, mas nunca serão
 msgid "These details will never be shown online without your permission."
 msgstr "Estes detalhes nunca serão mostrados online sem sua permissão."
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:3 templates/web/base/admin/bodies/open311-form-fields.html:4
+#: templates/web/base/admin/bodies/open311-form-fields.html:3
+#: templates/web/base/admin/bodies/open311-form-fields.html:4
 msgid ""
 "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n"
 "           <strong>You don't need to set them if the Send Method is email.</strong>.\n"
@@ -4371,20 +4874,18 @@ msgstr ""
 msgid "These users weren't updated."
 msgstr "Estes usuários não foram atualizados."
 
-#: templates/web/base/report/new/councils_text.html:4 templates/web/base/report/new/councils_text.html:5
+#: templates/web/base/report/new/councils_text.html:4
+#: templates/web/base/report/new/councils_text.html:5
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr ""
-"Estas informações serão publicadas online para que outros vejam, de acordo com nossa <a href=\"%s\">política de privacidade</a>."
+msgstr "Estas informações serão publicadas online para que outros vejam, de acordo com nossa <a href=\"%s\">política de privacidade</a>."
 
-#: templates/web/base/report/new/councils_text_all.html:6 templates/web/base/report/new/councils_text_all.html:9
-msgid ""
-"These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href=\"%s\">privacy "
-"policy</a>."
-msgstr ""
-"Estas informações serão enviadas à <strong>%s</strong> e também serão publicadas online para que outros vejam, de acordo com nossa <a "
-"href=\"%s\">política de privacidade</a>."
+#: templates/web/base/report/new/councils_text_all.html:6
+#: templates/web/base/report/new/councils_text_all.html:9
+msgid "These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
+msgstr "Estas informações serão enviadas à <strong>%s</strong> e também serão publicadas online para que outros vejam, de acordo com nossa <a href=\"%s\">política de privacidade</a>."
 
-#: templates/web/base/report/new/councils_text_all.html:16 templates/web/base/report/new/councils_text_all.html:6
+#: templates/web/base/report/new/councils_text_all.html:16
+#: templates/web/base/report/new/councils_text_all.html:6
 msgid "These will be sent to <strong>%s</strong> but not published online."
 msgstr "Estas informações serão enviadas à <strong>%s</strong> mas não serão publicadas online."
 
@@ -4399,17 +4900,15 @@ msgid ""
 "            Currently, users <strong>cannot report problems to this body</strong>."
 msgstr ""
 "Este corpo Não cobre nenhuma área. Isto significa que problemas reportados <em>nesta localização</em> não possuem jurisdição.\n"
-"            Consequentemente, nenhuma destas categorias aparecerão no menu suspenso de categoria quando usuários denunciarem "
-"problemas.\n"
+"            Consequentemente, nenhuma destas categorias aparecerão no menu suspenso de categoria quando usuários denunciarem problemas.\n"
 "            Atualmente, usuários <strong>não podem denunciar problemas para este órgão</strong>."
 
 #: templates/web/base/admin/bodies/body.html:59
 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>."
-msgstr ""
-"Este órgão não possui informações de contato. Isto significa que os problemas denúnciados para este órgão <strong>não serão enviados</"
-"strong>."
+msgstr "Este órgão não possui informações de contato. Isto significa que os problemas denúnciados para este órgão <strong>não serão enviados</strong>."
 
-#: templates/web/base/admin/bodies/form.html:60 templates/web/base/admin/bodies/form.html:61
+#: templates/web/base/admin/bodies/form.html:60
+#: templates/web/base/admin/bodies/form.html:61
 msgid ""
 "This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n"
 "          A body will not receive any reports unless it covers at least one area."
@@ -4418,33 +4917,23 @@ msgstr ""
 "           Um órgão não receberá nenhuma denúncia a menos que cubra pelo menos uma área."
 
 #: 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 ""
-"Este e-mail foi enviado aos dois órgãos que cobrem a localização do problema, pois o usuário não o categorizou; por favor ignore isto "
-"se você não for o órgão correto para lidar com o problema, ou diga-nos qual é a categoria do problema para que possamos adicioná-lo "
-"ao nosso sistema."
+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 "Este e-mail foi enviado aos dois órgãos que cobrem a localização do problema, pois o usuário não o categorizou; por favor ignore isto se você não for o órgão correto para lidar com o problema, ou diga-nos qual é a categoria do problema para que possamos adicioná-lo ao nosso sistema."
 
 #: 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 ""
-"Este e-mail foi enviado para diversos orgãos que cobrem a área do problema, de acordo com a categoria selecionada e fornecida por "
-"todos eles; por favor ignore este email se você não é o órgão correto para lidar com este problema."
+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 "Este e-mail foi enviado para diversos orgãos que cobrem a área do problema, de acordo com a categoria selecionada e fornecida por todos eles; por favor ignore este email se você não é o órgão correto para lidar com este problema."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210 perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Esta informação é necessária"
 
 #: templates/web/base/admin/templates/edit.html:21
 msgid "This is a <strong>private</strong> name for this template so you can identify it when updating reports or editing in the admin."
-msgstr ""
-"Este é um nome <strong>privado</strong> para este modelo, assim você poderá identificá-lo ao atualizar denúncias ou editar, dentro da "
-"administração."
+msgstr "Este é um nome <strong>privado</strong> para este modelo, assim você poderá identificá-lo ao atualizar denúncias ou editar, dentro da administração."
 
 #: templates/web/base/admin/templates/edit.html:31
 msgid "This is the <strong>public</strong> text that will be shown on the site."
@@ -4455,19 +4944,23 @@ msgstr "Este é o texto <strong>público</strong> que será mostrado no site."
 msgid "This is the problem"
 msgstr "Este é o problema"
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr "Esta página é uma forma rápida de criar muitos usuários para administrar de uma vez só."
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Este problema foi solucionado"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Este problema não foi solucionado"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr "Esse problema ainda está em andamento"
 
@@ -4480,23 +4973,26 @@ msgstr "Esta denúncia"
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr "Esta denúncia está duplicada. Por favor, deixe atualizações na denúncia original:"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 perllib/FixMyStreet/Cobrand/Zurich.pm:143 templates/web/zurich/report/_main.html:14
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
+#: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Esta denúncia está aguardando moderação."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Esta denúncia está atualmente marcada como fechada."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Esta denúncia está atualmente marcada como resolvida."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Esta denúncia está atualmente marcada como aberta."
 
-#: templates/web/base/report/_updates_disallowed_message.html:1 templates/web/base/report/display.html:58
+#: templates/web/base/report/_updates_disallowed_message.html:1
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr "Esta denúncia está fechada para atualizações."
 
@@ -4504,13 +5000,21 @@ msgstr "Esta denúncia está fechada para atualizações."
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Esta página da web também contém uma foto do problema, fornecida pelo usuário."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106 templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132 templates/web/zurich/admin/reports/edit.html:94
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
+#: templates/web/zurich/admin/report_edit-sdm.html:66
+#: templates/web/zurich/admin/reports/edit.html:136
+#: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Tempo gasto (em minutos):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679 perllib/FixMyStreet/Cobrand/KiitC.pm:315 templates/web/base/admin/timeline.html:1
-#: templates/web/base/admin/users/index.html:68 templates/web/base/admin/users/log.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
+#: templates/web/base/admin/timeline.html:1
+#: templates/web/base/admin/users/index.html:68
+#: templates/web/base/admin/users/log.html:1
 msgid "Timeline"
 msgstr "Linha do tempo"
 
@@ -4518,15 +5022,23 @@ msgstr "Linha do tempo"
 msgid "Tips for perfect photos"
 msgstr "Dicas para fotos perfeitas"
 
-#: templates/web/base/admin/flagged.html:15 templates/web/base/admin/index.html:67 templates/web/base/admin/reports/index.html:13
-#: templates/web/base/admin/templates/view.html:6 templates/web/zurich/admin/templates/view.html:8
+#: templates/web/base/admin/flagged.html:15
+#: templates/web/base/admin/index.html:67
+#: templates/web/base/admin/reports/index.html:13
+#: templates/web/base/admin/templates/view.html:6
+#: templates/web/zurich/admin/templates/view.html:8
 msgid "Title"
 msgstr "Título"
 
-#: templates/web/base/admin/templates/edit.html:25 templates/web/zurich/admin/templates/edit.html:23
+#: templates/web/base/admin/templates/edit.html:25
+#: templates/web/zurich/admin/templates/edit.html:23
 msgid "Title:"
 msgstr "Título:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "Para encontrar quais alertas locais nós temos para você, por favor digite seu %s CEP ou nome da rua e bairro:"
@@ -4551,7 +5063,8 @@ msgstr "Para fornecer uma atualização, por favor <a href=\"%s\">entre</a>."
 msgid "To view a map of the precise location of this issue"
 msgstr "Para ver uma localização precisa deste problema no mapa"
 
-#: templates/web/base/auth/generate_token.html:11 templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:11
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr "Código de acesso"
 
@@ -4567,16 +5080,15 @@ msgstr "Top 5 orgãos que mais respondem"
 msgid "Top 5 wards"
 msgstr "Top 5 sinalizadores"
 
-#: templates/web/base/admin/stats/fix_rate.html:4 templates/web/base/admin/stats/questionnaire.html:24
-#: templates/web/base/dashboard/index.html:120 templates/web/base/dashboard/index.html:125 templates/web/base/dashboard/index.html:149
+#: templates/web/base/admin/stats/fix_rate.html:4
+#: templates/web/base/admin/stats/questionnaire.html:24
+#: templates/web/base/dashboard/index.html:120
+#: templates/web/base/dashboard/index.html:125
+#: templates/web/base/dashboard/index.html:149
 #: templates/web/zurich/admin/stats/index.html:51
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_item.html:86 templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr "É necessário gerenciamento de tráfego?"
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr "Tradução"
@@ -4586,7 +5098,9 @@ msgid "Translations"
 msgstr "Traduções"
 
 #. ("JS")
-#: templates/web/base/auth/2fa/form-add.html:8 templates/web/base/auth/2fa/form.html:6 templates/web/base/auth/smsform.html:17
+#: templates/web/base/auth/2fa/form-add.html:8
+#: templates/web/base/auth/2fa/form.html:6
+#: templates/web/base/auth/smsform.html:17
 #: templates/web/base/js/translation_strings.html:43
 msgid "Try again"
 msgstr "Tente novamente"
@@ -4595,31 +5109,37 @@ msgstr "Tente novamente"
 msgid "Try emailing us directly:"
 msgstr "Experimente enviar um e-mail direto para nós:"
 
-#: templates/web/base/auth/2fa/intro.html:2 templates/web/base/auth/2fa/intro.html:6 templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/2fa/intro.html:2
+#: templates/web/base/auth/2fa/intro.html:6
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr "Autenticação de duas etapas"
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr "A autenticação de duas etapas foi ativada"
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr "A autenticação de duas etapas foi desativada"
 
-#: templates/web/base/admin/states/index.html:10 templates/web/base/admin/states/index.html:100
+#: templates/web/base/admin/states/index.html:10
+#: templates/web/base/admin/states/index.html:100
 #: templates/web/base/admin/users/alerts.html:9
 msgid "Type"
 msgstr "Tipo"
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr "Desbanir"
 
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 templates/web/base/admin/bodies/contact-form.html:25
-#: templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:54
-#: templates/web/zurich/admin/reports/edit.html:82 templates/web/zurich/admin/update_edit.html:18
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:64
+#: templates/web/base/admin/bodies/contact-form.html:25
+#: templates/web/base/admin/update_edit.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:54
+#: templates/web/zurich/admin/reports/edit.html:82
+#: templates/web/zurich/admin/update_edit.html:18
 msgid "Unconfirmed"
 msgstr "Não confirmado"
 
@@ -4632,14 +5152,18 @@ msgid "Unknown alert type"
 msgstr "Tipo de alerta desconhecido"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Photo.pm:136 perllib/FixMyStreet/App/Controller/Root.pm:147
+#: perllib/FixMyStreet/App/Controller/Photo.pm:136
+#: perllib/FixMyStreet/App/Controller/Root.pm:147
 #: templates/web/base/js/translation_strings.html:57
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: perllib/FixMyStreet/App/Controller/Develop.pm:188 perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229 perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147 perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/Develop.pm:188
+#: perllib/FixMyStreet/App/Controller/Develop.pm:207
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "ID de problema não encontrado"
 
@@ -4651,12 +5175,13 @@ msgstr "ID de atualização não encontrado"
 msgid "Unshortlisted"
 msgstr "Desfavoritado"
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr "Subir um"
 
-#: templates/web/base/admin/states/index.html:76 templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/admin/states/index.html:76
+#: templates/web/base/admin/users/alerts.html:58
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Atualização"
 
@@ -4676,7 +5201,8 @@ msgstr "A atualização abaixo foi adicionada anonimamente as %s"
 msgid "Update below added by %s at %s"
 msgstr "Atualização abaixo adicionada por %s as %s"
 
-#: templates/web/base/admin/bodies/form.html:139 templates/web/zurich/admin/bodies/form.html:63
+#: templates/web/base/admin/bodies/form.html:139
+#: templates/web/zurich/admin/bodies/form.html:63
 msgid "Update body"
 msgstr "Atualizar órgão"
 
@@ -4688,7 +5214,8 @@ msgstr "Atualizações separados por estado"
 msgid "Update by {{name}}"
 msgstr "Atualizado por {{name}}"
 
-#: templates/web/base/admin/update_edit.html:46 templates/web/zurich/admin/update_edit.html:25
+#: templates/web/base/admin/update_edit.html:46
+#: templates/web/zurich/admin/update_edit.html:25
 msgid "Update changed problem state to %s"
 msgstr "Atualizar estado de problema modificado para %s"
 
@@ -4704,32 +5231,38 @@ msgstr "Atualizar problema reaberto"
 msgid "Update statuses"
 msgstr "Status de atualização"
 
-#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Atualizado"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr "Atualizado por <strong>%s</strong> (%s) em %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr "Atualizado por <strong>%s</strong> em %s"
 
-#: 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
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Atualizado!"
 
-#: templates/web/base/admin/list_updates.html:2 templates/web/base/dashboard/index.html:109 templates/web/base/report/update.html:4
+#: templates/web/base/admin/list_updates.html:2
+#: templates/web/base/dashboard/index.html:109
+#: templates/web/base/report/update.html:4
 #: templates/web/zurich/report/updates.html:2
 msgid "Updates"
 msgstr "Atualizados"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Atualizações são limitadas a %s caracteres. Por favor, seja mais breve"
 
@@ -4738,7 +5271,8 @@ msgid "Updates on {{title}}"
 msgstr "Atualizações em {{title}}"
 
 #. ("%s is the site name")
-#: templates/web/base/report/display.html:0 templates/web/base/report/display.html:9
+#: templates/web/base/report/display.html:0
+#: templates/web/base/report/display.html:9
 msgid "Updates to this problem, %s"
 msgstr "Atualizações para este problema, %s"
 
@@ -4755,12 +5289,16 @@ msgid "Use Open311 update-sending extension"
 msgstr "Use a extensão de envio de atualizações do Open311"
 
 #: templates/web/base/admin/bodies/contact-form.html:53
-msgid ""
-"Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like "
-"requesting an extra rubbish bin at a specific address."
+msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
+msgstr "Use isso para problemas que você deseja permitir que os usuários denunciem, mas para os quais não há interesse público em exibir a denúncia, como solicitar uma lixeira extra em um endereço específico."
+
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
 msgstr ""
-"Use isso para problemas que você deseja permitir que os usuários denunciem, mas para os quais não há interesse público em exibir a "
-"denúncia, como solicitar uma lixeira extra em um endereço específico."
 
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
@@ -4770,15 +5308,18 @@ msgstr "ID do usuário para atribuir comentários buscados a"
 msgid "User Import"
 msgstr "Importar Usuário"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:665 perllib/FixMyStreet/App/Controller/Admin/Users.pm:676
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:665
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:676
 msgid "User added to abuse list"
 msgstr "Usuário adicionado à lista de abuso"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153 perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr "Usuário já existe"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:661 perllib/FixMyStreet/App/Controller/Admin/Users.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:661
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:672
 msgid "User already in abuse list"
 msgstr "Usuário já se encontra na lista de abuso"
 
@@ -4790,7 +5331,8 @@ msgstr "Marcação removida do usuário"
 msgid "User flagged"
 msgstr "Usuário marcado"
 
-#: templates/web/base/admin/report_blocks.html:18 templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr "Usuário na tabela de abuso"
@@ -4803,25 +5345,25 @@ msgstr "A pesquisa do usuário encontra resultados de nomes de usuários e ender
 msgid "User's alerts"
 msgstr "Alerta de usuários"
 
-#: templates/web/base/admin/reports/edit.html:142 templates/web/base/admin/update_edit.html:36
+#: templates/web/base/admin/reports/edit.html:155
+#: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr "Usuário:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713 perllib/FixMyStreet/Cobrand/Default.pm:770 perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336 perllib/FixMyStreet/Cobrand/Zurich.pm:425 templates/web/base/admin/flagged.html:29
-#: templates/web/base/admin/roles/index.html:25 templates/web/zurich/header.html:57
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
+#: templates/web/base/admin/flagged.html:29
+#: templates/web/base/admin/roles/index.html:25
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Usuários"
 
-#: templates/web/base/admin/users/form.html:140
-msgid ""
-"Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable "
-"manual permission selection."
-msgstr ""
-"Os usuários podem ser atribuídos uma ou mais funções, para dar-lhes todas as permissões dessas funções. Selecionar uma função ou "
-"funções desativará a seleção de permissões manuais."
+#: templates/web/base/admin/users/form.html:125
+msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
+msgstr "Os usuários podem ser atribuídos uma ou mais funções, para dar-lhes todas as permissões dessas funções. Selecionar uma função ou funções desativará a seleção de permissões manuais."
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr "Os usuários podem executar as seguintes ações dentro de seu órgão ou área designada."
 
@@ -4829,8 +5371,9 @@ msgstr "Os usuários podem executar as seguintes ações dentro de seu órgão o
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr "Usuários com esta função podem executar as seguintes ações dentro de seu orgão ou área designada."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Valores atualizados"
 
@@ -4838,21 +5381,25 @@ msgstr "Valores atualizados"
 msgid "Verify"
 msgstr "Verificar"
 
-#: templates/web/base/auth/change_email.html:2 templates/web/base/auth/change_email.html:5
+#: templates/web/base/auth/change_email.html:2
+#: templates/web/base/auth/change_email.html:5
 msgid "Verify email address"
 msgstr "Verificar endereço de e-mail"
 
-#: templates/web/base/auth/change_phone.html:2 templates/web/base/auth/change_phone.html:5
+#: templates/web/base/auth/change_phone.html:2
+#: templates/web/base/auth/change_phone.html:5
 msgid "Verify phone number"
 msgstr "Verificar número de telefone"
 
-#: templates/web/base/admin/reports/edit.html:36 templates/web/base/admin/update_edit.html:18
-#: templates/web/zurich/admin/report_edit-sdm.html:23 templates/web/zurich/admin/reports/edit.html:24
+#: templates/web/base/admin/reports/edit.html:36
+#: templates/web/base/admin/update_edit.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:23
+#: templates/web/zurich/admin/reports/edit.html:24
 #: templates/web/zurich/admin/update_edit.html:10
 msgid "View report on site"
 msgstr "Ver denúncia no site"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Ver denúncias por sinalizadores"
 
@@ -4860,15 +5407,17 @@ msgstr "Ver denúncias por sinalizadores"
 msgid "View wards"
 msgstr "Ver sinalizadores"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr "Ver/Marcar denúncias privadas"
 
-#: templates/web/base/around/display_location.html:0 templates/web/base/around/display_location.html:38
+#: templates/web/base/around/display_location.html:0
+#: templates/web/base/around/display_location.html:38
 msgid "Viewing a location"
 msgstr "Vendo uma localização"
 
-#: templates/web/base/report/display.html:0 templates/web/base/report/display.html:6
+#: templates/web/base/report/display.html:0
+#: templates/web/base/report/display.html:6
 msgid "Viewing a problem"
 msgstr "Vendo um problema"
 
@@ -4876,11 +5425,12 @@ msgstr "Vendo um problema"
 msgid "Ward:"
 msgstr "Sinalizador:"
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Sinalizadores deste órgão"
 
-#: templates/web/base/alert/choose.html:7 templates/web/base/around/_error_multiple.html:6
+#: templates/web/base/alert/choose.html:7
+#: templates/web/base/around/_error_multiple.html:6
 msgid "We found more than one match for that location."
 msgstr "Encontramos mais de uma correspondência para esse local."
 
@@ -4892,28 +5442,27 @@ msgstr "Encontramos mais de uma correspondência para o problema em questão:"
 msgid "We have sent a confirmation code to your phone. Please enter it below:"
 msgstr "Enviamos um código de confirmação para seu telefone. Por favor digite-o abaixo:"
 
-#: templates/web/base/auth/general.html:13 templates/web/base/report/display.html:35
+#: templates/web/base/auth/general.html:13
+#: templates/web/base/report/display.html:35
 #: templates/web/base/report/new/oauth_email_form.html:5
 msgid "We need your email address, please give it below."
 msgstr "Nós precisamos do seu endereço de e-mail, por favor, especifique-o abaixo."
 
 #: 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 ""
-"Percebemos que esse problema pode ser responsabilidade de %s; no entanto, atualmente não temos quaisquer detalhes de contato deles. "
-"Se você souber de um endereço de contato apropriado, por favor, entre em contato conosco."
+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 "Percebemos que esse problema pode ser responsabilidade de %s; no entanto, atualmente não temos quaisquer detalhes de contato deles. Se você souber de um endereço de contato apropriado, por favor, entre em contato conosco."
 
 #: templates/web/base/index-steps.html:11
 msgid "We send it to the council on your behalf"
 msgstr "Enviamos ao órgão em seu nome"
 
-#: templates/web/base/alert/choose.html:13 templates/web/base/around/_error_multiple.html:20
+#: templates/web/base/alert/choose.html:13
+#: templates/web/base/around/_error_multiple.html:20
 msgid "We show up to ten matches, please try a different search if yours is not here."
 msgstr "Mostramos até dez resultados, tente uma pesquisa diferente se a sua não estiver aqui."
 
-#: templates/web/base/report/new/notes.html:4 templates/web/zurich/report/new/notes.html:4
+#: templates/web/base/report/new/notes.html:4
+#: templates/web/zurich/report/new/notes.html:4
 msgid "We will only use your personal information in accordance with our <a href=\"%s\">privacy policy.</a>"
 msgstr "Nós só usaremos sua informação pessoal de acordo com nossa <a href=\"%s\">política de privacidade.</a>"
 
@@ -4933,7 +5482,8 @@ msgstr "Iremos retornar o mais rápido possível."
 msgid "We’ve already reported these nearby problems to the council. Is one of them yours?"
 msgstr "Nós já denúnciamos estes problemas nocais para o órgão responsável. Algum deles é seu?"
 
-#: templates/web/base/admin/bodies/category.html:28 templates/web/zurich/admin/bodies/body.html:18
+#: templates/web/base/admin/bodies/category.html:28
+#: templates/web/zurich/admin/bodies/body.html:18
 msgid "When edited"
 msgstr "Editado"
 
@@ -4945,7 +5495,7 @@ msgstr "Quando enviado"
 msgid "Which problems do you want alerts about?"
 msgstr "Quais problemas você gostaria de receber alertas?"
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr "Esta é uma duplicata de qual denúncia?"
 
@@ -4954,26 +5504,18 @@ msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free."
 msgstr "Por que parar por aqui? <a href=\"/alert\">Adicione mais alertas</a> gratuitamente."
 
 #: templates/web/base/open311/index.html:84
-msgid ""
-"With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single "
-"administration.  The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
-msgstr ""
-"Com as buscas de solicitação, é possível usar agency_responsible para limitar as solicitações enviados a uma única administração.  O "
-"termo de pesquisa é o ID de administração fornecido pela <a href=\"%s\">MaPit.</a>."
+msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration.  The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
+msgstr "Com as buscas de solicitação, é possível usar agency_responsible para limitar as solicitações enviados a uma única administração.  O termo de pesquisa é o ID de administração fornecido pela <a href=\"%s\">MaPit.</a>."
 
 #: templates/web/base/dashboard/index.html:164
 msgid "Within the specified timeframe:"
 msgstr "Dentro do tempo especificado:"
 
 #: templates/web/base/front/footer-marketing.html:3
-msgid ""
-"Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet."
-"org</a>."
-msgstr ""
-"Você gostaria de contribuir com o AjeitaMinhaRua? Nosso código é aberto e <a href=\"https://fixmystreet.org\">disponível em "
-"fixmystreet.org</a>."
+msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
+msgstr "Você gostaria de contribuir com o AjeitaMinhaRua? Nosso código é aberto e <a href=\"https://fixmystreet.org\">disponível em fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Você gostaria de receber outro questionário em 4 semanas, te lembrando de chegar o status?"
 
@@ -4985,14 +5527,22 @@ msgstr "Você gostaria de ser notificado quando o problema for resolvido ou atua
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Escrever toda sua mensagem em maiúsculas dificulta a leitura, assim como a falta de pontuação."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
-#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122 templates/web/base/admin/bodies/category.html:6
-#: templates/web/base/admin/bodies/index.html:70 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:33
-#: templates/web/base/admin/list_updates.html:35 templates/web/base/admin/list_updates.html:36
-#: templates/web/base/admin/problem_row.html:20 templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137 templates/web/base/admin/update_edit.html:25
-#: templates/web/base/admin/users/alerts.html:21 templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:39
+#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
+#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
+#: templates/web/base/admin/bodies/category.html:6
+#: templates/web/base/admin/bodies/index.html:70
+#: templates/web/base/admin/flagged.html:47
+#: templates/web/base/admin/list_updates.html:33
+#: templates/web/base/admin/list_updates.html:35
+#: templates/web/base/admin/list_updates.html:36
+#: templates/web/base/admin/problem_row.html:20
+#: templates/web/base/admin/reports/edit.html:101
+#: templates/web/base/admin/reports/edit.html:150
+#: templates/web/base/admin/update_edit.html:25
+#: templates/web/base/admin/users/alerts.html:21
+#: templates/web/base/admin/users/index.html:65
+#: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Sim"
 
@@ -5005,7 +5555,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr "Você não tem certeza da origem ou validade do contato."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr "Você está offline"
 
@@ -5017,19 +5567,19 @@ msgstr "Você está denunciando este problema por ser abusivo, conter informaç
 msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
 msgstr "Você está denunciando esta atualização por ser abusiva, conter informação pessoal, ou algo similar:"
 
-#: templates/web/base/report/_updates_disallowed_message.html:2 templates/web/base/report/display.html:59
+#: templates/web/base/report/_updates_disallowed_message.html:2
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr "Você pode <a href=\"%s\">criar uma nova denúncia na mesma localização</a>."
 
-#: templates/web/zurich/tokens/confirm_problem.html:6 templates/web/zurich/tokens/confirm_problem.html:8
+#: templates/web/zurich/tokens/confirm_problem.html:6
+#: templates/web/zurich/tokens/confirm_problem.html:8
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Você pode <a href=\"%s%s\">ver o problema no site</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
-msgstr ""
-"Você pode adicionar o e-mail de um usuário abusivo à lista de abusos, que oculta automaticamente (e nunca envia) as denúncias criados "
-"por ele."
+msgstr "Você pode adicionar o e-mail de um usuário abusivo à lista de abusos, que oculta automaticamente (e nunca envia) as denúncias criados por ele."
 
 #: templates/web/base/alert/_list.html:18
 msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination."
@@ -5049,19 +5599,18 @@ msgstr ""
 "          Isto pode ser útil, por exemplo, se você precisar ficar de olho em um usuário que tem postado\n"
 "          denúncias inapropriadas no passado."
 
-#: templates/web/base/report/new/top_message_none.html:13 templates/web/base/report/new/top_message_none.html:14
-#: templates/web/base/report/new/top_message_some.html:10 templates/web/base/report/new/top_message_some.html:11
-msgid ""
-"You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
-msgstr ""
-"Você pode nos ajudar encontrando um endereço de e-mail de problemas locais para %s e nos enviar este endereço através do <a "
-"href='mailto:%s'>%s</a>."
+#: templates/web/base/report/new/top_message_none.html:13
+#: templates/web/base/report/new/top_message_none.html:14
+#: templates/web/base/report/new/top_message_some.html:10
+#: templates/web/base/report/new/top_message_some.html:11
+msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
+msgstr "Você pode nos ajudar encontrando um endereço de e-mail de problemas locais para %s e nos enviar este endereço através do <a href='mailto:%s'>%s</a>."
 
 #: templates/web/base/admin/bodies/form.html:92
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Você pode marcar um órgão como deletado se você não deseja mais vê-lo como ativo no site."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr "Você não pode renomear uma categoria para uma com um nome já existente"
 
@@ -5071,59 +5620,42 @@ msgid "You declined; please fill in the box above"
 msgstr "Você recusou; por favor preencha o campo acima"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr "Você tem um <a id=\"oFN\" href=\"\"><span>%s</span> salvo para ser enviado</a>."
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:39
-msgid ""
-"You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your "
-"problem</a>.\n"
-msgstr ""
-"Você já respondeu este questionário. Se você ainda tem dúvidas, por favor  <a href='%s'>entre em contato</a>, ou <a href='%s'>veja "
-"seu problema</a>.\n"
+msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
+msgstr "Você já respondeu este questionário. Se você ainda tem dúvidas, por favor  <a href='%s'>entre em contato</a>, ou <a href='%s'>veja seu problema</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
-msgid ""
-"You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, "
-"the oldest will be removed)."
-msgstr ""
-"Você já anexou arquivos para esta denúncia. Note que você pode anexar no máximo 3 para à esta denúncia (se você tentar anexar mais, a "
-"mais antiga será removida)."
+#: templates/web/base/contact/enquiry/index.html:59
+msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
+msgstr "Você já anexou arquivos para esta denúncia. Note que você pode anexar no máximo 3 para à esta denúncia (se você tentar anexar mais, a mais antiga será removida)."
 
-#: templates/web/base/report/new/form_report.html:50 templates/web/zurich/report/new/fill_in_details_form.html:30
-msgid ""
-"You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, "
-"the oldest will be removed)."
-msgstr ""
-"Você já anexou fotos para esta denúncia. Note que você pode anexar no máximo 3 para esta denúncia (se você tentar anexar mais, a mais "
-"antiga será removida)."
+#: templates/web/base/report/new/form_report.html:50
+#: templates/web/zurich/report/new/fill_in_details_form.html:30
+msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
+msgstr "Você já anexou fotos para esta denúncia. Note que você pode anexar no máximo 3 para esta denúncia (se você tentar anexar mais, a mais antiga será removida)."
 
-#: templates/web/base/questionnaire/index.html:89 templates/web/base/report/update/form_update.html:16
-msgid ""
-"You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, "
-"the oldest will be removed)."
-msgstr ""
-"Você já anexou fotos para esta atualização. Note que você pode anexar no máximo 3 fotos à esta atualização (se você tentar anexar "
-"mais, a mais antiga será removida)."
+#: templates/web/base/report/form/photo_upload.html:13
+msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
+msgstr "Você já anexou fotos para esta atualização. Note que você pode anexar no máximo 3 fotos à esta atualização (se você tentar anexar mais, a mais antiga será removida)."
 
-#: templates/web/base/auth/sign_out.html:4 templates/web/zurich/auth/sign_out.html:3
+#: templates/web/base/auth/sign_out.html:4
+#: templates/web/zurich/auth/sign_out.html:3
 msgid "You have been signed out"
 msgstr "Você saiu"
 
 #: templates/web/zurich/report/new/sidebar.html:7
-msgid ""
-"You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on "
-"the map again. "
-msgstr ""
-"Você encontrou o problema no ponto marcado com o pino verde no mapa.  Se esta não é a localização correta, basta clicar no mapa "
-"novamente. "
+msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. "
+msgstr "Você encontrou o problema no ponto marcado com o pino verde no mapa.  Se esta não é a localização correta, basta clicar no mapa novamente. "
 
 #: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:143
 msgid "You have successfully added your phone number."
 msgstr "Você adicionou seu número de telefone com sucesso."
 
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:159 templates/web/zurich/tokens/confirm_problem.html:6
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:159
+#: templates/web/zurich/tokens/confirm_problem.html:6
 msgid "You have successfully confirmed your email address."
 msgstr "Você confirmou seu endereço de e-mail com sucesso."
 
@@ -5135,7 +5667,8 @@ msgstr "Você confirmou seu número de telefone com sucesso."
 msgid "You have successfully removed your phone number."
 msgstr "Você removeu seu número de telefone com sucesso."
 
-#: templates/web/base/report/display.html:25 templates/web/base/report/new/login_success_form.html:3
+#: templates/web/base/report/display.html:25
+#: templates/web/base/report/new/login_success_form.html:3
 msgid "You have successfully signed in; please check and confirm your details are accurate:"
 msgstr "Você efetuou login com sucesso; por favor, verifique e confirme se suas informações estão corretas:"
 
@@ -5153,8 +5686,7 @@ msgstr "Você ainda não selecionou nenhuma denúncia."
 
 #: templates/web/base/admin/index.html:19
 msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent."
-msgstr ""
-"Você precisa <a href=\"%s\">adicionar algum órgão</a> (como uma secretaria ou departamento) antes de qualquer denúncia ser enviada."
+msgstr "Você precisa <a href=\"%s\">adicionar algum órgão</a> (como uma secretaria ou departamento) antes de qualquer denúncia ser enviada."
 
 #: templates/web/base/admin/bodies/index.html:11
 msgid ""
@@ -5170,9 +5702,12 @@ msgstr ""
 msgid "Your Reports"
 msgstr "Suas Denúncias"
 
-#: 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
+#: templates/web/base/auth/2fa/intro.html:12
+#: templates/web/base/auth/change_password.html:13
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Sua conta"
 
@@ -5180,10 +5715,16 @@ msgstr "Sua conta"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr "Sua conta requer autenticação em duas etapas para ser criada."
 
-#: templates/web/base/alert/updates.html:30 templates/web/base/auth/create.html:50 templates/web/base/auth/general.html:56
-#: templates/web/base/contact/enquiry/index.html:18 templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59 templates/web/base/report/form/user_loggedout_email.html:7
-#: templates/web/base/report/new/duplicate_suggestions.html:42 templates/web/zurich/report/new/fill_in_details_form.html:53
+#: templates/web/base/alert/updates.html:32
+#: templates/web/base/auth/create.html:50
+#: templates/web/base/auth/general.html:56
+#: templates/web/base/contact/enquiry/index.html:18
+#: templates/web/base/contact/index.html:91
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
+#: templates/web/base/report/new/duplicate_suggestions.html:42
+#: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
 msgstr "Seu e-mail"
 
@@ -5191,7 +5732,8 @@ msgstr "Seu e-mail"
 msgid "Your email address"
 msgstr "Seu endereço de e-mail"
 
-#: templates/web/base/auth/create.html:48 templates/web/base/auth/general.html:54
+#: templates/web/base/auth/create.html:48
+#: templates/web/base/auth/general.html:54
 #: templates/web/base/report/form/user_loggedout_email.html:3
 msgid "Your email or mobile"
 msgstr "Seu e-mail ou telefone"
@@ -5200,7 +5742,8 @@ msgstr "Seu e-mail ou telefone"
 msgid "Your information will only be used in accordance with our <a href=\"%s\">privacy policy</a>"
 msgstr "Suas informações serão usadas apenas de acordo com a nossa <a href=\"%s\">política de privacidade</a>"
 
-#: templates/web/base/contact/enquiry/index.html:12 templates/web/base/contact/index.html:85
+#: templates/web/base/contact/enquiry/index.html:12
+#: templates/web/base/contact/index.html:85
 msgid "Your name"
 msgstr "Seu nome"
 
@@ -5208,25 +5751,27 @@ msgstr "Seu nome"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr "Seu nome já foi enviado para %s, mas nós podemos escondê-lo nesta página:"
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr "Seu nome foi ocultado de todas as suas denúncias e atualizações."
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr "Seu nome foi ocultado."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr "Suas denúncias offline"
 
-#: templates/web/base/auth/create.html:64 templates/web/base/auth/general.html:90
+#: templates/web/base/auth/create.html:64
+#: templates/web/base/auth/general.html:90
 #: templates/web/base/report/form/user_loggedout_password.html:13
 msgid "Your password"
 msgstr "Sua senha"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:171 templates/web/base/auth/change_password.html:12
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:171
+#: templates/web/base/auth/change_password.html:12
 msgid "Your password has been changed"
 msgstr "Sua senha foi alterada"
 
@@ -5234,12 +5779,15 @@ msgstr "Sua senha foi alterada"
 msgid "Your password has expired, please create a new one below. When you click the link in your email, your password will be updated."
 msgstr "Sua senha expirou, por favor, crie uma nova abaixo. Quando você clicar no link do seu e-mail, sua senha será atualizada."
 
-#: templates/web/base/auth/create.html:67 templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59 templates/web/zurich/auth/general.html:56
+#: templates/web/base/auth/create.html:67
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
+#: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr "Sua senha deve ter %d ou mais caracteres."
 
-#: templates/web/base/auth/change_phone.html:19 templates/web/base/contact/enquiry/index.html:25
+#: templates/web/base/auth/change_phone.html:19
+#: templates/web/base/contact/enquiry/index.html:25
 #: templates/web/base/contact/index.html:98
 msgid "Your phone number"
 msgstr "Seu número de telefone"
@@ -5252,7 +5800,8 @@ msgstr "Sua denúncia"
 msgid "Your reports"
 msgstr "Suas denúncias"
 
-#: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18 templates/web/base/my/planned.html:5
+#: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
+#: templates/web/base/my/planned.html:5
 msgid "Your shortlist"
 msgstr "Sua lista de atalhos"
 
@@ -5265,7 +5814,7 @@ msgid "Your update"
 msgstr "Sua atualização"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr "Sua atualização foi salva offline para envio quando você estiver online novamente."
 
@@ -5277,15 +5826,14 @@ msgstr "Suas atualizações"
 msgid "Your verification code is %s"
 msgstr "Seu código de verificação é %s"
 
-#: templates/web/base/report/new/form_user_loggedin.html:20 templates/web/base/report/update/form_user_loggedin.html:14
+#: templates/web/base/report/new/form_user_loggedin.html:20
+#: templates/web/base/report/update/form_user_loggedin.html:14
 msgid "Yourself"
 msgstr "Você mesmo"
 
 #: templates/web/base/admin/users/import.html:72
 msgid "a colon-separated list of permissions to grant that user, e.g. <code>contribute_as_body:moderate:user_edit</code>."
-msgstr ""
-"uma lista de permissões separadas por dois pontos para conceder a esse usuário, por exemplo <code>contribut_as_body:moderate:"
-"user_edit</code>."
+msgstr "uma lista de permissões separadas por dois pontos para conceder a esse usuário, por exemplo <code>contribut_as_body:moderate:user_edit</code>."
 
 #: templates/web/base/admin/users/import.html:73
 msgid "a colon-separated list of roles to assign to that user."
@@ -5295,18 +5843,21 @@ msgstr "uma lista de funções separada por dois pontos para atribuir a esse usu
 msgid "admin"
 msgstr "administrador"
 
-#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18 templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
+#: templates/web/base/admin/category-checkboxes.html:5
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "tudo"
 
-#: 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
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
+#: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr "um administrador"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr "e um defeito gerado"
 
@@ -5314,7 +5865,8 @@ msgstr "e um defeito gerado"
 msgid "by %s"
 msgstr "por %s"
 
-#: templates/web/base/reports/body.html:13 templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "órgão"
 
@@ -5322,7 +5874,8 @@ msgstr "órgão"
 msgid "didn't use map"
 msgstr "não usou o mapa"
 
-#: templates/web/base/alert/index.html:12 templates/web/base/around/_postcode_form_examples.html:1
+#: templates/web/base/alert/index.html:12
+#: templates/web/base/around/_postcode_form_examples.html:1
 msgid "e.g. ‘%s’ or ‘%s’"
 msgstr "por exemplo  ‘%s’ or ‘%s’"
 
@@ -5334,15 +5887,22 @@ msgstr "por exemplo: ‘Buraco de 10 centímetros nao Rua Manoel Vitorino, próx
 msgid "e.g. ‘This pothole has been here for two months and…’"
 msgstr "por exemplo: ‘Este buraco está aqui há dois meses e ...’"
 
-#: templates/web/base/admin/bodies/open311-form-fields.html:93 templates/web/base/admin/flagged.html:51
+#: templates/web/base/admin/bodies/open311-form-fields.html:93
+#: templates/web/base/admin/flagged.html:51
 msgid "edit user"
 msgstr "editar usuário"
 
-#: templates/web/base/status/stats.html:20 templates/web/zurich/admin/index.html:5
+#: templates/web/base/status/stats.html:20
+#: templates/web/zurich/admin/index.html:5
 msgid "from %s different users"
 msgstr "de %s usuários diferentes"
 
-#: templates/web/base/report/_item_small.html:22 templates/web/zurich/report/_item.html:16
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
+#: templates/web/base/report/_item_small.html:22
+#: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
 msgstr "última atualização %s"
 
@@ -5350,13 +5910,15 @@ msgstr "última atualização %s"
 msgid "less than a minute"
 msgstr "menos de um minuto"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Stats.pm:54 templates/web/base/admin/stats/questionnaire.html:15
+#: 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 "n/d"
 
-#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19 templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
+#: templates/web/base/admin/category-checkboxes.html:6
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr "nada"
 
@@ -5364,11 +5926,13 @@ msgstr "nada"
 msgid "not the council's responsibility"
 msgstr "não é responsabilidade do órgão"
 
-#: templates/web/base/contact/enquiry/index.html:26 templates/web/base/contact/index.html:99
+#: templates/web/base/contact/enquiry/index.html:26
+#: templates/web/base/contact/index.html:99
 msgid "optional"
 msgstr "(opcional)"
 
-#: templates/web/base/report/form/user.html:31 templates/web/base/report/form/user.html:41
+#: templates/web/base/report/form/user.html:31
+#: templates/web/base/report/form/user.html:41
 msgid "or"
 msgstr "ou"
 
@@ -5380,14 +5944,19 @@ msgstr "ou <a href=\"%s\">criar uma conta</a>"
 msgid "or <a href=\"%s\">sign in</a>"
 msgstr "ou <a href=\"%s\">entrar</a>"
 
-#: templates/web/base/alert/index.html:18 templates/web/base/around/postcode_form.html:36
+#: templates/web/base/alert/index.html:18
+#: templates/web/base/around/postcode_form.html:36
 msgid "or use my location"
 msgstr "ou usar minha localização"
 
-#: templates/web/base/admin/reports/edit.html:50 templates/web/base/admin/reports/edit.html:51
-#: templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit-sdm.html:34
-#: templates/web/zurich/admin/reports/edit.html:35 templates/web/zurich/admin/reports/edit.html:36
-#: templates/web/zurich/admin/reports/edit.html:51 templates/web/zurich/admin/reports/edit.html:52
+#: templates/web/base/admin/reports/edit.html:50
+#: templates/web/base/admin/reports/edit.html:51
+#: templates/web/zurich/admin/report_edit-sdm.html:33
+#: templates/web/zurich/admin/report_edit-sdm.html:34
+#: templates/web/zurich/admin/reports/edit.html:35
+#: templates/web/zurich/admin/reports/edit.html:36
+#: templates/web/zurich/admin/reports/edit.html:51
+#: templates/web/zurich/admin/reports/edit.html:52
 msgid "originally entered: &ldquo;%s&rdquo;"
 msgstr "originalmente inseriu: &ldquo;%s&rdquo;"
 
@@ -5405,15 +5974,14 @@ msgstr "sair"
 
 #: templates/web/base/admin/users/import.html:71
 msgid "the database id of the body to associate that user with, e.g. <code>2217</code> for Buckinghamshire."
-msgstr ""
-"o ID do banco de dados , referente ao corpo a ser associado a esse usuário, por exemplo, <code>2217</code> para Prefeitura Municipal "
-"do seu município."
+msgstr "o ID do banco de dados , referente ao corpo a ser associado a esse usuário, por exemplo, <code>2217</code> para Prefeitura Municipal do seu município."
 
 #: templates/web/base/report/new/form_public_councils_text.html:6
 msgid "the local council"
 msgstr "o órgão local"
 
-#: templates/web/base/report/_report_meta_info.html:5 templates/web/zurich/report/_main.html:7
+#: templates/web/base/report/_report_meta_info.html:5
+#: templates/web/zurich/report/_main.html:7
 msgid "there is no pin shown as the user did not use the map"
 msgstr "não tem marcador mostrado como o usuário não usou o mapa"
 
@@ -5430,12 +5998,12 @@ msgid "today"
 msgstr "hoje"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr "atualização"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr "atualizações"
 
@@ -5459,7 +6027,8 @@ msgstr "usuário fora da lista de abuso"
 msgid "user removed from abuse list"
 msgstr "usuário removido da lista de abuso"
 
-#: templates/web/base/reports/body.html:0 templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:0
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "sinalizador"
 
@@ -5519,7 +6088,7 @@ msgid_plural "%d years"
 msgstr[0] "%d ano"
 msgstr[1] "%d anos"
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5540,7 +6109,7 @@ msgid_plural "%s problems reported"
 msgstr[0] "%s problema denunciado"
 msgstr[1] "%s problemas denunciados"
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5561,21 +6130,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> resolvido no mês passado"
 msgstr[1] "<big>%s</big> resolvidos no mês passado"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> denúncia na semana passada"
 msgstr[1] "<big>%s</big> denúncias na semana passada"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> denuncia recente"
 msgstr[1] "<big>%s</big> denuncias recentes"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -5610,20 +6179,38 @@ msgid_plural "last updated %d days ago"
 msgstr[0] "atualizado pela última vez a %d dia atrás"
 msgstr[1] "atualizado pela última vez %d dias atŕas"
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mês"
 msgstr[1] "meses"
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] "denúncia"
 msgstr[1] "denúncias"
 
+#~ msgid "Closed by council"
+#~ msgstr "Fechado pelo órgão responsável"
+
+#~ msgid "Current token:"
+#~ msgstr "Código de acesso atual:"
+
+#~ msgid "Filter report list"
+#~ msgstr "Filtrar lista de denúncias"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Valor %s incorreto para o campo agency_responsible"
+
+#~ msgid "Post"
+#~ msgstr "Postar"
+
+#~ msgid "Traffic management required?"
+#~ msgstr "É necessário gerenciamento de tráfego?"
+
 #~ msgid "(ignored if type is \"String\")"
 #~ msgstr "(ignorado se o tipo for \"String\")"
 
@@ -5636,9 +6223,6 @@ msgstr[1] "denúncias"
 #~ msgid "Automated"
 #~ msgstr "Automatizado"
 
-#~ msgid "Available categories"
-#~ msgstr "Categorias disponíveis"
-
 #~ msgid "Coordinates:"
 #~ msgstr "Coordenadas:"
 
diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
index b1898bdad..6e2451836 100644
--- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Romanian (Romania) (https://www.transifex.com/mysociety/teams/12067/ro_RO/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "şi"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - rapoarte de sinteză"
 
@@ -111,7 +111,7 @@ msgstr "%s chestionare trimise &ndash; %s completate  (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -157,6 +157,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(netrimis)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr ""
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Alege o categorie --"
@@ -202,17 +204,18 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -242,7 +245,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -259,7 +262,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -279,7 +282,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Adaugă o categorie nouă"
@@ -312,7 +315,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Adaugă o categorie nouă"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -321,8 +324,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -330,21 +333,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Adaugă utilizator"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -360,6 +362,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr ""
@@ -372,8 +380,8 @@ msgstr ""
 msgid "Alert %d disabled (created %s)"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr ""
 
@@ -385,10 +393,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr ""
@@ -428,6 +438,10 @@ msgstr ""
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+msgid "Allow anonymous reports on this category"
+msgstr ""
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -463,7 +477,7 @@ msgstr ""
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -476,7 +490,7 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -485,8 +499,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -497,7 +511,7 @@ msgstr ""
 msgid "Area covered"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -510,27 +524,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Adaugă o categorie nouă"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr ""
@@ -543,7 +562,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -551,11 +570,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -567,12 +586,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr ""
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr ""
@@ -593,14 +613,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr ""
 
@@ -613,11 +631,13 @@ msgstr ""
 msgid "Body"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr ""
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -629,8 +649,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -646,15 +665,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -664,7 +681,7 @@ msgstr ""
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -687,6 +704,10 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+msgid "Change asset"
+msgstr ""
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -703,7 +724,7 @@ msgstr ""
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -713,12 +734,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -755,8 +776,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -766,11 +787,7 @@ msgstr ""
 msgid "Closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr ""
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -803,13 +820,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr ""
@@ -926,7 +942,7 @@ msgstr ""
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr ""
@@ -936,27 +952,25 @@ msgstr ""
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr ""
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr ""
@@ -965,6 +979,15 @@ msgstr ""
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Created Body"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+msgid "Created By"
+msgstr ""
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -976,10 +999,6 @@ msgstr ""
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -989,19 +1008,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1013,7 +1034,7 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1023,7 +1044,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr ""
@@ -1044,9 +1065,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr ""
 
@@ -1054,7 +1073,7 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1090,7 +1109,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1098,6 +1117,14 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+msgid "Disable reopening of reports in this category"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+msgid "Disable updates on reports in this category"
+msgstr ""
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1132,24 +1159,24 @@ msgstr ""
 msgid "Don't like forms?"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1161,7 +1188,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1173,7 +1200,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr ""
@@ -1184,12 +1211,11 @@ msgstr ""
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1197,17 +1223,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1244,8 +1268,9 @@ msgstr ""
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1254,15 +1279,14 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1282,12 +1306,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr ""
@@ -1350,11 +1375,11 @@ msgstr ""
 msgid "Endpoint"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1381,10 +1406,10 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1397,7 +1422,7 @@ msgstr ""
 msgid "Examples:"
 msgstr ""
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1406,7 +1431,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1431,7 +1456,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1443,20 +1468,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1489,20 +1514,23 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr ""
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+msgid "Five most recent commented reports"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+msgid "Five newest reports"
+msgstr ""
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1532,7 +1560,7 @@ msgstr ""
 msgid "Flag user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr ""
@@ -1541,7 +1569,7 @@ msgstr ""
 msgid "Flagged reports and users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1549,8 +1577,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr ""
 
@@ -1576,11 +1604,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1590,12 +1618,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1617,7 +1653,7 @@ msgstr ""
 msgid "Get updates of problems in this %s"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr ""
 
@@ -1633,15 +1669,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1651,7 +1687,7 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1677,6 +1713,7 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1711,7 +1748,8 @@ msgstr ""
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1739,7 +1777,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr ""
 
@@ -1792,11 +1830,9 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr ""
 
@@ -1815,15 +1851,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1837,7 +1873,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1861,7 +1897,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1898,7 +1934,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1922,6 +1958,16 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+msgid "In wards"
+msgstr ""
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1931,20 +1977,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1960,16 +2006,12 @@ msgstr ""
 msgid "Internal notes"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2020,13 +2062,13 @@ msgstr ""
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2043,7 +2085,7 @@ msgstr ""
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr ""
@@ -2081,17 +2123,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2109,19 +2152,20 @@ msgstr ""
 msgid "MAP"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2135,24 +2179,24 @@ msgstr ""
 msgid "Mark as sent"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2165,7 +2209,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -2173,8 +2217,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2197,7 +2240,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2207,14 +2250,14 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2242,9 +2285,10 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr ""
@@ -2262,7 +2306,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -2270,12 +2314,12 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2298,7 +2342,7 @@ msgstr ""
 msgid "New body added"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr ""
 
@@ -2311,8 +2355,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr ""
 
@@ -2320,13 +2364,13 @@ msgstr ""
 msgid "New local problems on FixMyStreet"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2403,7 +2447,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2416,7 +2460,6 @@ msgstr ""
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2425,11 +2468,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr ""
 
@@ -2441,11 +2484,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr ""
 
@@ -2461,8 +2505,8 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr ""
 
@@ -2498,15 +2542,15 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2514,10 +2558,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr ""
@@ -2565,12 +2613,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2578,12 +2626,12 @@ msgstr ""
 msgid "Old state"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2592,7 +2640,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2623,7 +2671,7 @@ msgstr ""
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2635,7 +2683,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2643,16 +2691,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2684,7 +2732,7 @@ msgstr ""
 msgid "Parent"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 msgid "Parent categories"
 msgstr ""
 
@@ -2692,13 +2740,13 @@ msgstr ""
 msgid "Partial"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
 msgstr ""
 
@@ -2710,7 +2758,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2718,19 +2766,23 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+msgid "Phone"
+msgstr ""
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr ""
 
@@ -2738,30 +2790,26 @@ msgstr ""
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr ""
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2781,9 +2829,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2792,7 +2839,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2806,6 +2853,10 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+msgid "Pin map"
+msgstr ""
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2833,27 +2884,26 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2872,27 +2922,27 @@ msgid "Please do not be abusive&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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2905,16 +2955,16 @@ msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2925,20 +2975,20 @@ msgstr ""
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2954,7 +3004,7 @@ msgid "Please enter your first name"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr ""
@@ -2965,9 +3015,9 @@ msgstr ""
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr ""
@@ -3008,18 +3058,18 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 msgid "Please make sure you are not including an email address"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3046,24 +3096,28 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -3071,7 +3125,7 @@ msgstr ""
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3083,7 +3137,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -3091,12 +3145,12 @@ msgstr ""
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3104,27 +3158,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr ""
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr ""
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -3140,7 +3190,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3148,11 +3198,11 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3168,9 +3218,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr ""
 
@@ -3216,7 +3266,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr ""
 
@@ -3224,8 +3274,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr ""
@@ -3250,18 +3299,18 @@ msgstr ""
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3269,7 +3318,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3277,11 +3326,15 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3295,11 +3348,11 @@ msgstr ""
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr ""
 
@@ -3307,12 +3360,12 @@ msgstr ""
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3354,11 +3407,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -3366,11 +3419,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -3378,13 +3431,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -3398,11 +3451,11 @@ msgstr ""
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3415,7 +3468,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3429,7 +3482,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3442,7 +3495,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3454,8 +3508,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3470,17 +3524,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3488,14 +3546,14 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3504,7 +3562,7 @@ msgid "Report a problem"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3519,7 +3577,7 @@ msgid "Report anonymously"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3554,7 +3612,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -3565,7 +3623,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr ""
@@ -3579,27 +3637,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -3618,17 +3676,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3656,15 +3712,15 @@ msgid "Reports published"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3677,7 +3733,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3730,39 +3786,45 @@ msgstr ""
 msgid "Right place?"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3778,20 +3840,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3808,13 +3870,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr ""
 
@@ -3827,7 +3888,7 @@ msgstr ""
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr ""
 
@@ -3842,12 +3903,12 @@ msgstr ""
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3857,8 +3918,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3868,7 +3928,7 @@ msgid "Select a body"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr ""
@@ -3889,7 +3949,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3902,7 +3962,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3911,11 +3971,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3953,7 +4013,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3964,7 +4024,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -3989,8 +4049,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4001,7 +4061,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr ""
 
@@ -4061,7 +4121,7 @@ msgid "Some photos of recent reports"
 msgstr ""
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4070,12 +4130,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4093,9 +4152,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -4105,13 +4164,13 @@ msgstr ""
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4125,11 +4184,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4138,11 +4197,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4166,18 +4225,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4186,31 +4245,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr ""
 
@@ -4228,7 +4284,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4247,50 +4303,48 @@ msgstr ""
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4302,7 +4356,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4316,20 +4370,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr ""
 
@@ -4340,14 +4393,19 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4365,13 +4423,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr ""
@@ -4392,6 +4454,10 @@ msgstr ""
 msgid "Text:"
 msgstr ""
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+msgid "Textarea"
+msgstr ""
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr ""
@@ -4421,7 +4487,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4433,27 +4499,29 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
@@ -4499,8 +4567,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4554,7 +4622,7 @@ msgstr ""
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4616,8 +4684,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4650,7 +4718,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4668,12 +4736,12 @@ msgstr ""
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -4681,7 +4749,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -4757,10 +4825,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr ""
 
@@ -4777,19 +4845,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4802,26 +4874,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4829,15 +4901,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4861,6 +4936,10 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4886,7 +4965,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4911,11 +4990,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4938,16 +5012,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4957,7 +5031,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -4987,10 +5061,10 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5002,13 +5076,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr ""
 
@@ -5058,29 +5132,27 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr ""
 
@@ -5091,7 +5163,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5121,6 +5193,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5134,8 +5214,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5153,7 +5233,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5166,27 +5246,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5194,9 +5272,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr ""
 
@@ -5222,7 +5300,7 @@ msgstr ""
 msgid "View report on site"
 msgstr ""
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5230,7 +5308,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5248,7 +5326,7 @@ msgstr ""
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -5318,7 +5396,7 @@ msgstr ""
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5338,7 +5416,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr ""
 
@@ -5350,7 +5428,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5361,12 +5438,12 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr ""
 
@@ -5379,7 +5456,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5392,7 +5469,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5401,7 +5478,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5431,7 +5508,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5441,7 +5518,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5449,7 +5526,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5458,8 +5535,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5523,9 +5599,9 @@ msgstr "Rapoartele dvs."
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5534,13 +5610,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5569,16 +5646,16 @@ msgstr ""
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5598,8 +5675,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5632,7 +5709,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5663,19 +5740,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5683,8 +5760,8 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr ""
 
@@ -5715,6 +5792,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5732,7 +5813,7 @@ msgstr "indisponibil"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5814,12 +5895,12 @@ msgid "today"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5844,7 +5925,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr ""
 
@@ -5912,7 +5993,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5936,7 +6017,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5960,7 +6041,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
@@ -5968,7 +6049,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
@@ -5976,7 +6057,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6016,7 +6097,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
@@ -6024,7 +6105,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po
index bc13c2993..39a5541e8 100644
--- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Russian (https://www.transifex.com/mysociety/teams/12067/ru/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "и"
@@ -56,7 +56,7 @@ msgstr "пользователей уже зарегистрировано"
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Итоговые отчеты"
 
@@ -117,7 +117,7 @@ msgstr "Отправлено опросов: %s &ndash; получено отв
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; участники проекта <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>"
 
@@ -163,6 +163,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(не отправлено в органы самоуправления)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -181,8 +183,8 @@ msgstr "(отправлено в обе инстанции)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Выберите категорию --"
@@ -212,17 +214,18 @@ msgstr ""
 "Хотите добавить несколько <code>MAPIT_TYPES</code> в ваш файл конфигурации?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -252,7 +255,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Да</strong> У меня есть пароль"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -269,7 +272,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -292,7 +295,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Добавить контакт с помощью формы."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Добавить категорию"
@@ -325,7 +328,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Добавить категорию"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -334,8 +337,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -343,21 +346,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Добавить пользователя"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -373,6 +375,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Снова:"
@@ -385,8 +393,8 @@ msgstr "Создано уведомление «%d» для: %s. Тип: %s, п
 msgid "Alert %d disabled (created %s)"
 msgstr "Уведомление «%d» отключено (создано: %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Оповещать меня об обновлениях в будущем"
 
@@ -398,10 +406,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Все Отчеты"
@@ -441,6 +451,11 @@ msgstr "Все отчеты с %s по %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Обращение отнесено к категории: %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -477,7 +492,7 @@ msgstr "Анонимно"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -490,7 +505,7 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -499,8 +514,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -511,7 +526,7 @@ msgstr ""
 msgid "Area covered"
 msgstr "Зона покрытия"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -525,27 +540,32 @@ msgstr "Поскольку это отладочный сайт и в парам
 msgid "Assign selected to role:"
 msgstr "Направлено сюда: %s"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Направить в учреждение, которое специализируется на решении подобных вопросов:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Назначить другую категорию:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Направить во внешнее учреждение:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Направить в подразделение:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Направлено сюда: %s"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Направлено сюда: %s"
@@ -558,7 +578,7 @@ msgstr "Как правило, количество результатов, ко
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Сейчас можно только искать и просматривать обращения"
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -566,11 +586,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -582,12 +602,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Ожидает модерации"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Назад"
@@ -608,14 +629,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Учреждения"
 
@@ -628,11 +647,13 @@ msgstr "Учреждения"
 msgid "Body"
 msgstr "Учреждение"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Учреждение:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -644,8 +665,7 @@ msgstr "Письмо не пришло? Оно могло попасть в па
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Карта не отображается? <em>Пропустите этот шаг</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -661,15 +681,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -679,7 +697,7 @@ msgstr "Категория"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -702,6 +720,11 @@ msgstr "Категория:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Сменить пароль"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -718,7 +741,7 @@ msgstr "Сменить пароль"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -730,12 +753,12 @@ msgstr ""
 "Выберите название <strong>категории</strong> которое будет понятно не только другим пользователям (например, «Выбоина» или «Уличное освещение»), но и  \n"
 "                  сотрудникам учреждения. Варианты названий отобразятся в раскрывающемся меню на странице подачи обращений."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -772,8 +795,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -783,11 +806,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Закрыто"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Закрыто органом самоуправления"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -820,13 +839,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Конфигурация"
@@ -943,7 +961,7 @@ msgstr "Создать обращение"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Создать категорию"
@@ -953,27 +971,25 @@ msgstr "Создать категорию"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Создать шаблон"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Создано"
@@ -982,6 +998,17 @@ msgstr "Создано"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Создано"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Создано"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -993,10 +1020,6 @@ msgstr "Создано:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -1006,19 +1029,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "В данный момент на сайте не зарегистрировано ни одного учреждения."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Невозможно связаться с покупателем"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Панель управления"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1030,7 +1055,7 @@ msgstr "Вопрос решен подразделением в течение 5
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1040,7 +1065,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Удалить шаблон"
@@ -1062,9 +1087,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Описание"
 
@@ -1073,7 +1096,7 @@ msgstr "Описание"
 msgid "Destination"
 msgstr "Описание"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1109,7 +1132,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1117,6 +1140,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Обращение отнесено к категории: %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Обращение отнесено к категории: %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1151,24 +1184,24 @@ msgstr "Не знаю"
 msgid "Don't like forms?"
 msgstr "Не любите заполнять формы?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1184,7 +1217,7 @@ msgstr ""
 "            Следовательно, вы можете добавлять много категорий для одного контакта учреждения.\n"
 "    "
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1196,7 +1229,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Редактировать"
@@ -1207,12 +1240,11 @@ msgstr "Редактировать"
 msgid "Edit body details"
 msgstr "Редактировать информацию об учреждении"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1220,17 +1252,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1267,8 +1297,9 @@ msgstr "Редактор"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1277,15 +1308,14 @@ msgstr "Редактор"
 msgid "Email"
 msgstr "Адрес эл. почты"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1305,12 +1335,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Адрес эл. почты:"
@@ -1380,12 +1411,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Конечная точка"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Введите название улицы в Цюрихе"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Введите почтовый индекс ближайшего отделения связи в Великобритании или название улицы и регион"
 
@@ -1412,10 +1443,10 @@ msgstr "Подробно опишите проблему"
 msgid "Error"
 msgstr "Ошибка"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Всё"
 
@@ -1428,7 +1459,7 @@ msgstr "Пример почтового индекса: %s"
 msgid "Examples:"
 msgstr "Примеры:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1437,7 +1468,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1462,7 +1493,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1474,20 +1505,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Дополнительная информация:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1520,20 +1551,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Сортировать список обращений"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Впервые"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Фотографии происшествий поблизости, размещенные в недавних обращениях"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Новые обращения"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Исправьте это, выбрав <strong>зону покрытия</strong> в форме <em>Редактирование информации об учреждении</em>, расположенной ниже."
@@ -1563,7 +1599,7 @@ msgstr "Пометить как удаленное"
 msgid "Flag user"
 msgstr "Пометить пользователя"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Помечено"
@@ -1572,7 +1608,7 @@ msgstr "Помечено"
 msgid "Flagged reports and users"
 msgstr "Помеченные обращения и профили пользователей"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Список помеченных профилей пользователей находится на странице <a href='%s'>Помеченное</a>."
 
@@ -1580,8 +1616,8 @@ msgstr "Список помеченных профилей пользовате
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "На помеченные аккаунты пользователей не накладываются ограничения. Это просто аккаунты, к которым проявляется повышенное внимание."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Помечено:"
 
@@ -1607,11 +1643,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Забыли пароль?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Перенаправлено во внешнее учреждение"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Пожелание перенаправлено во внешнее учреждение"
 
@@ -1621,12 +1657,20 @@ msgstr "Пожелание перенаправлено во внешнее уч
 msgid "Frequently Asked Questions"
 msgstr "Часто задаваемые вопросы"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1648,7 +1692,7 @@ msgstr "Получать новости о ходе работы над непо
 msgid "Get updates of problems in this %s"
 msgstr "Получать новости о неполадках в:"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Подпишите меня на RSS-фид"
 
@@ -1664,15 +1708,15 @@ msgstr "Здорово, что проблема решена!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1682,7 +1726,7 @@ msgstr "Поехали!"
 msgid "Going to send questionnaire?"
 msgstr "Собираетесь отправить опрос?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1708,6 +1752,7 @@ msgstr "Вы впервые отправляете обращение в орг
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1742,7 +1787,8 @@ msgstr "Скрыто"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1770,7 +1816,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Скрыть метки"
 
@@ -1824,11 +1870,9 @@ msgstr "Нам не удалось найти ваше обращение в б
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "Идентификатор"
 
@@ -1849,15 +1893,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1873,7 +1917,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1897,7 +1941,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1936,7 +1980,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1960,6 +2004,17 @@ msgstr "Вы в черном списке?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "Кроме того, возвращаются следующие параметры, которые не являются частью сервиса Open311  версии 2: agency_sent_datetime, title (также возвращается как часть описания), interface_used, comment_count, requestor_name (присутствует только если инициатор запроса разрешил отображение имени на сайте)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "район"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1969,20 +2024,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr "Ура, новых писем нет!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Включить персональные данные заявителя"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Нверно задано значение has_photo \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1999,16 +2054,12 @@ msgstr "Внутренние заметки"
 msgid "Internal notes"
 msgstr "Внутренние заметки"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Неверно задано значение agency_responsible %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Неверно задан формат: %s."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2060,13 +2111,13 @@ msgstr "Последнее обновление:"
 msgid "Last&nbsp;update:"
 msgstr "Последнее&nbsp;обновление:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2083,7 +2134,7 @@ msgstr "Все сообщения о неполадках в виде списк
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Загрузка..."
@@ -2121,17 +2172,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2149,19 +2201,20 @@ msgstr ""
 msgid "MAP"
 msgstr "КАРТА"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2175,24 +2228,24 @@ msgstr "Карта"
 msgid "Mark as sent"
 msgstr "Пометить как отправленное"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "<strong>Помечайте</strong> тех пользователей, за действиями которых вы хотите следить."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Сообщение"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Сообщение компетентному учреждению:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Сообщение внешнему учреждению:"
 
@@ -2205,7 +2258,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Не найден параметр jurisdiction_id"
 
@@ -2213,8 +2266,7 @@ msgstr "Не найден параметр jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2237,7 +2289,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "Прошло модерацию в течение одного рабочего дня"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2247,14 +2299,14 @@ msgstr ""
 msgid "Month"
 msgstr "Месяц"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2282,9 +2334,10 @@ msgstr ""
 msgid "Name"
 msgstr "Имя"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Имя:"
@@ -2302,7 +2355,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Ближайшая к метке дорога (генерируется автоматически с использованием сервиса OpenStreetMap): %s%s"
 
@@ -2310,12 +2363,12 @@ msgstr "Ближайшая к метке дорога (генерируется
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Ближайший к метке почтовый индекс (генерируется автоматически):  %s (%sm мил.)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Ближайшая к метке дорога (генерируется автоматически с использованием сервиса Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2340,7 +2393,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Добавлено новое учреждение"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Добавлен новый контакт в категории"
 
@@ -2353,8 +2406,8 @@ msgstr "новый адрес электронной почты"
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Новая внутренняя заметка:"
 
@@ -2362,13 +2415,13 @@ msgstr "Новая внутренняя заметка:"
 msgid "New local problems on FixMyStreet"
 msgstr "Новые неполадки в вашем районе на FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Новая заметка для DM:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Новый пароль"
 
@@ -2445,7 +2498,7 @@ msgstr "Новый шаблон"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Самые новые"
@@ -2458,7 +2511,6 @@ msgstr "Далее"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2467,11 +2519,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Нет"
 
@@ -2483,11 +2535,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Нет учреждения"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Орган самоуправления не выбран"
 
@@ -2503,8 +2556,8 @@ msgstr "Не найдено помеченных неполадок."
 msgid "No flagged users found."
 msgstr "Не найдено помеченных пользователей."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Пока нет обновлений"
 
@@ -2542,15 +2595,15 @@ msgstr "Нет группы поддержки"
 msgid "None"
 msgstr "Нет"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2562,10 +2615,14 @@ msgstr ""
 "                В зависимости от должности, сотрудники могут иметь доступ к панели управления (там содержится краткая информация\n"
 "                о действиях их учреждения), а также возможность скрывать обращения или устанавливать специфические статусы обращений."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Не для моего подразделения"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Первое обращение по этой проблеме"
@@ -2613,12 +2670,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2626,12 +2683,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Давний статус"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Самые старые"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2640,7 +2697,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2671,7 +2728,7 @@ msgstr "Веб-страница сервиса Open311"
 msgid "Open311 specification"
 msgstr "Спецификация Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2683,7 +2740,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2691,16 +2748,16 @@ msgstr ""
 msgid "Order"
 msgstr "Порядок"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2732,7 +2789,7 @@ msgstr "Страница не найдена"
 msgid "Parent"
 msgstr "Родительская"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Другие категории"
@@ -2741,13 +2798,13 @@ msgstr "Другие категории"
 msgid "Partial"
 msgstr "Частичная"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Пароль (необязательно)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Ваш пароль был изменен"
@@ -2762,7 +2819,7 @@ msgstr "Пароль (необязательно)"
 msgid "Permissions"
 msgstr "Постоянная ссылка"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2770,19 +2827,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Телефон:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Номер телефона"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Номер телефона (необязательно)"
 
@@ -2790,30 +2852,26 @@ msgstr "Номер телефона (необязательно)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Телефон:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2833,9 +2891,8 @@ msgstr "Необходимо добавить фото"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Фотографии"
@@ -2844,7 +2901,7 @@ msgstr "Фотографии"
 msgid "Photos of recent nearby reports"
 msgstr "Фотографии происшествий поблизости, размещенные в недавних обращениях"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2858,6 +2915,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Поставить метку на карте"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2885,27 +2947,26 @@ msgid "Please check your email address is correct"
 msgstr "Проверьте правильность написания адреса эл. почты"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Выберите категорию"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2927,27 +2988,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Введите текст сообщения"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2960,16 +3021,16 @@ msgstr "Введите пароль"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Введите тему"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2980,20 +3041,20 @@ msgstr "Введите действующий адрес эл. почты"
 msgid "Please enter a valid email address"
 msgstr "Введите действующий адрес эл. почты"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Введите дополнительную информацию"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -3009,7 +3070,7 @@ msgid "Please enter your first name"
 msgstr "Введите свое имя"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Введите свое полное имя. Эта информация необходима представителям органов самоуправления. Если вы не хотите, чтобы ваше полное имя отображалось на сайте, снимите галочку ниже."
@@ -3021,9 +3082,9 @@ msgstr "Введите свое имя"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Введите свое имя"
@@ -3064,19 +3125,19 @@ msgstr "Заполните форму ниже: расскажите о непо
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Укажите, хотите ли вы еще один опросник"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Введите действующий адрес эл. почты"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3103,24 +3164,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Внимание:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Поясните, почему вы решили заново отправить это обращение"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Предоставьте не только фото, но и письменный комментарий"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Вы впервые отправляете обращение в ваш орган самоуправления?"
 
@@ -3128,7 +3193,7 @@ msgstr "Вы впервые отправляете обращение в ваш
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Выберите учреждение."
 
@@ -3140,7 +3205,7 @@ msgstr "Выберите рассылку"
 msgid "Please select the type of alert you want"
 msgstr "Выберите тип уведомления"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Сообщите о статусе неполадки: проблема была решена?"
 
@@ -3148,12 +3213,12 @@ msgstr "Сообщите о статусе неполадки: проблема
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3161,27 +3226,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Напишите сообщение"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Опубликовать"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Опубликовано анонимно (%s)"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Автор публикации: %s, время публикации: %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Автор публикации: <strong>%s</strong> (%s), время публикации: %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Автор публикации: <strong>%s</strong>, время публикации: %s"
 
@@ -3197,7 +3258,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3205,11 +3266,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Предыдущая"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3225,9 +3286,9 @@ msgid "Privacy and cookies"
 msgstr "Конфиденциальность и файлы cookie"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Доступ ограничен"
 
@@ -3276,7 +3337,7 @@ msgstr "Проблема (%s) отправлена в орган самоупр
 msgid "Problem breakdown by state"
 msgstr "Сортировка проблем по статусу"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Проблема помечена как открытая."
 
@@ -3284,8 +3345,7 @@ msgstr "Проблема помечена как открытая."
 msgid "Problem state change based on survey results"
 msgstr "Смена статуса проблемы на основании результатов опроса"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Проблемы"
@@ -3310,18 +3370,18 @@ msgstr "Недавно решенные проблемы на сайте FixMySt
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Проблемы в пределах этого места: %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Проблемы в пределах этого района: %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3329,7 +3389,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Проблемы в пределах этого места: %s, %s"
 
@@ -3337,11 +3397,15 @@ msgstr "Проблемы в пределах этого места: %s, %s"
 msgid "Property address:"
 msgstr "Адрес имущества:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3355,11 +3419,11 @@ msgstr "Предоставить новые данные"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Пароль необязателен. Но когда вы предоставите эти данные, вы сможете быстрее сообщать о проблемах, вводить новые данные о них и редактировать свои обращения."
 
@@ -3367,12 +3431,12 @@ msgstr "Пароль необязателен. Но когда вы предос
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Публичный ответ:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3415,11 +3479,11 @@ msgstr "Опрос заполнен автором обращения"
 msgid "RSS feed"
 msgstr "RSS-фид"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS-фид для: %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS-фид для района: %s, %s"
 
@@ -3427,11 +3491,11 @@ msgstr "RSS-фид для района: %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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "%s: RSS-фид"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "%s: RSS-фид, в пределах района: %s"
 
@@ -3439,13 +3503,13 @@ msgstr "%s: RSS-фид, в пределах района: %s"
 msgid "RSS feed of nearby problems"
 msgstr "RSS-фид о проблемах поблизости"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS-фид о проблемах в пределах: %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS-фид о проблемах в пределах района: %s"
 
@@ -3459,11 +3523,11 @@ msgstr "RSS-фид о недавних проблемах поблизости"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS-фид об обновлениях по этой проблеме"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3476,7 +3540,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Получать эл. письма об обновлениях по этой проблеме."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3490,7 +3554,7 @@ msgstr "Недавние проблемы поблизости, %s"
 msgid "Recently reported problems"
 msgstr "Недавние обращения о проблемах"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3503,7 +3567,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Важно: сайт FixMyStreet предназначен для регистрации материальных проблем, которые возможно устранить, и работы с ними. Если проблема, о которой вы хотите сообщить, не соответствует тематике сайта, обратитесь в местный орган самоуправления через соответствующий сайт."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3515,8 +3580,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Удалить пометку"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3531,17 +3596,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Удалить фото (действие отменить невозможно)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Ответить пользователю:"
 
@@ -3549,14 +3618,14 @@ msgstr "Ответить пользователю:"
 msgid "Report"
 msgstr "Сообщить"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3565,7 +3634,7 @@ msgid "Report a problem"
 msgstr "Сообщить о проблеме"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3581,7 +3650,7 @@ msgid "Report anonymously"
 msgstr "Сообщено анонимно в: %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3617,7 +3686,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Городские проблемы. Сообщайте, просматривайте, обсуждайте."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Сообщено анонимно в: %s"
@@ -3628,7 +3697,7 @@ msgstr "Сообщено анонимно в: %s"
 msgid "Reported before"
 msgstr "Сообщено ранее"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Автор обращения: %s, время отправки: %s"
@@ -3642,27 +3711,27 @@ msgstr "Автор обращения:"
 msgid "Reported in the %s category"
 msgstr "Обращение отнесено к категории: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Обращение (категория: %s) отправлено анонимно в: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Обращение (категория: %s), автор: %s, отправлено в: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Анонимно отправлено через: %s, время отправки: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Отправлено через: %s, автор: %s, время отправки: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Анонимно отправлено через: %s, категория: %s, время отправки: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Отправлено через: %s, категория: %s, автор обращения: %s, время отправки: %s"
 
@@ -3681,17 +3750,15 @@ msgstr "Обращение отправлено:"
 msgid "Reporting a problem"
 msgstr "Сообщение о проблеме"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Обращения"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3719,15 +3786,15 @@ msgid "Reports published"
 msgstr "Опубликованные обращения"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3740,7 +3807,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3793,39 +3860,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "Место указано верно?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Дорога находится в ведении: %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Дорога находится в ведении (информация из ресурса OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Повернуть влево"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3841,20 +3914,20 @@ msgstr "Перед поворотом фото необходимо сохран
 msgid "Satellite"
 msgstr "Спутник"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3871,13 +3944,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Искать обращения"
 
@@ -3890,7 +3962,7 @@ msgstr "Искать пользователей"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Искать обращения"
 
@@ -3905,12 +3977,12 @@ msgstr "Поиск:"
 msgid "Searching found no reports."
 msgstr "Обращений не найдено."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Пользователи не найдены."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3920,8 +3992,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3931,7 +4002,7 @@ msgid "Select a body"
 msgstr "Выберите учреждение"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Выберите местность"
@@ -3952,7 +4023,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3965,7 +4036,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3974,11 +4045,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "Обращение возвращено"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Отправлено позже: %s %s"
 
@@ -4016,7 +4087,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4027,7 +4098,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4052,8 +4123,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4064,7 +4135,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Показать метки"
 
@@ -4126,7 +4197,7 @@ msgid "Some photos of recent reports"
 msgstr "Некоторые фото недавних обращений"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Некоторое количество текста для локализации"
 
@@ -4135,12 +4206,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "К сожалению, адреса по данному индексу относятся к коронным землям. Зона покрытия нашего ресурса на них не распространяется."
 
@@ -4158,9 +4228,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "При подтверждении вашего обращения произошла ошибка."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Не удалось найти это местоположение."
 
@@ -4170,13 +4240,13 @@ msgstr "Не удалось найти это местоположение."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Не удалось проанализировать это местоположение. Повторите попытку."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4191,11 +4261,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4204,11 +4274,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4232,18 +4302,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Статус"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4252,31 +4322,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Статус:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Статистика"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Статус"
 
@@ -4294,7 +4361,7 @@ msgstr "Просмотр улиц"
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Подразделение/учреждение"
 
@@ -4313,50 +4380,48 @@ msgstr "Тема:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Отправить"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Отправить изменения"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Отправить опрос"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Отправлено"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4369,7 +4434,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Текст обновления ограничен %s симв. Напишите более короткое сообщение"
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4383,20 +4448,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Итог"
 
@@ -4407,14 +4471,19 @@ msgstr "Отчеты об итогах"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4432,13 +4501,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr "Шаблон &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Шаблоны"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Текст"
@@ -4459,6 +4532,11 @@ msgstr "Только текстовая версия"
 msgid "Text:"
 msgstr "Текст:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Текст"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Спасибо за ваше обращение!"
@@ -4488,7 +4566,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Мы рады узнать, что проблема решена! Это было ваше первое обращение в орган самоуправления?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4500,27 +4578,29 @@ msgstr "Кажется, возникли трудности с загрузко
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Кажется, это местоположение не находится в ведении органа самоуправления. Возможно, им заведует другое учреждение или же вы указали место в другой стране. Попробуйте еще раз."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Это местоположение находится за пределами Великобритании. Повторите попытку."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Не удалось распознать индекс."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Проблема помечена как отправленная."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Сейчас мы еще раз отправим это обращение."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Это обращение было удалено с сайта FixMyStreet."
 
@@ -4570,8 +4650,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4630,7 +4710,7 @@ msgstr "Ошибка: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "Следующие параметры Open311 версии 2 возвращаются для каждого запроса: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code и service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "Информация о ближайшей дороге может быть неверной или неточной, если проблема находится рядом с несколькими дорогами или поблизости от безымянной дороги, зарегистрированной на OpenStreetMap."
 
@@ -4692,8 +4772,8 @@ msgstr "Пользователь не смог определить местоп
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4728,7 +4808,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4746,12 +4826,12 @@ msgstr "При загрузке страницы произошла ошибка
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Не удалось загрузить новые данные. Повторите попытку."
 
@@ -4759,7 +4839,7 @@ msgstr "Не удалось загрузить новые данные. Повт
 msgid "There were problems with your report. Please see below."
 msgstr "Не удалось загрузить обращение. Прочтите информациию ниже."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Не удалось загрузить новые данные. Прочтите информациию ниже."
 
@@ -4845,10 +4925,10 @@ msgstr "Поскольку пользователь не обозначил ка
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr "Поскольку пользователь обозначил категорию проблемы, находящейся в ведении нескольких органов самоуправления, мы отправили это письмо во все эти инстанции. Если данная проблема находится вне вашей ответственности, игнорируйте это обращение."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Эта информация является обязательной"
 
@@ -4865,19 +4945,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Эта проблема была решена"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Эта проблема не была решена"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4890,26 +4974,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Это обращение ожидает модерации."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Это обращение на данный момент помечено как закрытое."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Это обращение на данный момент помечено как решенное."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Это обращение на данный момент помечено как открытое."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4917,15 +5001,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Эта веб-страница также содержит фото неполадки, предоставленное пользователем."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Времени потрачено (в минутах):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4949,6 +5036,10 @@ msgstr "Название"
 msgid "Title:"
 msgstr "Название:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "Введите индекс (%s) или название улицы и района, чтобы узнать, какие уведомления актуальны для вашего местоположения:"
@@ -4974,7 +5065,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "Просмотр точного местоположения данной проблемы на карте"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4999,11 +5090,6 @@ msgstr ""
 msgid "Total"
 msgstr "Всего"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -5026,16 +5112,16 @@ msgstr "Напишите нам:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5045,7 +5131,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5075,10 +5161,10 @@ msgstr "Неизвестная ошибка"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "Неизвестный идентификатор проблемы"
 
@@ -5090,13 +5176,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Обновление"
 
@@ -5147,29 +5233,27 @@ msgstr "В результате добавления данных проблем
 msgid "Update statuses"
 msgstr "Обновление статусов"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Обновлено"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Обновлено!"
 
@@ -5180,7 +5264,7 @@ msgstr "Обновлено!"
 msgid "Updates"
 msgstr "Обновления"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Текст обновления ограничен %s симв. Напишите более короткое сообщение"
 
@@ -5210,6 +5294,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5223,8 +5315,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5242,7 +5334,7 @@ msgid "User flagged"
 msgstr "Аккаунт пользователя помечен"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5255,27 +5347,25 @@ msgstr "При поиске пользователей на сайте сист
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Пользователи"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5283,9 +5373,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Значения обновлены"
 
@@ -5311,7 +5401,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Посмотреть обращение на сайте"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Посмотреть обращения по районам"
 
@@ -5319,7 +5409,7 @@ msgstr "Посмотреть обращения по районам"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5337,7 +5427,7 @@ msgstr "Просмотр проблемы"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Районы, которые находятся в ведении данного органа самоуправления"
 
@@ -5407,7 +5497,7 @@ msgstr "Когда были отправлены данные"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5427,7 +5517,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "Хотите помочь проекту FixMyStreet? Наш код находится в открытом доступе и <a href=\"https://fixmystreet.org\">доступен на сайте fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Хотите получить еще один опрос через 4 недели? В нем мы напомним вам проверить статус обращения."
 
@@ -5439,7 +5529,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Избегайте пунктуационных ошибок и не пишите сообщения заглавными буквами: всё это усложняет прочтение текста."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5450,12 +5539,12 @@ msgstr "Избегайте пунктуационных ошибок и не п
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Да"
 
@@ -5468,7 +5557,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5481,7 +5570,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Вы собираетесь пожаловаться на это обновление и считаете, что оно содержит оскорбления, конфиденциальную информацию или как-либо еще нарушает правила сайта:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5490,7 +5579,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Вы можете <a href=\"%s%s\">ознакомиться с проблемой на этом сайте</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Вы можете добавить адрес эл. почты пользователя, который проявляет себя некорректно, в черный список. Все дальнейшие обращения этого пользователя не будут опубликованы и отправлены."
 
@@ -5523,7 +5612,7 @@ msgstr "Вы можете помочь нам: найдите контактны
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Вы можете отметить учреждение как удаленное, если не хотите, чтобы его представители осуществляли деятельность на этом сайте."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5533,7 +5622,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Вы отказались; заполните форму выше"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5541,7 +5630,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Вы уже ответили на этот опрос. Если у вас есть вопросы, <a href='%s'>пишите нам</a> или <a href='%s'>ознакомьтесь с данными опубликованной вами проблемы</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 #, fuzzy
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Вы уже предоставили фото в этом обращении. Важно: можно прикрепить не более 3 фото (если выбрать больше изображений, они заменят прикрепленные ранее)."
@@ -5551,8 +5640,7 @@ msgstr "Вы уже предоставили фото в этом обращен
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Вы уже предоставили фото в этом обращении. Важно: можно прикрепить не более 3 фото (если выбрать больше изображений, они заменят прикрепленные ранее)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5619,9 +5707,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5630,13 +5718,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5665,16 +5754,16 @@ msgstr "Ваше имя"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5694,8 +5783,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5728,7 +5817,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5759,19 +5848,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5779,8 +5868,8 @@ msgstr ""
 msgid "by %s"
 msgstr "автор: %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "орган самоуправления"
 
@@ -5811,6 +5900,10 @@ msgstr "редактировать информацию о пользовате
 msgid "from %s different users"
 msgstr "от разных пользователей (%s)"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5828,7 +5921,7 @@ msgstr "недоступн."
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5911,12 +6004,12 @@ msgid "today"
 msgstr "сегодня"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5941,7 +6034,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "район"
 
@@ -6017,7 +6110,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6044,7 +6137,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6071,7 +6164,7 @@ msgstr[1] "<big>%s</big> проблемы решены за прошлый ме
 msgstr[2] "<big>%s</big> проблем решено за прошлый месяц"
 msgstr[3] "<big>%s</big> проблем решено за прошлый месяц"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
@@ -6080,7 +6173,7 @@ msgstr[1] "<big>%s</big> обращения за прошлую неделю"
 msgstr[2] "<big>%s</big> обращений за прошлую неделю"
 msgstr[3] "<big>%s</big> обращений за прошлую неделю"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
@@ -6089,7 +6182,7 @@ msgstr[1] "<big>%s</big> недавних обращения"
 msgstr[2] "<big>%s</big> недавних обращений"
 msgstr[3] "<big>%s</big> недавних обращений"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6134,7 +6227,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
@@ -6143,7 +6236,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
@@ -6152,6 +6245,18 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Закрыто органом самоуправления"
+
+#~ msgid "Filter report list"
+#~ msgstr "Сортировать список обращений"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Неверно задано значение agency_responsible %s"
+
+#~ msgid "Post"
+#~ msgstr "Опубликовать"
+
 #~ msgid ""
 #~ "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
 #~ "                <br>\n"
diff --git a/locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po
index 9b1d6d11e..a05ce3275 100644
--- a/locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/mysociety/teams/12067/sl_SI/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "in"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "%s ref:&nbsp;%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -157,6 +157,8 @@ msgstr "(ne obstaja več)"
 msgid "(not sent to council)"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(poslano obema)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "— Izberi kategorijo —"
@@ -202,17 +204,18 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -242,7 +245,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -259,7 +262,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -279,7 +282,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Dodaj novo kategorijo"
@@ -312,7 +315,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Dodaj novo kategorijo"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "Dodaj možnost"
 
@@ -321,8 +324,8 @@ msgstr "Dodaj možnost"
 msgid "Add phone number"
 msgstr "Dodaj telefonsko številko"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -330,21 +333,20 @@ msgid "Add to shortlist"
 msgstr "Dodaj na seznam"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Dodaj uporabnika"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -360,6 +362,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr ""
@@ -372,8 +380,8 @@ msgstr ""
 msgid "Alert %d disabled (created %s)"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr ""
 
@@ -385,10 +393,12 @@ msgstr "Opozorila:"
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Vsa poročila"
@@ -428,6 +438,11 @@ msgstr ""
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Skrij moje ime v tem popravku"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -464,7 +479,7 @@ msgstr ""
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -477,7 +492,7 @@ msgid "Another user"
 msgstr "Drug uporabnik"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Ali želite prekiniti prenos?"
 
@@ -486,8 +501,8 @@ msgstr "Ali želite prekiniti prenos?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Ali ste prepričani?"
@@ -498,7 +513,7 @@ msgstr "Ali ste prepričani?"
 msgid "Area covered"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -511,27 +526,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Razpoložljive kategorije"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr ""
@@ -544,7 +564,7 @@ msgstr ""
 msgid "At the moment only searching for and looking at reports work."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -552,11 +572,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr "Samodejni odgovor"
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Samodejni odgovor:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -568,12 +588,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr ""
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Nazaj"
@@ -594,14 +615,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr ""
 
@@ -614,11 +633,13 @@ msgstr ""
 msgid "Body"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr ""
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr "CSV datoteka"
 
@@ -630,8 +651,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -647,15 +667,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -665,7 +683,7 @@ msgstr ""
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -688,6 +706,11 @@ msgstr "Kategorija:"
 msgid "Change"
 msgstr "Spremeni"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Zamenjaj geslo"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -704,7 +727,7 @@ msgstr "Zamenjaj geslo"
 msgid "Change phone number"
 msgstr "Zamenjaj telefon"
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -714,12 +737,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -756,8 +779,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -767,11 +790,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Zaprto"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr ""
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -804,13 +823,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr "Zmanjšaj zemljevid"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Nastavitev"
@@ -927,7 +945,7 @@ msgstr "Ustvari poročilo"
 msgid "Create an account"
 msgstr "Ustvari račun"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Ustvari kategorijo"
@@ -937,27 +955,25 @@ msgstr "Ustvari kategorijo"
 msgid "Create priority"
 msgstr "Ustvari prioriteto"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr "Ustvari poročila/posodobitve kot anonimni uporabnik"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Ustvari predlogo"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Ustvarjeno"
@@ -966,6 +982,17 @@ msgstr "Ustvarjeno"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Ustvarjeno"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Ustvarjeno"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -977,10 +1004,6 @@ msgstr "Ustvarjeno:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -990,19 +1013,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1014,7 +1039,7 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1024,7 +1049,7 @@ msgid "Delete"
 msgstr "Izbriši"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Izbriši predlogo"
@@ -1046,9 +1071,7 @@ msgid "Describe why you are moderating this"
 msgstr "Opiši zakaj moderiraš"
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Opis"
 
@@ -1057,7 +1080,7 @@ msgstr "Opis"
 msgid "Destination"
 msgstr "Opis"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1093,7 +1116,7 @@ msgid "Disable"
 msgstr "Onemogoči"
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1101,6 +1124,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Skrij moje ime v tem popravku"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Skrij moje ime v tem popravku"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr "Onemogočeno:"
@@ -1135,24 +1168,24 @@ msgstr ""
 msgid "Don't like forms?"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1164,7 +1197,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1176,7 +1209,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr ""
@@ -1187,12 +1220,11 @@ msgstr ""
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1200,17 +1232,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1247,8 +1277,9 @@ msgstr ""
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1257,15 +1288,14 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1285,12 +1315,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr "Pošlji povezavo za prijavo"
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "E-mail preverjen:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "E-mail:"
@@ -1353,11 +1384,11 @@ msgstr ""
 msgid "Endpoint"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1384,10 +1415,10 @@ msgstr "Vnesite podrobnosti težave"
 msgid "Error"
 msgstr "Napaka"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Vse"
 
@@ -1400,7 +1431,7 @@ msgstr ""
 msgid "Examples:"
 msgstr "Primeri:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Obstoječa kategorija"
 
@@ -1409,7 +1440,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr "Razširi zemljevid"
 
@@ -1434,7 +1465,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1446,20 +1477,20 @@ msgstr ""
 msgid "External team"
 msgstr "Zunanja ekipa"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "Dodatna Polja"
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Dodatni datum:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1492,20 +1523,24 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr ""
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+msgid "Five most recent commented reports"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nova poročila"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1535,7 +1570,7 @@ msgstr ""
 msgid "Flag user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr ""
@@ -1544,7 +1579,7 @@ msgstr ""
 msgid "Flagged reports and users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr ""
 
@@ -1552,8 +1587,8 @@ msgstr ""
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr ""
 
@@ -1579,11 +1614,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1593,12 +1628,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1620,7 +1663,7 @@ msgstr ""
 msgid "Get updates of problems in this %s"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr ""
 
@@ -1636,15 +1679,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1654,7 +1697,7 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1680,6 +1723,7 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1714,7 +1758,8 @@ msgstr "Skrit"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr "Skrij vsa poročila in novosti"
 
@@ -1742,7 +1787,7 @@ msgstr "Skrij moje ime v tem poročilu"
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr ""
 
@@ -1796,11 +1841,9 @@ msgstr "Na žalost nismo našli vaše težave v bazi podatkov.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1819,15 +1862,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1841,7 +1884,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1865,7 +1908,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1902,7 +1945,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1926,6 +1969,16 @@ msgstr ""
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+msgid "In wards"
+msgstr ""
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1935,20 +1988,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1965,16 +2018,12 @@ msgstr "Zunanja ekipa"
 msgid "Internal notes"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2026,13 +2075,13 @@ msgstr "Zadnji popravek:"
 msgid "Last&nbsp;update:"
 msgstr "Zadnji&nbsp;popravek:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Zemljepisna širina/Dolžina:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2049,7 +2098,7 @@ msgstr ""
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Nalagam..."
@@ -2087,17 +2136,18 @@ msgid "Log in with Twitter"
 msgstr "Prijavi se s Twitterjem"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "Prijavi se z elektronskim naslovom"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr "Odjavi se iz vseh sej"
 
@@ -2116,19 +2166,20 @@ msgstr "Poišči"
 msgid "MAP"
 msgstr "ZEMLJEVID"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr "Uredi seznam"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr "Ročno sortiranje"
@@ -2142,24 +2193,24 @@ msgstr "Zemljevid"
 msgid "Mark as sent"
 msgstr "Označi kot poslano"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Sporočilo"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2172,7 +2223,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -2180,8 +2231,7 @@ msgstr ""
 msgid "Moderate"
 msgstr "Moderiraj"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2204,7 +2254,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2214,14 +2264,14 @@ msgstr ""
 msgid "Month"
 msgstr "Mesec"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Najpogosteje komentirano"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2249,9 +2299,10 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Ime:"
@@ -2269,7 +2320,7 @@ msgstr "Navigiraj do te težave"
 msgid "Nearest calculated address:"
 msgstr "Najbližji izračunan naslov:"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -2277,12 +2328,12 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2305,7 +2356,7 @@ msgstr ""
 msgid "New body added"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr ""
 
@@ -2319,8 +2370,8 @@ msgstr ""
 msgid "New field"
 msgstr "Shrani nova polja"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr ""
 
@@ -2328,13 +2379,13 @@ msgstr ""
 msgid "New local problems on FixMyStreet"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Novo geslo:"
 
@@ -2411,7 +2462,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Najnovejši"
@@ -2424,7 +2475,6 @@ msgstr "Naslednji"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2433,11 +2483,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Ne"
 
@@ -2449,11 +2499,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr ""
 
@@ -2469,8 +2520,8 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Ni novih posodobitev"
 
@@ -2506,15 +2557,15 @@ msgstr ""
 msgid "None"
 msgstr "Noben"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2522,10 +2573,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr ""
@@ -2573,12 +2628,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2586,12 +2641,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Staro stanje"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Najstarejši"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2600,7 +2655,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2631,7 +2686,7 @@ msgstr ""
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr "Možnosti"
 
@@ -2643,7 +2698,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2651,16 +2706,16 @@ msgstr ""
 msgid "Order"
 msgstr "Vrstni red"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2692,7 +2747,7 @@ msgstr "Stran ni bila najdena"
 msgid "Parent"
 msgstr "Starš"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Vse kategorije"
@@ -2701,13 +2756,13 @@ msgstr "Vse kategorije"
 msgid "Partial"
 msgstr "Delno"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Geslo (opcijsko)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
 msgstr ""
 
@@ -2721,7 +2776,7 @@ msgstr "Geslo (opcijsko)"
 msgid "Permissions"
 msgstr "Dovoljenja:"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Dovoljenja:"
 
@@ -2729,19 +2784,24 @@ msgstr "Dovoljenja:"
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefon:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Telefonska številka"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Telefon (opcijsko)"
 
@@ -2749,30 +2809,26 @@ msgstr "Telefon (opcijsko)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr "Telefon preverjen."
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefon:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2792,9 +2848,8 @@ msgstr "Slika obvezna"
 msgid "Photo upload failed."
 msgstr "Prenos fotografije ni bil uspešen."
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Slike"
@@ -2803,7 +2858,7 @@ msgstr "Slike"
 msgid "Photos of recent nearby reports"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2817,6 +2872,10 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+msgid "Pin map"
+msgstr ""
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2844,27 +2903,26 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Prosim izberi kategorijo"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr "Prosim izberi manj pogosto uporabljano geslo"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2883,27 +2941,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Prosim vnesi sporočilo"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr "Prosim vnesi mobilno številko"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Prosim vnesi ime"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2916,16 +2974,16 @@ msgstr "Prosim vnesi geslo"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Prosim vnesi zadevo"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2936,20 +2994,20 @@ msgstr "Prosim vnesi veljaven elektronski naslov"
 msgid "Please enter a valid email address"
 msgstr "Prosim vnesi veljaven elektronski naslov"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr "Prosim vnesi veljaven elektronski naslov ali telefonsko številko"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Prosim vnesi podrobnosti"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2965,7 +3023,7 @@ msgid "Please enter your first name"
 msgstr "Prosim vnesi svoje ime"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr ""
@@ -2977,9 +3035,9 @@ msgstr "Vnesi svoje ime"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Vnesi svoje ime"
@@ -3020,19 +3078,19 @@ msgstr ""
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Prosim vnesi veljaven elektronski naslov"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3059,24 +3117,28 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -3084,7 +3146,7 @@ msgstr ""
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3096,7 +3158,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Označi ali je bil problem rešen ali ne"
 
@@ -3104,12 +3166,12 @@ msgstr "Označi ali je bil problem rešen ali ne"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Naloži samo fotografijo"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr "Preveri vsaj e-mail ali telefon"
 
@@ -3117,27 +3179,23 @@ msgstr "Preveri vsaj e-mail ali telefon"
 msgid "Please write a message"
 msgstr "Vnesi sporočilo"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Objavi"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr "Poštna številka ali ulica in območje"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -3153,7 +3211,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3161,11 +3219,11 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3181,9 +3239,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr ""
 
@@ -3232,7 +3290,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problem označen kot odprt."
 
@@ -3240,8 +3298,7 @@ msgstr "Problem označen kot odprt."
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Težave"
@@ -3266,18 +3323,18 @@ msgstr ""
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3285,7 +3342,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3293,11 +3350,15 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3311,11 +3372,11 @@ msgstr ""
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr ""
 
@@ -3323,12 +3384,12 @@ msgstr ""
 msgid "Public details"
 msgstr "Javne podrobnosti"
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Javni odgovor:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Javni popravek:"
 
@@ -3371,11 +3432,11 @@ msgstr "Vprašalnik, ki ga je izpolnil prijavitelj problema"
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -3383,11 +3444,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -3395,13 +3456,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -3415,11 +3476,11 @@ msgstr ""
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3432,7 +3493,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3446,7 +3507,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Nedavno prijavljeni problemi"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Nedavno posodobljeno"
@@ -3459,7 +3520,8 @@ msgstr "Zavrni prijavo"
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3471,8 +3533,8 @@ msgstr "Odstrani polje"
 msgid "Remove flag"
 msgstr "Odstrani polje"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3488,17 +3550,22 @@ msgstr "Odstrani s spletnega mesta"
 msgid "Remove option"
 msgstr "Odstrani polje"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Odstrani fotografijo (ne more biti razveljavljeno)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Odstrani s spletnega mesta"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr "Zamenjaj žeton"
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Odgovori uporabniku:"
 
@@ -3506,14 +3573,14 @@ msgstr "Odgovori uporabniku:"
 msgid "Report"
 msgstr "Poročilo"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "ID poročila:"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3522,7 +3589,7 @@ msgid "Report a problem"
 msgstr "Poročaj o problemu"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr "Poročaj o problemu tukaj"
@@ -3538,7 +3605,7 @@ msgid "Report anonymously"
 msgstr "Prijavi zlorabo"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3574,7 +3641,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -3585,7 +3652,7 @@ msgstr ""
 msgid "Reported before"
 msgstr "Prijavljeno pred"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr ""
@@ -3599,27 +3666,27 @@ msgstr "Prijavljeno od"
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -3638,17 +3705,15 @@ msgstr "Prijavljen:"
 msgid "Reporting a problem"
 msgstr "Prijavljanje problema:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Poročila"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3676,15 +3741,15 @@ msgid "Reports published"
 msgstr "Poročila obljavljena."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3697,7 +3762,7 @@ msgstr "Poročila v čakajoča pošiljanja"
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr "Zahtevano"
 
@@ -3750,39 +3815,45 @@ msgstr "Vrni na prvotni naslov"
 msgid "Right place?"
 msgstr "Pravo mesto?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Zavrti v levo"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3798,20 +3869,20 @@ msgstr "Vrtenje te slike bo uničilo neshranjene spremembe tega poročila."
 msgid "Satellite"
 msgstr "Satelit"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3828,13 +3899,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Išči poročila"
 
@@ -3847,7 +3917,7 @@ msgstr "Išči uporabnike"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Išči poročila"
 
@@ -3862,12 +3932,12 @@ msgstr "Iskanje:"
 msgid "Searching found no reports."
 msgstr ""
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Iskanje ni našlo uporabnikov."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr "Varnost"
@@ -3877,8 +3947,7 @@ msgstr "Varnost"
 msgid "See our privacy policy"
 msgstr "Poglej našo politiko zasebnosti"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3888,7 +3957,7 @@ msgid "Select a body"
 msgstr ""
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Izberi območje"
@@ -3909,7 +3978,7 @@ msgstr ""
 msgid "Select:"
 msgstr "Izberi:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr "Pošlji"
@@ -3922,7 +3991,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3931,11 +4000,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3973,7 +4042,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr "Seznam"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3984,7 +4053,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4009,8 +4078,8 @@ msgstr "Prikaži ime javno?"
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr "Prikaži starejše"
 
@@ -4021,7 +4090,7 @@ msgstr "Prikaži sliko"
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr ""
 
@@ -4081,7 +4150,7 @@ msgid "Some photos of recent reports"
 msgstr ""
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr ""
 
@@ -4090,12 +4159,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4113,9 +4181,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Oprosti, ne najdem te lokacije."
 
@@ -4125,13 +4193,13 @@ msgstr "Oprosti, ne najdem te lokacije."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4145,11 +4213,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr "Oprosti, nimaš dovoljenja za to."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Uredi po"
@@ -4159,11 +4227,11 @@ msgstr "Uredi po"
 msgid "Staff only"
 msgstr "Osebje:"
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr "Osebje:"
 
@@ -4187,18 +4255,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4207,31 +4275,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Status"
 
@@ -4249,7 +4314,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr "Podkategorija"
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr ""
 
@@ -4268,50 +4333,48 @@ msgstr "Zadeva:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Pošlji"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Pošlji spremembe"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4323,7 +4386,7 @@ msgstr "Naročeno:"
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4337,20 +4400,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr "Povzemi težavo"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Povzemi svoje spremembe"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Povzetek"
 
@@ -4361,14 +4423,20 @@ msgstr ""
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Superuser"
+msgstr "Superuser:"
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr "Superuser:"
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4386,13 +4454,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Predloge"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Besedilo"
@@ -4414,6 +4486,11 @@ msgstr "Samo besedilna verzija"
 msgid "Text:"
 msgstr "Besedilo:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Besedilo"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Hvala za prijavo te težave!"
@@ -4443,7 +4520,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4455,27 +4532,29 @@ msgstr ""
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Lokacije izgleda ni v Združenem kraljestvu. Poskusi ponovno."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Poštna številka je nepoznana. Oprosti."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Težava je označena kot poslana."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Težava bo poslana ponovno."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
@@ -4521,8 +4600,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4577,7 +4656,7 @@ msgstr "Napaka: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr ""
 
@@ -4639,8 +4718,8 @@ msgstr ""
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4673,7 +4752,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4691,12 +4770,12 @@ msgstr "Težava s prikazom strani. Poskusi kasneje."
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -4704,7 +4783,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -4780,10 +4859,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Podatek je obvezen"
 
@@ -4800,19 +4879,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Težava je rešena"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Težava ni rešena"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr "Reševanje težave še traja"
 
@@ -4825,26 +4908,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4852,15 +4935,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4884,6 +4970,10 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4909,7 +4999,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr ""
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4934,11 +5024,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4961,16 +5046,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4980,7 +5065,7 @@ msgstr ""
 msgid "Type"
 msgstr "Tip"
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5010,10 +5095,10 @@ msgstr "Neznana napaka"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5025,13 +5110,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr ""
 
@@ -5081,29 +5166,27 @@ msgstr ""
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Posodobljen"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Posodobljen!"
 
@@ -5114,7 +5197,7 @@ msgstr "Posodobljen!"
 msgid "Updates"
 msgstr "Posodobitve"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5144,6 +5227,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5157,8 +5248,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5176,7 +5267,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5189,27 +5280,25 @@ msgstr ""
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5217,9 +5306,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr ""
 
@@ -5245,7 +5334,7 @@ msgstr ""
 msgid "View report on site"
 msgstr ""
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr ""
 
@@ -5253,7 +5342,7 @@ msgstr ""
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5271,7 +5360,7 @@ msgstr "Gledanje težave"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr ""
 
@@ -5341,7 +5430,7 @@ msgstr "Ko je poslano"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5361,7 +5450,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr ""
 
@@ -5373,7 +5462,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5384,12 +5472,12 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Ja"
 
@@ -5402,7 +5490,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr "Ste brez povezave."
 
@@ -5415,7 +5503,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5424,7 +5512,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5454,7 +5542,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5464,7 +5552,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5472,7 +5560,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5481,8 +5569,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5546,9 +5633,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5557,13 +5644,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5592,16 +5680,16 @@ msgstr ""
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5621,8 +5709,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5655,7 +5743,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5686,19 +5774,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5706,8 +5794,8 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr ""
 
@@ -5738,6 +5826,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5755,7 +5847,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5838,12 +5930,12 @@ msgid "today"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5868,7 +5960,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr ""
 
@@ -5944,7 +6036,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5971,7 +6063,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5998,7 +6090,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
@@ -6007,7 +6099,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
@@ -6016,7 +6108,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6061,7 +6153,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
@@ -6070,7 +6162,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
@@ -6079,12 +6171,12 @@ msgstr[1] "poročili"
 msgstr[2] "poročil"
 msgstr[3] "poročil"
 
+#~ msgid "Post"
+#~ msgstr "Objavi"
+
 #~ msgid "Automated"
 #~ msgstr "Samodejno"
 
-#~ msgid "Available categories"
-#~ msgstr "Razpoložljive kategorije"
-
 #~ msgid "Coordinates:"
 #~ msgstr "Koordinate:"
 
diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po
index 448040b9d..aabe3f125 100644
--- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Albanian (https://www.transifex.com/mysociety/teams/12067/sq/)\n"
@@ -20,8 +20,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "dhe"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Raportet përmbledhëse"
 
@@ -117,7 +117,7 @@ msgstr "%s pyetësorët janë dërguar &ndash; %s pergjigjur (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; kontribuesit në <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>"
 
@@ -163,6 +163,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(nuk është dërguar në kuvend)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -181,8 +183,8 @@ msgstr "(dërguar te të dy)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Zgjedh kategorinë --"
@@ -212,17 +214,18 @@ msgstr ""
 "              Ndoshta shtoni disa <code>MAPIT_TYPES</code> në skedarin tuaj të konfigurimit?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -252,7 +255,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Po</strong> Kam fjalëkalim"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -269,7 +272,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -292,7 +295,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Shto kontakt duke përdorë formularin e mëposhtëm."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Shto kategori të re"
@@ -325,7 +328,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Shto kategori të re"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -334,8 +337,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -343,21 +346,20 @@ msgid "Add to shortlist"
 msgstr "Shto në listë"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Shto përdorues"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Shto/modifiko kategoritë e problemeve"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Shto/modifiko prioritetet e përgjegjes"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Shto/modifiko shabllonat e përgjegjeve"
 
@@ -373,6 +375,12 @@ msgstr "Nëse e shtoni këtë raport në listë, ai do të largohet nga lista %s
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Përsëri:"
@@ -385,8 +393,8 @@ msgstr "Njoftimi %d u krijua për %s, lloji %s, parametrat %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Njoftimi %d është çaktivizuar (krijuar %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Më njofto për përditësimet e ardhme"
 
@@ -398,10 +406,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Të gjitha raportet"
@@ -441,6 +451,11 @@ msgstr "Të gjitha raportimet mes %s dhe %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Raportuar në kategorinë %s"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -477,7 +492,7 @@ msgstr "Anonim"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -490,7 +505,7 @@ msgid "Another user"
 msgstr "Përdorues tjetër"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "A je i sigurt se do ta ndërpresh këtë ngarkim?"
 
@@ -499,8 +514,8 @@ msgstr "A je i sigurt se do ta ndërpresh këtë ngarkim?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "A je i sigurt?"
@@ -511,7 +526,7 @@ msgstr "A je i sigurt?"
 msgid "Area covered"
 msgstr "Zona e mbuluar"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Zona:"
 
@@ -525,27 +540,32 @@ msgstr "Meqë kjo është faqe testuese dhe %s është e pavërtetë, raportimet
 msgid "Assign selected to role:"
 msgstr "Cakto përdoruesit në zona"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Cakto te zyrja kompetente:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Cakto në kategori tjetër:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Cakto te një zyre e jashtme:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Cakto te një nëndepartament:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "Cakto përdoruesit në zona"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Kategoritë ekzistuese"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Caktuar për %s"
@@ -558,7 +578,7 @@ msgstr "Për çdo kërkesë kthehen më së shumti %d raportime. Raportimet e kt
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Për momentin funksionon vetëm kërkimi dhe shikimi i raportimeve."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr "Përdoruesit e autorizuar mund të shoqërohen me kategoritë, në të cilat operojnë."
 
@@ -566,11 +586,11 @@ msgstr "Përdoruesit e autorizuar mund të shoqërohen me kategoritë, në të c
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Pergjigje automatike:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -582,12 +602,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Mos përcillni informacione personale dhe targa të veturave"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Në pritje të ndërmjetësimit"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Prapa"
@@ -608,14 +629,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Zyret"
 
@@ -628,11 +647,13 @@ msgstr "Zyret"
 msgid "Body"
 msgstr "Zyra"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Zyra:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -644,8 +665,7 @@ msgstr "Nuk po e gjeni emailin tonë? Shikoni në spam."
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Nuk mund ta shihni hartën? <em>Kapërceni këtë hap</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -661,15 +681,13 @@ msgstr "Kategoritë:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -679,7 +697,7 @@ msgstr "Kategoria"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Kategoria është ndryshuar nga ‘%s’ në ‘%s’"
 
@@ -702,6 +720,11 @@ msgstr "Kategoria:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Ndrysho fjalëkalimin"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -718,7 +741,7 @@ msgstr "Ndrysho fjalëkalimin"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -730,12 +753,12 @@ msgstr ""
 "Zgjedh një emër të <strong>kategorisë</strong> që ka kuptim për publikun (p.sh., \"Shahtë\", \"Ndriçim\") por që kuptohet\n"
 "                  edhe nga zyra. Kjo kategori do të shfaqet në listën e menysë në faqen raporto-problemin."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -772,8 +795,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -783,11 +806,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Mbyllur"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Mbyllur nga zyra"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -820,13 +839,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Konfigurimi"
@@ -943,7 +961,7 @@ msgstr "Krijo raport"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Krijo kategori"
@@ -953,27 +971,25 @@ msgstr "Krijo kategori"
 msgid "Create priority"
 msgstr "Krijo prioritet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "Krijo raportim/përditësim si zyre"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "Krijo raportim/përditësim në emër të përdoruesit"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Krijo shabllon"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "U krijua"
@@ -982,6 +998,17 @@ msgstr "U krijua"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "U krijua"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "U krijua"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -993,10 +1020,6 @@ msgstr "U krijua:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -1006,19 +1029,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "Aktualisht asnjë zyre nuk është krijuar."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Klienti nuk është i kontaktueshëm"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Pasqyra"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1030,7 +1055,7 @@ msgstr "Është trajtuar nga nëndrejtoria brenda 5 ditëve të punës"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1040,7 +1065,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Fshij shabllonin"
@@ -1062,9 +1087,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Përshkrimi"
 
@@ -1073,7 +1096,7 @@ msgstr "Përshkrimi"
 msgid "Destination"
 msgstr "Përshkrimi"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1109,7 +1132,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1117,6 +1140,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Raportuar në kategorinë %s"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Raportuar në kategorinë %s"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1151,25 +1184,25 @@ msgstr "Nuk e di"
 msgid "Don't like forms?"
 msgstr "Nuk ju pëlqejnë formularët?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Lësho fotografitë këtu <u>kliko për të ngarkuar</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1185,7 +1218,7 @@ msgstr ""
 "            Kjo domethënë se mund të shtoni shumë kategori edhe nëse keni vetë një kontakt të zyres.\n"
 "    "
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr "Lindja/Veriu:"
@@ -1197,7 +1230,7 @@ msgstr "Lindja/Veriu:"
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Modifiko"
@@ -1208,12 +1241,11 @@ msgstr "Modifiko"
 msgid "Edit body details"
 msgstr "Modifiko detajet e zyres"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "Modifiko privilegjet e përdoruesit tjetër"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Modifiko kategorine"
 
@@ -1221,17 +1253,15 @@ msgstr "Modifiko kategorine"
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Modifiko prioritetin e raportimit"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Modifiko raportimet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1268,8 +1298,9 @@ msgstr "Redaktori"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1278,15 +1309,14 @@ msgstr "Redaktori"
 msgid "Email"
 msgstr "Email"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Adresa e emailit"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1306,12 +1336,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Emaili:"
@@ -1381,12 +1412,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Instanca e fundit"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Fut një rrugë në Z&uuml;rich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Fut një kod postar të Britanisë, apo një rrugë / lagje"
 
@@ -1413,10 +1444,10 @@ msgstr "Përshkruaj problemin"
 msgid "Error"
 msgstr "Gabim"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Gjithëçka"
 
@@ -1429,7 +1460,7 @@ msgstr "Shembull i kodit postar %s"
 msgid "Examples:"
 msgstr "Shembuj:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Kategori ekzistuese"
 
@@ -1438,7 +1469,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1463,7 +1494,7 @@ msgid "External body"
 msgstr "Zyre e jashtme"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1475,20 +1506,20 @@ msgstr ""
 msgid "External team"
 msgstr "Ekip i jashtëm"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Të dhëna shtesë:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1521,20 +1552,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filtro listën e raporteve"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Hera e parë"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Fotografitë e raportimeve të fundit"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Raportime të reja"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Rregullo këtë duke zgjedhur <strong>zonën e mbuluar</strong> në fushën <em>Modifiko detajet e zyres</em>."
@@ -1564,7 +1600,7 @@ msgstr "Marko si të fshirë"
 msgid "Flag user"
 msgstr "Marko përdoruesin"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr " Markuar"
@@ -1573,7 +1609,7 @@ msgstr " Markuar"
 msgid "Flagged reports and users"
 msgstr "Raportimet dhe përdoruesit e markuar"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Përdoruesit e markuar janë listuar në faqen e <a href='%s'>markimeve</a>."
 
@@ -1581,8 +1617,8 @@ msgstr "Përdoruesit e markuar janë listuar në faqen e <a href='%s'>markimeve<
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Përdoruesit e markuar nuk janë të kufizuar në asnjë mënyrë. Ata markohen vetëm për t'u vënë re."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Markuar:"
 
@@ -1608,11 +1644,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Keni harruar fjalëkalimin?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Është përcjellë te një zyre e jashtme"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Dëshirë për ta përcjellë te një zyre e jashtme"
 
@@ -1622,12 +1658,20 @@ msgstr "Dëshirë për ta përcjellë te një zyre e jashtme"
 msgid "Frequently Asked Questions"
 msgstr "Pyetjet më të shpeshta"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1649,7 +1693,7 @@ msgstr "Merr përditesime për %s problemet"
 msgid "Get updates of problems in this %s"
 msgstr "Merr përditësimet e problemeve në këtë %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Më jep RSS"
 
@@ -1665,15 +1709,15 @@ msgstr "Gëzohem që qenka rregulluar!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1683,7 +1727,7 @@ msgstr "Vazhdo"
 msgid "Going to send questionnaire?"
 msgstr "Do ta dërgoni pyetësorin?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr "Jepni qasje administratorit"
 
@@ -1709,6 +1753,7 @@ msgstr "A keni raportuar ndonjëherë problem te kjo zyre, apo është hera e pa
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1743,7 +1788,8 @@ msgstr "Fshehur"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1771,7 +1817,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Fshih shenjën"
 
@@ -1825,11 +1871,9 @@ msgstr "Fatkeqësisht problemi juaj nuk u lokalizua në databazë.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1850,15 +1894,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1874,7 +1918,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1898,7 +1942,7 @@ msgstr "Nëse doni që ky shabllon të jetë opcional për kategori specifike, z
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "Nëse e dërgoni problemin këtu ai <strong>nuk</strong> do të përcillet te zyrja."
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1937,7 +1981,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1961,6 +2005,17 @@ msgstr "Në tabelën e abuzimeve?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "Përveç kësaj, atributet në vijim që nuk janë pjesë e specifikimit Open311 v2 mund të kthehen: agency_sent_datetime, title (mund të kthehet si pjesë e përshkrimit), interface_used, comment_count, requestor_name (paraqitet vetëm kur kërkuesi ka lejuar që emri i tij të shfaqet në faqe)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "lagje"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1970,20 +2025,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr "Kutia e postës zero, po fillojmë!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Përfshij të dhënat personale të raportuesit"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Vlera e has_photo (ka foto) nuk është korrekte \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "Instrukto kontraktorët se si të rregullohet problemi"
 
@@ -2000,16 +2055,12 @@ msgstr "Shënime të brendshme"
 msgid "Internal notes"
 msgstr "Shënime të brendshme"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Vlerë jovalide për agency_responsible %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Formati jovalid %s ."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Vendndodhja jovalide. Lokacioni i ri duhet të mbulohet nga e njejta zyre."
 
@@ -2061,13 +2112,13 @@ msgstr "Përditësimi i fundit:"
 msgid "Last&nbsp;update:"
 msgstr "Përditësimi&nbsp;i&nbsp;fundit:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Perditesimi më i hershëm:"
@@ -2084,7 +2135,7 @@ msgstr "Listo të gjitha problemet e raportuara"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Duke ngarkuar..."
@@ -2122,17 +2173,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2150,19 +2202,20 @@ msgstr ""
 msgid "MAP"
 msgstr "HARTA"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr "Menagjo listat"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2176,24 +2229,24 @@ msgstr "Harta"
 msgid "Mark as sent"
 msgstr "Marko si të dërguar"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Marko përdoruesit, sjellje e të cilëve do ta përcjellësh si të <strong>markuar</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr "Detajet e problemeve të markimit"
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Mesazhi"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Mesazhi për zyren kompetente:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Mesazhi për zyre e jashtme:"
 
@@ -2206,7 +2259,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr "Zyret që mungojnë:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "ID e jurisdikcionit që mungon"
 
@@ -2214,8 +2267,7 @@ msgstr "ID e jurisdikcionit që mungon"
 msgid "Moderate"
 msgstr "Modero"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Detajet e raportimit të moderuar"
 
@@ -2238,7 +2290,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "Moderuar nga departamenti brenda një dite të punës"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2248,14 +2300,14 @@ msgstr ""
 msgid "Month"
 msgstr "Muaji"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Më të komentuarit"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2283,9 +2335,10 @@ msgstr ""
 msgid "Name"
 msgstr "Emri"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Emri:"
@@ -2303,7 +2356,7 @@ msgstr "Navigo te ky problem"
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Rruga më e afërt e emërtuar te shenja e vendosur në hartë (gjeneruar automatikisht nga OpenStreetMap): %s%s"
 
@@ -2311,12 +2364,12 @@ msgstr "Rruga më e afërt e emërtuar te shenja e vendosur në hartë (gjenerua
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Kodi postar më i afërt te shenja e vendosur në hartë (gjeneruar automatikisht): %s (%sm away)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Rruga më e afërt e emërtuar te shenja e vendosur në hartë (gjeneruar automatikisht nga Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2341,7 +2394,7 @@ msgstr ""
 msgid "New body added"
 msgstr "U shtua një zyre e re"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "U shtua një kontakt i ri i kategorisë"
 
@@ -2354,8 +2407,8 @@ msgstr "Adresë e re Emaili:"
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Shenim i ri i brendshëm:"
 
@@ -2363,13 +2416,13 @@ msgstr "Shenim i ri i brendshëm:"
 msgid "New local problems on FixMyStreet"
 msgstr "Problem i ri lokal në FixMyStreet"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Shenim i ri për DM:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Fjalëkalim i ri:"
 
@@ -2446,7 +2499,7 @@ msgstr "Shabllon i ri"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Më e reja"
@@ -2459,7 +2512,6 @@ msgstr "Tjetra"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2468,11 +2520,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Jo"
 
@@ -2484,11 +2536,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Pa zyre"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Nuk është zgjedhur zyrja"
 
@@ -2504,8 +2557,8 @@ msgstr "Nuk ka probleme të markuara."
 msgid "No flagged users found."
 msgstr "Nuk ka përdorues të markuar"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Nuk ka përditësime tjera"
 
@@ -2543,8 +2596,8 @@ msgstr "Asnjë përkrahës"
 msgid "None"
 msgstr "Asnjë"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
@@ -2552,8 +2605,8 @@ msgstr ""
 "Përdoruesit e rëndomtë (publik) nuk duhet të shoqërohen me <strong>zona</strong>.<br>\n"
 "                  Përdoruesit e punësuar të autorizuar mund të shoqërohen me zonën ku operojnë."
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2565,10 +2618,14 @@ msgstr ""
 "                Varësisht prej implementimit, përdoruesit e punësuar mund të kenë qasje në pasqyrë (përmbledhje\n"
 "                të aktiviteteve në tërë zyren e vet), të kenë privilegjin të fshehin raportimet apo t'u vënë status special."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Nuk përket në nëndrejtorit e mija"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Nuk është raportuar më parë"
@@ -2616,12 +2673,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2629,12 +2686,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Gjendje e vjetër"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Më të vjetrat"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2643,7 +2700,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2674,7 +2731,7 @@ msgstr "Web faqja e iniciativës Open311"
 msgid "Open311 specification"
 msgstr "Specifikimet Open311"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2686,7 +2743,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2694,16 +2751,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2735,7 +2792,7 @@ msgstr "Faqja nuk u gjet"
 msgid "Parent"
 msgstr "Instanca prindore"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Të gjitha kategoritë"
@@ -2744,13 +2801,13 @@ msgstr "Të gjitha kategoritë"
 msgid "Partial"
 msgstr "I pjesshëm"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Fjalëkalimi (opsional)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Fjalëkalimi juaj është ndryshuar"
@@ -2765,7 +2822,7 @@ msgstr "Fjalëkalimi (opsional)"
 msgid "Permissions"
 msgstr "Privilegjet:"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Privilegjet:"
 
@@ -2773,19 +2830,24 @@ msgstr "Privilegjet:"
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefoni:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Numri i telefonit"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Numri i telefonit (opsional)"
 
@@ -2793,30 +2855,26 @@ msgstr "Numri i telefonit (opsional)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefoni:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2836,9 +2894,8 @@ msgstr "Foto e domosdoshme"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Fotografitë"
@@ -2847,7 +2904,7 @@ msgstr "Fotografitë"
 msgid "Photos of recent nearby reports"
 msgstr "Fotografitë e raportimeve të fundit"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2861,6 +2918,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Vendos shenjën në hartë"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2888,27 +2950,26 @@ msgid "Please check your email address is correct"
 msgstr "Ju lutem kontrolloni adresën e emailit"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Ju lutem zgjedhni kategorinë"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2930,27 +2991,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Ju lutemi mos u bëni abuziv&nbsp;&mdash; abuzimi i zyreve e zhvlerëson shërbimin për të gjithë përdoruesit."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Ju lutem shkruani mesazhin"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Ju lutemi shkruani emrin"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "Ju lutem shkruani emrin për këtë zyre"
 
@@ -2963,16 +3024,16 @@ msgstr "Ju lutemi shkruani fjalëkalimin"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Ju lutemi shkruani titullin"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2983,20 +3044,20 @@ msgstr "Ju lutemi shkruani një email valid"
 msgid "Please enter a valid email address"
 msgstr "Ju lutemi jepni një adresë valide emaili"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Ju lutemi shkruani disa detaje"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -3012,7 +3073,7 @@ msgid "Please enter your first name"
 msgstr "Ju lutemi shkruani emrin tuaj"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Ju lutemi shkruani emrin tuaj të plotë, zyreve u duhen këto informata - nëse nuk doni që emri juaj të shfaqet, hiqni çekimin më poshtë"
@@ -3024,9 +3085,9 @@ msgstr "Ju lutemi shkruani emrin tuaj"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Ju lutemi shkruani emrin tuaj"
@@ -3067,19 +3128,19 @@ msgstr "Ju lutemi plotësoni formularin e mëposhtëm me detajet e problemit, dh
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Ju lutemi shenoni nëse doni të pranoni edhe një pyetësor tjetër"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Ju lutemi jepni një adresë valide emaili"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3106,24 +3167,28 @@ msgstr "Ju lutemi vini re se përditësimi juaj <strong>nuk është postuar</str
 msgid "Please note:"
 msgstr "Ju lutemi vini re:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr "Ju lutemi shkruani përditësimin tuaj publik për këtë raportim."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Ju lutemi shkruani sqarimet se pse po e rihapni këtë raportim "
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Ju lutemi ofroni pershkrim dhe fotografi"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Ju lutemi tregoni nëse keni raportuar më parë ndonjë problem te komuna juaj"
 
@@ -3131,7 +3196,7 @@ msgstr "Ju lutemi tregoni nëse keni raportuar më parë ndonjë problem te komu
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Ju lutemi zgjedhni një zyre."
 
@@ -3143,7 +3208,7 @@ msgstr "Ju lutemi zgjedhni RSS-in që deshironi"
 msgid "Please select the type of alert you want"
 msgstr "Ju lutemi zgjedhni tipin e njoftimit që dëshironi"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Ju lutemi tregoni nëse problemi është rregulluar"
 
@@ -3151,12 +3216,12 @@ msgstr "Ju lutemi tregoni nëse problemi është rregulluar"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Ju lutemi vetëm ngarkoni një fotografi"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3164,27 +3229,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Ju lutemi shkruani një mesazh"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Posto"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Postuar në mënyrë anonime te %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Postuar nga %s te %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Postuar nga  <strong>%s</strong> (%s) ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Postuar nga  <strong>%s</strong> ne %s"
 
@@ -3200,7 +3261,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3208,11 +3269,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Paraprak"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Prioritetet"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Prioriteti"
@@ -3228,9 +3289,9 @@ msgid "Privacy and cookies"
 msgstr "Privacia dhe cookiet"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privat"
 
@@ -3280,7 +3341,7 @@ msgstr "Problemi %s u dërgua te zyrja %s"
 msgid "Problem breakdown by state"
 msgstr "Analiza e problemit sipas statusit"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problemi është shenuar si i hapur."
 
@@ -3288,8 +3349,7 @@ msgstr "Problemi është shenuar si i hapur."
 msgid "Problem state change based on survey results"
 msgstr "Ndryshimi i statusit të problemit bazuar në rezultatet e anketës"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemet"
@@ -3314,18 +3374,18 @@ msgstr "Problemet e raportuara së fundit në FixMyStreet"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemet brenda %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemet brenda lagjes %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3333,7 +3393,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Problemet brenda %s, %s"
 
@@ -3341,11 +3401,15 @@ msgstr "Problemet brenda %s, %s"
 msgid "Property address:"
 msgstr "Adresa e pronës:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3359,11 +3423,11 @@ msgstr "Ofro një përditësim"
 msgid "Provide update as"
 msgstr "Ofro një përditësim si"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Shenimi i fjalëkalimit është opsional, por kjo do t'ju mundësojë të raportoni më lehtë, të bëni përditësime dhe të menagjoni raportimet tuaja."
 
@@ -3371,12 +3435,12 @@ msgstr "Shenimi i fjalëkalimit është opsional, por kjo do t'ju mundësojë t
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Pergjigje publike:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Përditësim publik:"
 
@@ -3419,11 +3483,11 @@ msgstr "Pyetësori u plotësua nga raportuesi i problemit"
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS feed për %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS feed për lagjen %s , %s"
 
@@ -3431,11 +3495,11 @@ msgstr "RSS feed për lagjen %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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS feed i %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS feed i %s, brenda lagjes %s"
 
@@ -3443,13 +3507,13 @@ msgstr "RSS feed i %s, brenda lagjes %s"
 msgid "RSS feed of nearby problems"
 msgstr "RSS feed i problemeve në afërsi"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS feed i problemeve brenda %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS feed i problemeve brenda lagjes %s "
 
@@ -3463,11 +3527,11 @@ msgstr "RSS feed nga problemet e fundit lokale"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS feed për të rejat rreth këtij problemi"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3480,7 +3544,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Prano email kur ka përditësime të këtij problemi."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr "Pranuar nga %s disa momente më vonë"
 
@@ -3494,7 +3558,7 @@ msgstr "Problemet lokale të raportuara risht, %s"
 msgid "Recently reported problems"
 msgstr "Problemet e raportuara rishtazi"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Përditësimet e bëra rishtazi"
@@ -3507,7 +3571,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Mbani mend se FixMyStreet është në rend të parë për të raportuar problemet fizike që mund të rregullohen. Nëse problemi juaj nuk është i kësaj natyre mund ta kontaktoni zyren përmjet faqes së tyre zyrtare."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3519,8 +3584,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Hiq markimin"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3536,17 +3601,22 @@ msgstr "Hiq nga faqja"
 msgid "Remove option"
 msgstr "Hiq nga faqja"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Hiq fotografinë (nuk mund te kthehet!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Modifiko privilegjet e përdoruesit tjetër"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Përgjigju përdoruesit:"
 
@@ -3554,14 +3624,14 @@ msgstr "Përgjigju përdoruesit:"
 msgid "Report"
 msgstr "Raportimi"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "ID e raportimit"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3570,7 +3640,7 @@ msgid "Report a problem"
 msgstr "Raporto problemin"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3586,7 +3656,7 @@ msgid "Report anonymously"
 msgstr "Raportuar ne menyre anonime te %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3622,7 +3692,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Raporto, shih apo diskuto problemet lokale"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Raportuar ne menyre anonime te %s"
@@ -3633,7 +3703,7 @@ msgstr "Raportuar ne menyre anonime te %s"
 msgid "Reported before"
 msgstr "Raportuar para"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Raportuar nga %s te %s"
@@ -3647,27 +3717,27 @@ msgstr "Raportuar nga:"
 msgid "Reported in the %s category"
 msgstr "Raportuar në kategorinë %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Raportuar në kategorinë %s në mënyrë anonime te %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Raportuar në kategorinë %s nga %s te %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Raportuar përmjet %s në mënyrë anonime te %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Raportuar përmjet %s nga %s te %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Raportuar përmjet %s në kategorinë %s në mënyrë anonime te %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Raportuar përmjet %s në kategorinë %s te %s"
 
@@ -3686,17 +3756,15 @@ msgstr "Raportuar:"
 msgid "Reporting a problem"
 msgstr "Raportimi i një problemi"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Raportimet"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3724,15 +3792,15 @@ msgid "Reports published"
 msgstr "Raportimet e publikuara"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3745,7 +3813,7 @@ msgstr "Raportimet në pritje për t'u dërguar"
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3798,39 +3866,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "Vendi i duhur?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Operatori i rrugës për këtë rrugë me emër (nxjerrë nga referenca e rrugëve numri dhe tipi): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operatori i rrugës për këtë rrugë me emër (nga OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Rrotullo majtas"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3846,20 +3920,20 @@ msgstr "Rrotullimi i kësaj fotografie do t'i humbas ndërrimet e paruajtura në
 msgid "Satellite"
 msgstr "Sateliti"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3876,13 +3950,12 @@ msgid "Save with a public update"
 msgstr "Ruaj me përditësim publik"
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Kërko raportet"
 
@@ -3895,7 +3968,7 @@ msgstr "Kërko përdoruesit"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Kërko raportet"
 
@@ -3910,12 +3983,12 @@ msgstr "Kërko:"
 msgid "Searching found no reports."
 msgstr "Kerkimit nuk gjeti asnjë raport."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Kërkimi nuk gjeti asnjë përdorues."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3925,8 +3998,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr "Shih parimet tona të privacisë"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3936,7 +4008,7 @@ msgid "Select a body"
 msgstr "Zgjedh një zyre"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Zgjedh një zonë"
@@ -3957,7 +4029,7 @@ msgstr ""
 msgid "Select:"
 msgstr "Zgjedh:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3970,7 +4042,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr "Zgjedh statuset e zgjeruara Open311 me shërbim të përditësimit"
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3979,11 +4051,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "Dërgo raportin prapa"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Dërgo te %s %s më vonë"
 
@@ -4021,7 +4093,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr "Lista"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4032,7 +4104,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr "Listuar"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr "Listuar nga %s"
@@ -4057,8 +4129,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4069,7 +4141,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Shfaq shenjat"
 
@@ -4131,7 +4203,7 @@ msgid "Some photos of recent reports"
 msgstr "Disa foto nga raportimet e fundit"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Tekst për përkthim"
 
@@ -4140,12 +4212,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Kërkojmë falje, ky kod postar duket të jetë nën mbrojtje të autorit, të cilën nuk e kemi."
 
@@ -4163,9 +4234,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Kërkojmë falje, ndodhi një gabim gjatë konfirmimit të problemit tuaj."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Kërkojmë falje, lokacioni nuk u gjet."
 
@@ -4175,13 +4246,13 @@ msgstr "Kërkojmë falje, lokacioni nuk u gjet."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr "Kërkojmë falje, nuk arritëm t'ju kyçim. Plotësoni formularin e mëposhtëm."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Kërkojmë falje, lokacioni ishte i pakuptueshëm. Provoni përsëri."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4196,11 +4267,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr "Kërkojmë falje, nuk keni privilegje për ta bërë këtë."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Rradhit sipas"
@@ -4210,11 +4281,11 @@ msgstr "Rradhit sipas"
 msgid "Staff only"
 msgstr "Nëpunësit:"
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr "Përdoruesit e punësuar kanë privilegj për t'u kyçur në admin."
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr "Nëpunësit:"
 
@@ -4238,18 +4309,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Statusi"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4258,31 +4329,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Statusi:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Statistikat"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Statusi"
 
@@ -4300,7 +4368,7 @@ msgstr "Pamja e rrugës"
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Nëndrejtoria/Zyra"
 
@@ -4319,50 +4387,48 @@ msgstr "Tema:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Dërgo"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Dërgo ndryshimet"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Dërgo pyetësorin"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Dërguar"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Abonohu"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4375,7 +4441,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Përditësimet janë të limituara në gjatësi prej %s shenjash. Ju lutemi shkurtojeni përditësimin "
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4389,20 +4455,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr "Përmblidhe problemin"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Përmblidh ndryshimet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Përmbledhje"
 
@@ -4413,14 +4478,20 @@ msgstr "Raportet përmbledhëse"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Superuser"
+msgstr "Përdorues i privilegjuar"
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr "Përdorues i privilegjuar"
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "Përdoruesit e privilegjuar kanë të drejta të kryejnë <strong>të gjitha veprimet</strong> në admin."
 
@@ -4438,13 +4509,18 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr "Shablloni &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Shabllonet"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Perditesimi më i hershëm:"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Teksti"
@@ -4465,6 +4541,11 @@ msgstr "Verzioni vetëm tekst"
 msgid "Text:"
 msgstr "Teksti:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Teksti"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Ju falemnderit për raportimin e problemit!"
@@ -4494,7 +4575,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Falemnderit, na vjen mirë që është rregulluar! A mund t'ju pyesim, nëse keni raportuar problem përpara?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4506,27 +4587,29 @@ msgstr "Kjo foto nuk duket të jetë ngarkuar mirë (%s), ju lutemi provoni prap
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Ky lokacion nuk duket të jetë mbuluar nga zyrja; ndoshta është jashtë shtetit. Ju lutemi provoni prap."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Ky lokacion nuk duket se është brenda kufijve të shtetit; provoni prap."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Ky kod postar nuk është i njohur, na vjen keq."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Problemi u markua i dërguar."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Ky problem nuk do të ridërgohet."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Ky raport është fshirë nga FixMyStreet."
 
@@ -4576,8 +4659,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4636,7 +4719,7 @@ msgstr "Gabimi ishte: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "Atribute Open311 v2 në vijim kthehen për çdo kërkesë: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "Informata për rrugën më të afërt mund të jetë e pasaktë apo jorelevante, nëse problemi është afër disa rrugëve apo afër një rruge pa emër të regjistruar në OpenStreetMap."
 
@@ -4698,8 +4781,8 @@ msgstr "Përdoruesi nuk arriti ta lokalozojë problemin në hartë, por mund të
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4734,7 +4817,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4752,12 +4835,12 @@ msgstr "Pati një problem për të shfaqur këtë faqe. Ju lutemi provoni më vo
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Pati problem me përditësimin tuaj. Ju lutemi provoni përsëri."
 
@@ -4765,7 +4848,7 @@ msgstr "Pati problem me përditësimin tuaj. Ju lutemi provoni përsëri."
 msgid "There were problems with your report. Please see below."
 msgstr "Pati një problem me raportin tuaj. Ju lutemi lexoni mëposhtë."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Pati një problem me përditësimin tuaj. Ju lutemi lexoni mëposhtë."
 
@@ -4851,10 +4934,10 @@ msgstr "Ky email i është dërguar dy zyrave që e mbulojnë lokacionin, meqë
 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 "Ky problem u është dërguar disa zyrave që mbulojnë vendndodhjen e tij, meqenëse kategoria e zgjedhur figuron te të gjitha këto zyra; ju lutemi injorojeni nëse nuk jeni zyra kompetente për t'u marrë me këtë çështje."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Ky informacion është i domosdoshëm"
 
@@ -4871,19 +4954,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Ky problem është rregulluar"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Ky problem nuk është rregulluar"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4896,26 +4983,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Ky raport pret moderim."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Ky raport është markuar i mbyllur."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Ky raport është markuar i rregulluar."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Ky problem është markuar i hapur."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4923,15 +5010,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Kjo faqe përmban edhe foto të problemit, ngarkuar nga përdoruesi."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Koha e shpenzuar (në minuta):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4955,6 +5045,10 @@ msgstr "Titulli"
 msgid "Title:"
 msgstr "Titulli:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "Për të parë se çfarë raportesh lokale kemi për ju, ju lutemi shenoni kodin postar %s apo emrin e rrugës dhe lagjes:"
@@ -4980,7 +5074,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "Për të parë hartën e saktë të lokacionit të këtij problemi"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -5005,11 +5099,6 @@ msgstr ""
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr "Duhet menagjim i trafikut?"
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -5032,16 +5121,16 @@ msgstr "Provoni të na shkruani email direkt:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5051,7 +5140,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5081,10 +5170,10 @@ msgstr "Gabim i panjohur"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "ID e panjohur e gabimit"
 
@@ -5096,13 +5185,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Përditësim"
 
@@ -5153,29 +5242,27 @@ msgstr "Përditësimi ka rihapur problemin"
 msgid "Update statuses"
 msgstr "Statuset e përditësimit"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Përditësuar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Përditësuar!"
 
@@ -5186,7 +5273,7 @@ msgstr "Përditësuar!"
 msgid "Updates"
 msgstr "Përditësimet"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Përditësimet janë të limituara në gjatësi prej %s shenjash. Ju lutemi shkurtojeni përditësimin "
 
@@ -5216,6 +5303,14 @@ msgstr "Shfrytëzojeni ekstenzionin dërgimi-i-përditësimit në Open311"
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr "ID e përdoruesit për t'i atribuuar komentet te"
@@ -5229,8 +5324,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5248,7 +5343,7 @@ msgid "User flagged"
 msgstr "Përdorues i markuar"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5261,27 +5356,25 @@ msgstr "Kërkimi i përdoruesit kërkon në emër dhe në adresë emaili."
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Përdoruesit"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr "Përdoruesit mund të kryejnë veprimet vijuese brenda zonës së caktuar të zyres."
 
@@ -5290,9 +5383,9 @@ msgstr "Përdoruesit mund të kryejnë veprimet vijuese brenda zonës së caktua
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr "Përdoruesit mund të kryejnë veprimet vijuese brenda zonës së caktuar të zyres."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Vlerat e përditësuara"
 
@@ -5318,7 +5411,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Shih raportet në faqe"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Shih raportet sipas lagjes"
 
@@ -5326,7 +5419,7 @@ msgstr "Shih raportet sipas lagjes"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5344,7 +5437,7 @@ msgstr "Pamja e problemit"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Lagjet në kuadër të zyres"
 
@@ -5414,7 +5507,7 @@ msgstr "Kur u dërgua"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5434,7 +5527,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "A dëshironi të kontribuoni në FixMyStreet? Kodi jonë është i hapur dhe i <a href=\"https://fixmystreet.org\">qasshëm në fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "A dëshironi të merrni pyetësorin tjetër pas 4 javësh, për t'ju kujtuar ta verifikoni statusin?"
 
@@ -5446,7 +5539,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Nëse e shkruani mesazhin të tërin me germa të mëdha, e bëni atë vështirë të lexueshëm, njësoj si pa shenja pikësimi."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5457,12 +5549,12 @@ msgstr "Nëse e shkruani mesazhin të tërin me germa të mëdha, e bëni atë v
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Po"
 
@@ -5475,7 +5567,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5488,7 +5580,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Po raportoni se përditësimi në fjalë është abuziv, përmban informata personale, apo diçka ngjashëm:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5497,7 +5589,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Ju mund <a href=\"%s%s\">të shihni problemin në këtë faqe</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Mund ta shtoni emailin e përdoruesit abuziv te lista e abuzimeve, gjë që raportimet e krijuara nga ky email i fsheh automatikisht dhe nuk i dërgon asnjëherë."
 
@@ -5530,7 +5622,7 @@ msgstr "Mund të na ndihmoni duke gjetur kontaktin adekuat për problemet e %s d
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Mund ta markoni një zyre si të fshirë nëse nuk doni që të jetë aktive në faqe."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5540,7 +5632,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Keni mohuar; ju lutemi plotësoni fushën mëlartë"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5548,7 +5640,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Ju tashmë i jeni përgjigjur pyetësorit. Nëse keni pyetje, ju lutemi <a href='%s'>na kontaktoni</a>, apo <a href='%s'>shikoni problemin</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 #, fuzzy
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Tashmë keni ngarkuar foto për këtë problem. Vini re ju mund të ngarkoni më së shumti 3 foto në këtë raport (nëse tentoni të ngarkoni më shumë, fotoja më e vjetër do të fshihet)."
@@ -5558,8 +5650,7 @@ msgstr "Tashmë keni ngarkuar foto për këtë problem. Vini re ju mund të ngar
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Tashmë keni ngarkuar foto për këtë problem. Vini re ju mund të ngarkoni më së shumti 3 foto në këtë raport (nëse tentoni të ngarkoni më shumë, fotoja më e vjetër do të fshihet)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr "Ju tashmë keni ngarkuar foto në këtë përditësim. Vini re ju mund të ngarkoni më së shumti 3 foto në këtë përditësim (nëse tentoni të ngarkoni më shumë, fotoja më e vjetër do të fshihet)."
 
@@ -5626,9 +5717,9 @@ msgstr "Raportet tuaja"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Llogaria juaj"
@@ -5637,13 +5728,14 @@ msgstr "Llogaria juaj"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5672,16 +5764,16 @@ msgstr "Emri juaj"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5702,8 +5794,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr "Kyçu me email në vend se të shkruani fjalëkalim të ri. Kur klikoni në vegzën në email, fjalëkalimi do të përditësohet."
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5736,7 +5828,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5767,19 +5859,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "të gjitha"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5787,8 +5879,8 @@ msgstr ""
 msgid "by %s"
 msgstr "nga %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "kuvendi"
 
@@ -5819,6 +5911,10 @@ msgstr "redakto përdoruesin"
 msgid "from %s different users"
 msgstr "nga %s përdorues të ndryshëm"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5836,7 +5932,7 @@ msgstr "n/a"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr "asnjë"
 
@@ -5919,12 +6015,12 @@ msgid "today"
 msgstr "sot"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5949,7 +6045,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "lagje"
 
@@ -6009,7 +6105,7 @@ msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6030,7 +6126,7 @@ msgid_plural "%s problems reported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6051,21 +6147,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> e rregulluar në muajin e kaluar"
 msgstr[1] "<big>%s</big> të rregulluar në muajin e kaluar"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> raport në javën e fundit"
 msgstr[1] "<big>%s</big> raporte në javën e fundit"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> raporti i fundit"
 msgstr[1] "<big>%s</big> raportet e fundit"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6100,29 +6196,41 @@ msgid_plural "last updated %d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Mbyllur nga zyra"
+
+#~ msgid "Filter report list"
+#~ msgstr "Filtro listën e raporteve"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Vlerë jovalide për agency_responsible %s"
+
+#~ msgid "Post"
+#~ msgstr "Posto"
+
+#~ msgid "Traffic management required?"
+#~ msgstr "Duhet menagjim i trafikut?"
+
 #~ msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 #~ msgstr "<strong>Vërejtje:</strong> Ky raport është përcjellë për veprim. Ndryshimet e mëpasme nuk do të përcjellen."
 
 #~ msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 #~ msgstr "<strong>Vërejtje:</strong> Ky raport nuk është përcjellë akoma për veprim. Ndryshimet mund të mos përcjellen më tutje."
 
-#~ msgid "Available categories"
-#~ msgstr "Kategoritë ekzistuese"
-
 #~ msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent."
 #~ msgstr "Çeko <strong>kërkohet inspektimi</strong> nëse raportimet në këtë kategori <strong>duhet të inspektohen</strong> para se të dërgohen."
 
diff --git a/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po
index 07fa25ed3..45b8c64c1 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-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Serbian (https://www.transifex.com/mysociety/teams/12067/sr/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "i"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s – Kratki izveštaji"
 
@@ -117,7 +117,7 @@ msgstr "%s upitnici poslati &ndash; %s odgovoreni (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 "&copy; <a href=\"http://www.openstreetmap.org/copyright\">\n"
@@ -165,6 +165,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(nije poslato skupštini)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -183,8 +185,8 @@ msgstr "(poslato oboma)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Izaberi kategoriju --"
@@ -211,17 +213,18 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -251,7 +254,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Da</strong> Imam lozinku"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -268,7 +271,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -291,7 +294,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:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Dodaj novu kategoriju"
@@ -324,7 +327,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Dodaj novu kategoriju"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -333,8 +336,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -342,21 +345,20 @@ msgid "Add to shortlist"
 msgstr "Dodaj u uži krug"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Dodaj korisnika"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Dodaj/izmeni problemske kategorije"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Dodaj/izmeni prioritete odgovora"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Dodaj/izmeni šablone odgovora"
 
@@ -372,6 +374,12 @@ msgstr "Dodavanjem ove prijave u vaš uži krug uklonićete ga iz užeg kruga %s
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Još jednom:"
@@ -384,8 +392,8 @@ msgstr "Obaveštenje %d stvoreno zar %s, tip %s, parametri %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Obaveštenje %d deaktivirano (kreirano %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Upozori me na buduće ažurirane informacije"
 
@@ -397,10 +405,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Sve prijave"
@@ -440,6 +450,11 @@ msgstr "Sve prijave između %s i %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Prijavljeno u kategoriji %s "
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -476,7 +491,7 @@ msgstr "Anoniman"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -489,7 +504,7 @@ msgid "Another user"
 msgstr "Drugi korisnik"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Da li si siguran da želiš da otkažeš ovo otpremanje?"
 
@@ -498,8 +513,8 @@ msgstr "Da li si siguran da želiš da otkažeš ovo otpremanje?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Da li si siguran?"
@@ -510,7 +525,7 @@ msgstr "Da li si siguran?"
 msgid "Area covered"
 msgstr "Pokriveno područje"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Područje:"
 
@@ -524,27 +539,32 @@ msgstr "Pošto je ovo probna strana i %s pošto je lažna, prijave načinjene na
 msgid "Assign selected to role:"
 msgstr "Dodeljeno %s"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Dodeli nadležnoj direkciji:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Dodeli različitim kategorijama:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Dodeli spoljnoj direkciji:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Dodeli korisnicima po područjima:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "Dodeljeno %s"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Dostupne kategorije"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Dodeljeno %s"
@@ -557,7 +577,7 @@ msgstr "U većini slučajeva %d za svako pitanje se vraćaju zahtevi. Vraćeni z
 msgid "At the moment only searching for and looking at reports work."
 msgstr "U ovom trenutku funkcioniše samo pretraga i pregled prijava."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr "Ovlašćeni članovi osoblja mogu se povezivati sa kategorijama na kojima rade."
 
@@ -565,11 +585,11 @@ msgstr "Ovlašćeni članovi osoblja mogu se povezivati sa kategorijama na kojim
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Automatski odgovor:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -581,12 +601,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Izbegavajte lične informacije i registarske tablice vozila "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Čekajući moderaciju"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Nazad"
@@ -607,14 +628,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Direkcije"
 
@@ -627,11 +646,13 @@ msgstr "Direkcije"
 msgid "Body"
 msgstr "Direkcija"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Direkcija"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -643,8 +664,7 @@ msgstr "Can&rsquo;t Ne možete da nađete naš e-mejl? Proverite vaš spam folde
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Ne vidite mapu? <em>Preskočite ovaj korak</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -660,15 +680,13 @@ msgstr "Kategorija"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -678,7 +696,7 @@ msgstr "Kategorija je promenjena sa  ‘%s’ na ‘%s’"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Norma rešavanja problema stari > od 4 nedelje "
 
@@ -701,6 +719,11 @@ msgstr "Kategorija:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Promeni lozinku"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -717,7 +740,7 @@ msgstr "Promeni lozinku"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -729,12 +752,12 @@ msgstr ""
 "Odaberi <strong>category</strong> naziv koji ima smisla za javnost (npr. \"rupa\", \"javna rasveta\") koji istovremeno pomaže\n"
 "i ovoj direkciji. Isti će se pojavljivati u opadajućem meniju na strani Prijavi problem."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -771,8 +794,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -782,11 +805,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Zatvoren"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Zaključila skupština"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -819,13 +838,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Konfiguracija"
@@ -942,7 +960,7 @@ msgstr "Kreiraj izveštaj"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Kreiraj kategoriju"
@@ -952,27 +970,25 @@ msgstr "Kreiraj kategoriju"
 msgid "Create priority"
 msgstr "Kreiraj prioritet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "Kreiraj izveštaje/ažurirane informacije za skupštinu opštine"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "Kreiraj izveštaje/najnovije informacije u ime korisnika"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Kreiraj šablon"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Kreiran"
@@ -981,6 +997,17 @@ msgstr "Kreiran"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Kreiran"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Kreiran"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -992,10 +1019,6 @@ msgstr "Kreiran:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -1005,19 +1028,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "Trenutno nije kreirano nikakvo telo."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Klijent nedostupan"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Panel"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1029,7 +1054,7 @@ msgstr "Rešiti na nivou pod-odseka u roku od 5 radnih dana"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1039,7 +1064,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Izbriši šablon"
@@ -1061,9 +1086,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Opis"
 
@@ -1072,7 +1095,7 @@ msgstr "Opis"
 msgid "Destination"
 msgstr "Opis"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1108,7 +1131,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1116,6 +1139,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Prijavljeno u kategoriji %s "
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Prijavljeno u kategoriji %s "
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1150,25 +1183,25 @@ msgstr "Ne&rsquo;t znam"
 msgid "Don't like forms?"
 msgstr "Ne dopada vam se oblik?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Prevuci i spusti fotografije ovde ili <u>klikni da učitaš</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1183,7 +1216,7 @@ msgstr ""
 "Različite kategorije <strong>mogu imati isti kontakt</strong> (emejl adresa).\n"
 "To znači da možete dodati mnoge kategorije čak i ukoliko imate samo jedan kontakt datog tela."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr "Kretanje ka istoku/severu:"
@@ -1195,7 +1228,7 @@ msgstr "Kretanje ka istoku/severu:"
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Izmeni"
@@ -1206,12 +1239,11 @@ msgstr "Izmeni"
 msgid "Edit body details"
 msgstr "Izmeni podatke o opštini"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "Izmeni ovlašćenja drugih korisnika"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Izmeni kategoriju prijave"
 
@@ -1219,17 +1251,15 @@ msgstr "Izmeni kategoriju prijave"
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Izmeni prioritet prijave"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Izmeni prijave"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1266,8 +1296,9 @@ msgstr "Urednik"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1276,15 +1307,14 @@ msgstr "Urednik"
 msgid "Email"
 msgstr "Emejl"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Emejl adresa"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1304,12 +1334,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Emejl:\t"
@@ -1372,12 +1403,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Završna tačka"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Unesi Z&uuml;rich naziv ulice"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Unesi naziv obližnje ulice ili oblasti"
 
@@ -1404,10 +1435,10 @@ msgstr "Opiši problem"
 msgid "Error"
 msgstr "Greška"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Sve"
 
@@ -1420,7 +1451,7 @@ msgstr "Primer poštanskog broja %s"
 msgid "Examples:"
 msgstr "Primeri"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Postojeća kategorija"
 
@@ -1429,7 +1460,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1454,7 +1485,7 @@ msgid "External body"
 msgstr "Spoljno telo"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1466,20 +1497,20 @@ msgstr ""
 msgid "External team"
 msgstr "Spoljni tim"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Dodatni podaci:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1512,20 +1543,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filtriraj listu prijava"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Prvi put"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Fotografije nedavnih obližnjih prijava"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nove prijave"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Uredite ovo izborom <strong>pokrivene oblasti</strong> u <em>izmeni podatke o opštini </em> na obrascu ispod."
@@ -1555,7 +1591,7 @@ msgstr "Obeleži kao izbrisano"
 msgid "Flag user"
 msgstr "Obeleži korisnika "
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Obeleženo"
@@ -1564,7 +1600,7 @@ msgstr "Obeleženo"
 msgid "Flagged reports and users"
 msgstr "Obeležene prijave i korisnici"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Obeleženi korisnici navedeni na <a href='%s'>strani</a> ."
 
@@ -1572,8 +1608,8 @@ msgstr "Obeleženi korisnici navedeni na <a href='%s'>strani</a> ."
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Obeleženi korisnici nisu ograničeni ni na koji način. Ovo je samo lista korisnika koji su označeni za dalju pažnju."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Obeleženo"
 
@@ -1599,11 +1635,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Zaboravili ste lozinku?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Upućeno spoljnom telu"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Često postavljana pitanja"
 
@@ -1613,12 +1649,20 @@ msgstr "Često postavljana pitanja"
 msgid "Frequently Asked Questions"
 msgstr "Preuzmite najnovije informacije"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1640,7 +1684,7 @@ msgstr "Preuzmite najnovije informacije o %s problemima"
 msgid "Get updates of problems in this %s"
 msgstr "Dobijajte najnovije informacije o problemima u ovom %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Dajte mi RSS vesti"
 
@@ -1656,15 +1700,15 @@ msgstr "Drago mi je što čujem da je sređeno!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1674,7 +1718,7 @@ msgstr "Nastavi"
 msgid "Going to send questionnaire?"
 msgstr "Šaljete upitnik?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr "Dozvolite pristup administratoru"
 
@@ -1700,6 +1744,7 @@ msgstr "Da li ste ikada problem prijavili savetu ili je ovo prvi put?"
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1734,7 +1779,8 @@ msgstr "Sakriveno"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1762,7 +1808,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Sakrij oznaku"
 
@@ -1816,11 +1862,9 @@ msgstr "I'm afraid we couldn't locate your problem in the database.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1841,15 +1885,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1865,7 +1909,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1889,7 +1933,7 @@ msgstr "v"
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "Ukoliko ovde podnesete problem, problem neće <strong></strong> biti prijavljen skupštini."
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1926,7 +1970,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1950,6 +1994,16 @@ msgstr "U tabeli zloupotreba?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+msgid "In wards"
+msgstr ""
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1959,20 +2013,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr "Inbox nula, stižemo!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Uključi lične podatke podnosioca prijave"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Netačno_photo value \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "Naložite ugovaračima da reše probleme"
 
@@ -1989,16 +2043,12 @@ msgstr "Interna zabeleška"
 msgid "Internal notes"
 msgstr "Interna zabeleška"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Pogrešna agencija_odgovorna value %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Nevažeći format %s naveden."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Nevažeća lokacija. Novu lokaciju mora pokrivati ista skupština."
 
@@ -2050,13 +2100,13 @@ msgstr "Poslednje ažuriranje:"
 msgid "Last&nbsp;update:"
 msgstr "Poslednje&nbsp;ažuriranje:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Nedavno ažuriran"
@@ -2073,7 +2123,7 @@ msgstr "Navedi sve prijavljene probleme"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Loading..."
@@ -2111,17 +2161,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2139,19 +2190,20 @@ msgstr ""
 msgid "MAP"
 msgstr "MAPA"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr "Upravljaj užim krugom"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2165,24 +2217,24 @@ msgstr "Mapa"
 msgid "Mark as sent"
 msgstr "Označi kao poslat"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Označi kao uređen/zaključen u poslednjih osam nedelja"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Poruka"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Poruka nadležnoj direkciji:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Poruka spoljnom telu:"
 
@@ -2195,7 +2247,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr "Direkcije koje nedostaju:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Jurisdikcija koja nedostaje_id"
 
@@ -2203,8 +2255,7 @@ msgstr "Jurisdikcija koja nedostaje_id"
 msgid "Moderate"
 msgstr "Uredi"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Uredi pojedinosti o prijavi"
 
@@ -2227,7 +2278,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "Uređuje odsek u jednom radnom danu "
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2237,14 +2288,14 @@ msgstr ""
 msgid "Month"
 msgstr "Mesec"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Najčešće komentarisani"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2272,9 +2323,10 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Ime: %s"
@@ -2292,7 +2344,7 @@ msgstr "Upravljaj ovim problemom"
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Najbliži imenovani put oznaci na mapi (automatski generisan korišćenjem OpenStreetMap): %s%s"
 
@@ -2300,12 +2352,12 @@ msgstr "Najbliži imenovani put oznaci na mapi (automatski generisan korišćenj
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Najbliži poštanski broj oznaci na mapi (automatski generisan): %s (%sm away)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Najbliži put oznaci na mapi (automatski generisan korišćenjem Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2328,7 +2380,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Dodata nova direkcija"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Dodata nova kontakt kategorija"
 
@@ -2341,8 +2393,8 @@ msgstr "Nova e-mejl adresa:"
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Nova interna beleška:"
 
@@ -2350,13 +2402,13 @@ msgstr "Nova interna beleška:"
 msgid "New local problems on FixMyStreet"
 msgstr "Novi lokalni problemi na Sredimojuulicu"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Nova beleška za DM:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Nova lozinka:"
 
@@ -2433,7 +2485,7 @@ msgstr "Novi šablon"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Najnovije"
@@ -2446,7 +2498,6 @@ msgstr "Sledeće"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2455,11 +2506,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Ne"
 
@@ -2471,11 +2522,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Nema direkcije"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Nije odabrana skupština"
 
@@ -2491,8 +2543,8 @@ msgstr "No flagged problems found."
 msgid "No flagged users found."
 msgstr "No flagged users found."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "No further updates"
 
@@ -2530,8 +2582,8 @@ msgstr "Nema pristalica"
 msgid "None"
 msgstr "Nijedan"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
@@ -2539,8 +2591,8 @@ msgstr ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2552,10 +2604,14 @@ msgstr ""
 "                Depending on the implementation, staff users may have access to the dashboard (summary of\n"
 "                activity across their body), the ability to hide reports or set special report statuses."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Nije za moj pod-odsek"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Nije prijavljen ranije"
@@ -2603,12 +2659,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2616,12 +2672,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Staro stanje"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Najstariji"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2630,7 +2686,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2661,7 +2717,7 @@ msgstr ""
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2673,7 +2729,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2681,16 +2737,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2722,7 +2778,7 @@ msgstr "Strana nije nađena"
 msgid "Parent"
 msgstr "Izvor"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Sve kategorije"
@@ -2731,13 +2787,13 @@ msgstr "Sve kategorije"
 msgid "Partial"
 msgstr "Delimično"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Lozinka (opcionalno)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
 msgstr ""
 
@@ -2751,7 +2807,7 @@ msgstr "Lozinka (opcionalno)"
 msgid "Permissions"
 msgstr "Dozvole:"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Dozvole:"
 
@@ -2759,19 +2815,24 @@ msgstr "Dozvole:"
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Tel:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Broj telefona"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Broj telefona (opcionalno)"
 
@@ -2779,30 +2840,26 @@ msgstr "Broj telefona (opcionalno)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Tel:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2822,9 +2879,8 @@ msgstr "Fotografija potrebna"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Fotografije"
@@ -2833,7 +2889,7 @@ msgstr "Fotografije"
 msgid "Photos of recent nearby reports"
 msgstr "Fotografije nedavnih obližnjih prijava"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2847,6 +2903,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Stavi oznaku na mapi"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2874,27 +2935,26 @@ msgid "Please check your email address is correct"
 msgstr "Molimo vas proverite da li je vaša e-mejl adresa tačna "
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Molimo vas izaberite kategoriju"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2913,27 +2973,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Molimo vas unesite poruku"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Molimo vas unesite ime"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "Molimo vas unesite naziv ovog tela"
 
@@ -2946,16 +3006,16 @@ msgstr "Molimo vas unesite lozinku"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Molimo vas unesite predmet"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2966,20 +3026,20 @@ msgstr "Molimo vas unesite važeći e-mejl"
 msgid "Please enter a valid email address"
 msgstr "Molimo vas unesite važeću e-mejl adresu"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Molimo vas unesite neke podatke"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2995,7 +3055,7 @@ msgid "Please enter your first name"
 msgstr "Molimo vas unesite vaše ime"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "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 "
@@ -3007,9 +3067,9 @@ msgstr "Molimo vas unesite vaše ime"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Molimo vas unesite vaše ime"
@@ -3050,19 +3110,19 @@ msgstr "Molimo vas popunite obrazac ispod sa pojedinostima problema i opišite l
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Molimo vas navedite da li biste hteli da dobijete još jedan upitnik "
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Molimo vas unesite važeću e-mejl adresu"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3089,24 +3149,28 @@ msgstr "Molimo vas imajte u vidu da vaša prijava  <strong>još uvek nije poslat
 msgid "Please note:"
 msgstr "Molimo vas imajte u vidu:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr "Molimo vas pružite javne informacije o ovoj prijavi."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Molimo vas pružite objašnjenje zašto ponovo otvarate ovu prijavu "
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Molimo vas navedite neki tekst kao i fotografiju"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Molimo vas recite da li ste ikada ranije prijavili problem vašoj skupštini "
 
@@ -3114,7 +3178,7 @@ msgstr "Molimo vas recite da li ste ikada ranije prijavili problem vašoj skupš
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Molimo vas odaberite direkciju."
 
@@ -3126,7 +3190,7 @@ msgstr "Molimo vas izaberite vest koju želite"
 msgid "Please select the type of alert you want"
 msgstr "Molimo vas iznesite da li je problem rešen ili ne "
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Molimo vas iznesite da li je problem rešen ili ne "
 
@@ -3134,12 +3198,12 @@ msgstr "Molimo vas iznesite da li je problem rešen ili ne "
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Molimo vas postavite samo sliku"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3147,27 +3211,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Molimo vas napišite poruku"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Postavi"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Postavljeno anonimno u %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Postavio %s na %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Postavio <strong>%s</strong> (%s) na %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Postavio <strong>%s</strong> na %s"
 
@@ -3183,7 +3243,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3191,11 +3251,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Prethodni"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Prioriteti"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Prioritet"
@@ -3211,9 +3271,9 @@ msgid "Privacy and cookies"
 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/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privatan"
 
@@ -3263,7 +3323,7 @@ msgstr "Problem %s poslat skupštini %s"
 msgid "Problem breakdown by state"
 msgstr "Pregled problema po stanju"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problem označen kao otvoren."
 
@@ -3271,8 +3331,7 @@ msgstr "Problem označen kao otvoren."
 msgid "Problem state change based on survey results"
 msgstr "Promena stanja predmeta na osnovu rezultata ankete "
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemi"
@@ -3297,18 +3356,18 @@ msgstr "Nedavno prijavljeni problemi sređeni na Sredimojuulicu"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problemi u okviru %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problemi u okviru %s naselja"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3316,7 +3375,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Problemi u okviru %s, %s"
 
@@ -3324,11 +3383,15 @@ msgstr "Problemi u okviru %s, %s"
 msgid "Property address:"
 msgstr "Adresa imovine:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3342,11 +3405,11 @@ msgstr "Pruži najnovije informacije"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Pružanje lozinke je opcionalno, ali će vam omogućiti da lakše prijavite probleme, da ostavite najnovije informacije i upravljate vašim prijavama."
 
@@ -3354,12 +3417,12 @@ msgstr "Pružanje lozinke je opcionalno, ali će vam omogućiti da lakše prijav
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Javni odgovor:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Javne informacije:"
 
@@ -3402,11 +3465,11 @@ msgstr "Upitnik popunio podnosilac problema "
 msgid "RSS feed"
 msgstr "RSS vesti"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS vesti %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS vesti za %s naselje, %s"
 
@@ -3414,11 +3477,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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS vesti %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS vesti %s, u okviru %s naselja"
 
@@ -3426,13 +3489,13 @@ msgstr "RSS vesti %s, u okviru %s naselja"
 msgid "RSS feed of nearby problems"
 msgstr "RSS vesti o obližnjim problemima"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS vesti %s, u okviru %s "
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS vesti %s, u okviru %s naselja"
 
@@ -3446,11 +3509,11 @@ msgstr "RSS vesti o nedavnim lokalnim potrebama"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS vesti o najnovijim informacijama o ovom problemu"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3463,7 +3526,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Primi e-mejl kada su navedene najnovije informacije o ovom problemu."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr "Primio %s par trenutaka kasnije"
 
@@ -3477,7 +3540,7 @@ msgstr "Nedavni lokalni problemi, %s"
 msgid "Recently reported problems"
 msgstr "Nedavno prijavljeno problema"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Nedavno ažurirano"
@@ -3490,7 +3553,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Zapamti da je Sredimojuulicu prvenstveno namenjeno za prijavljivanje fizičkih problema koji se mogu srediti. Ukoliko vaš problem nije odgovarajući da bude podnet preko ove stranice zapamti da možeš da kontaktiraš skupštinu direktno korišćenjem njihove internet stranice."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3502,8 +3566,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Ukloni oznaku"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3519,17 +3583,22 @@ msgstr "Ukloni sa internet stranice"
 msgid "Remove option"
 msgstr "Ukloni sa internet stranice"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Ukloni sliku (ne može se vratiti korak unazad!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Izmeni ovlašćenja drugih korisnika"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Odgovori korisniku:"
 
@@ -3537,14 +3606,14 @@ msgstr "Odgovori korisniku:"
 msgid "Report"
 msgstr "Prijavi"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "ID prijave:"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3553,7 +3622,7 @@ msgid "Report a problem"
 msgstr "Prijavi problem"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3569,7 +3638,7 @@ msgid "Report anonymously"
 msgstr "Prijavljeni anonimno u %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3605,7 +3674,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Prijavi, pregledaj ili diskutuj o lokalnim problemima"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Prijavljeni anonimno u %s"
@@ -3616,7 +3685,7 @@ msgstr "Prijavljeni anonimno u %s"
 msgid "Reported before"
 msgstr "Prijavljeni ranije"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Prijavio %s u %s"
@@ -3630,27 +3699,27 @@ msgstr "Prijavio:"
 msgid "Reported in the %s category"
 msgstr "Prijavljeno u kategoriji %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Prijavljeno u kategoriji %s anonimno u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Prijavljeno u kategoriji %s  %s u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Prijavljeno putem %s anonimno u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Prijavljeno putem %s od strane %s u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Prijavljeno putem %s u kategoriji %s anonimno u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Prijavljeno putem %s u kategoriji %s od strane %s u %s"
 
@@ -3669,17 +3738,15 @@ msgstr "Prijavio:"
 msgid "Reporting a problem"
 msgstr "Prijavljivanje problema"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Prijave"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3707,15 +3774,15 @@ msgid "Reports published"
 msgstr "Objavljene prijave"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3728,7 +3795,7 @@ msgstr "Prijave koje čekaju da budu poslate"
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3781,39 +3848,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "Pravo mesto?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Drumski operater za naziv ove ulice (proizilazi iz referentnog broja i vrste): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Drumski operater za naziv ove ulice (iz OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Okreni levo"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3829,20 +3902,20 @@ msgstr "Okretanjem ove slike odbacuju se nesačuvane promene u izveštaju."
 msgid "Satellite"
 msgstr "Satelitski"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3859,13 +3932,12 @@ msgid "Save with a public update"
 msgstr "Sačuvaj javnim ažuriranjem"
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Pretraži prijave"
 
@@ -3878,7 +3950,7 @@ msgstr "Pretraži korisnike"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Pretraži prijave"
 
@@ -3893,12 +3965,12 @@ msgstr "Pretraga:"
 msgid "Searching found no reports."
 msgstr "Pretraga bez rezultata."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Pretragom nađeno nula korisnika."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3908,8 +3980,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr "Vidi našu politiku privatnosti"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3919,7 +3990,7 @@ msgid "Select a body"
 msgstr "Odaberi telo"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Izaberi oblast"
@@ -3940,7 +4011,7 @@ msgstr ""
 msgid "Select:"
 msgstr "Odaberi:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3953,7 +4024,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3962,11 +4033,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "Pošalji prijavu nazad"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Poslato %s %s kasnije"
 
@@ -4004,7 +4075,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr "Uži krug"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4015,7 +4086,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr "Ubačen u uži krug"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr "Ubacio u uži krug %s"
@@ -4040,8 +4111,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4052,7 +4123,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Prikaži oznake"
 
@@ -4114,7 +4185,7 @@ msgid "Some photos of recent reports"
 msgstr "Neke fotografije nedavnih prijava"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Tekst koji treba pronaći"
 
@@ -4123,12 +4194,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Izvinite, ovo je Crown poštanski broj koji ne pokrivamo."
 
@@ -4146,9 +4216,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 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/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Izvinite, nismo mogli da nađemo datu lokaciju."
 
@@ -4158,13 +4228,13 @@ msgstr "Izvinite, nismo mogli da nađemo datu lokaciju."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr "Izvinite, nismo uspeli da vas upišemo u sistem. Molimo vas popunite obrazac ispod."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Izvinite, nismo mogli da shvatimo datu lokaciju. Molimo vas pokušajte ponovo."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4179,11 +4249,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr "Izvinite, nemate dozvolu da to učinite."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Sortiraj po"
@@ -4193,11 +4263,11 @@ msgstr "Sortiraj po"
 msgid "Staff only"
 msgstr "Osoblje:"
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr "Korisnici iz reda osoblja imaju dozvolu da se upišu u admin."
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr "Osoblje:"
 
@@ -4221,18 +4291,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Država"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4241,31 +4311,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Statistike"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Status"
 
@@ -4283,7 +4350,7 @@ msgstr "Izgled ulice"
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Odsek/direkcija"
 
@@ -4302,50 +4369,48 @@ msgstr "Predmet"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Podnesi"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Podnesi promene"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Podnesi upitnik"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Podneo"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Pretplati se"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4358,7 +4423,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Prijave su ograničene na %s karaktera u dužini. Molimo vas skratite vašu prijavu"
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4372,20 +4437,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr "Rezimiraj problem"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Rezimiraj vaše promene"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Rezime"
 
@@ -4396,14 +4460,20 @@ msgstr "Kratki izveštaji"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Superuser"
+msgstr "Superkorisnik:"
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr "Superkorisnik:"
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "Superkorisnici imaju dozvolu da obave <strong>sve radnje</strong> u sklopu admin."
 
@@ -4421,13 +4491,18 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr "Šablon &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Šabloni"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Nedavno ažuriran"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Tekst"
@@ -4448,6 +4523,11 @@ msgstr "Samo tekstualna verzija"
 msgid "Text:"
 msgstr "Hvala što ste prijavili ovo pitanje!"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Tekst"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Hvala vam što ste pokušali da potvrdite vaše najnovije informacije ili problem. Po svemu sudeći sami imamo greške, tako da <a href=\"%s\">vas molimo da nam kažete šta se dešavalo </a> i pogledaćemo to."
@@ -4477,7 +4557,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Hvala vam, drago nam je da čujemo da je sređeno! Da li samo možemo da vas upitamo da li ste ikada ovaj problem prijavili skupštini i ranije?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4489,27 +4569,29 @@ msgstr "Slika nije učitana ispravno (%s), molimo vas pokušajte ponovo."
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Skupština ne pokriva datu lokaciju; možda je na moru ili van zemlje. Molimo vas pokušajte ponovo."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Po svemu sudeći data lokacija nije na Kosovu; molimo vas pokušajte ponovo."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Dati poštanski broj nije prepoznat, izvinite."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Dati problem obeležen je kao poslat."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Dati problem će sada biti ponovo poslat."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Data prijava uklonjena je sa  Sredimojuulicu."
 
@@ -4557,8 +4639,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4617,7 +4699,7 @@ msgstr "Greška je: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "Sledeće informacije o najbližoj ulici možda su netačne ili irelevantne, ukoliko je problem u blizini nekoliko ulica ili u blizini ulice čiji naziv nije registrovan u OpenStreetMap."
 
@@ -4679,8 +4761,8 @@ msgstr "Korisnik nije mogao da pronađe problem na mapi, već samo da vidi oblas
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4715,7 +4797,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4733,12 +4815,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:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Bilo je problema sa vašim ažuriranjem. Molimo vas pokušajte ponovo."
 
@@ -4746,7 +4828,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:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Ima problema sa vašom prijavom. Molimo vas vidite ispod."
 
@@ -4831,10 +4913,10 @@ msgstr "Ovaj e-mejl poslat je obema direkcijama koje pokrivaju lokaciju problema
 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:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Ova informacija je tražena"
 
@@ -4851,19 +4933,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Ovaj problem je sređen"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Ovaj problem nije sređen"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4876,26 +4962,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Ova prijava čeka na moderatora."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Ova prijava trenutno je označena kao zatvorena."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Ova prijava je trenutno označena kao sređena."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Ova prijava trenutno je obeležena kao otvorena."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4903,15 +4989,18 @@ msgstr ""
 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."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Potrošeno vreme (u minutima):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4935,6 +5024,10 @@ msgstr "Naslov"
 msgid "Title:"
 msgstr "Da saznate kakva lokalna obaveštenja imamo za vas, molimo vas unesite vaš %s poštanski broj ili ime ulice i oblast:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "Da saznate kakva lokalna obaveštenja imamo za vas, molimo vas unesite vaš poštanski broj ili ime ulice i oblast "
@@ -4960,7 +5053,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "Da pogledate mapu sa preciznom lokacijom ovog pitanja"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4985,11 +5078,6 @@ msgstr ""
 msgid "Total"
 msgstr "Ukupno"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr "Potrebno upravljanje saobraćajem?"
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -5012,16 +5100,16 @@ msgstr "Pokušajte da nam direktno pošaljete e-mejl:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5031,7 +5119,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5061,10 +5149,10 @@ msgstr "Nepoznata greška"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr ""
 
@@ -5076,13 +5164,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Ažuriranje"
 
@@ -5133,29 +5221,27 @@ msgstr "Ažuriranjem ponovo otvoren problem"
 msgid "Update statuses"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Ažuriran"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Ažuriran!"
 
@@ -5166,7 +5252,7 @@ msgstr "Ažuriran!"
 msgid "Updates"
 msgstr "Ažurirane informacije"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -5196,6 +5282,14 @@ msgstr "Upotrebi Open311 kao liniju za slanje ažuriranih informacija"
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5209,8 +5303,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5228,7 +5322,7 @@ msgid "User flagged"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5241,27 +5335,25 @@ msgstr "Pretraga korisnika poklapa se sa kriterijumima u imenima i e-mejl adresa
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Korisnici"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr "Korisnici mogu obaviti sledeće radnje u sklopu njima dodeljene direkcije ili oblasti."
 
@@ -5270,9 +5362,9 @@ msgstr "Korisnici mogu obaviti sledeće radnje u sklopu njima dodeljene direkcij
 msgid "Users with this role can perform the following actions within their assigned body or area."
 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:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Ažurirane vrednosti"
 
@@ -5298,7 +5390,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Vidi prijave na stranici"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Vidi prijave po naselju"
 
@@ -5306,7 +5398,7 @@ msgstr "Vidi prijave po naselju"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5324,7 +5416,7 @@ msgstr "Pregled problema"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Pronašli smo više od jednog poklapanja za datu lokaciju. Prikazujemo do deset poklapanja, molimo vas pokušajte drukčiju pretragu ukoliko vaša lokacija nije ovde."
 
@@ -5394,7 +5486,7 @@ msgstr "Kada je poslata"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5414,7 +5506,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Da li biste voleli da dobijete još jedan upitnik za 4 nedelje, koji će vas podsetiti da proverite status?"
 
@@ -5426,7 +5518,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Ukoliko napišete vašu poruku u potpunosti velikim slovima teško je pročitati je, kao i ako ne stavite znake interpunkcije."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5437,12 +5528,12 @@ msgstr "Ukoliko napišete vašu poruku u potpunosti velikim slovima teško je pr
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Da"
 
@@ -5455,7 +5546,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5468,7 +5559,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr ""
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5477,7 +5568,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr ""
 
@@ -5507,7 +5598,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5517,7 +5608,7 @@ msgid "You declined; please fill in the box above"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5525,7 +5616,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5534,8 +5625,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5599,9 +5689,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5610,13 +5700,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5645,16 +5736,16 @@ msgstr ""
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5675,8 +5766,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr "Umesto toga, upiši se e-mejlom, unošenjem nove lozinke. Kada kliknete na link u vašem e-mejlu, ažuriraće se vaša lozinka."
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5709,7 +5800,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5740,19 +5831,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5760,8 +5851,8 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr ""
 
@@ -5792,6 +5883,10 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5809,7 +5904,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5892,12 +5987,12 @@ msgid "today"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5922,7 +6017,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr ""
 
@@ -5990,7 +6085,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6014,7 +6109,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6038,7 +6133,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
@@ -6046,7 +6141,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
@@ -6054,7 +6149,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6094,7 +6189,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
@@ -6102,7 +6197,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
@@ -6110,15 +6205,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "Zaključila skupština"
+
+#~ msgid "Filter report list"
+#~ msgstr "Filtriraj listu prijava"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Pogrešna agencija_odgovorna value %s"
+
+#~ msgid "Post"
+#~ msgstr "Postavi"
+
+#~ msgid "Traffic management required?"
+#~ msgstr "Potrebno upravljanje saobraćajem?"
+
 #~ msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 #~ msgstr "<strong>Napomena:</strong> Ovaj izveštaj prosleđen je dalje za dalje radnje . Svaka dalja promena neće biti prosleđena."
 
 #~ msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 #~ msgstr "<strong>Napomena:</strong> Ovaj izveštaj još uvek nije podnet dalje za dalje radnje. Svaka načinjena promena ne može biti prosleđena."
 
-#~ msgid "Available categories"
-#~ msgstr "Dostupne kategorije"
-
 #~ msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent."
 #~ msgstr "Proveri <strong>inspection required</strong> ukoliko se izveštaji u ovoj kategoriji <strong>moraju proveriti</strong> pre nego što se pošalju."
 
diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
index ae9640cd7..f4da3dace 100644
--- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2020-03-05 09:59+0000\n"
 "Last-Translator: Joe Siltberg <joe@joesiltberg.se>, 2020\n"
 "Language-Team: Swedish (Sweden) (https://www.transifex.com/mysociety/teams/12067/sv_SE/)\n"
@@ -22,8 +22,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr " och "
@@ -58,7 +58,7 @@ msgstr "%danvändare fanns redan"
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Sammanställningsrapporter"
 
@@ -113,7 +113,7 @@ msgstr "%s frågeformulär skickade &ndash; %s besvarade (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 
@@ -159,6 +159,8 @@ msgstr "(finns inte längre)"
 msgid "(not sent to council)"
 msgstr "(ej skickat till kommunen)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -177,8 +179,8 @@ msgstr "(skickat till båda)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr "(vi har också RSS-flöden för problem inom %s)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Välj en kategori --"
@@ -207,17 +209,18 @@ msgstr ""
 "              Vill du lägga till några <code>MAPIT_TYPES</code> i konfigruationsfilen?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr "<h2>Rapporter, statistik och åtgärder för</h2> <h1>%s</h1>"
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Visa</label> %s rapporter <label for=\"filter_categories\">om</label> %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr "<span>%s</span> sparad."
 
@@ -247,7 +250,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ja</strong>, jag har ett lösenord"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr "<u>Ta eller välj foto</u>"
 
@@ -264,7 +267,7 @@ msgid "Access denied"
 msgstr "Tillgång nekad"
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr "Aktivera tvåfaktorsautentisering"
 
@@ -284,7 +287,7 @@ msgstr "Lägg till en <strong>förvaltning</strong> för varje administrativ fö
 msgid "Add a contact using the form below."
 msgstr "Lägg till en kontakt medelst formuläret nedan."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 msgid "Add another parent category"
 msgstr "Lägg till en till föräldrakategori"
 
@@ -316,7 +319,7 @@ msgstr "Lägg till löst tillstånd"
 msgid "Add new category"
 msgstr "Ny kategori"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "Lägg till alternativ"
 
@@ -325,30 +328,29 @@ msgstr "Lägg till alternativ"
 msgid "Add phone number"
 msgstr "Lägg till telefonnummer"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
 msgid "Add to shortlist"
-msgstr "Lägg till i slutlista"
+msgstr "Lägg till i din lista"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Lägg till användare"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Lägg till eller ta bort problemkategorier"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Lägg till eller ta bort svarsprioriteringar"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Lägg till eller ta bort svarsmallar"
 
@@ -358,11 +360,17 @@ msgstr "Lades till %s"
 
 #: templates/web/base/report/_main.html:158
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
-msgstr "Att lägga till den här rapporten i din kortlista tar bort den från kortlistan för %s."
+msgstr "Att lägga till den här rapporten i din lista tar bort den från listan för %s."
 
 #: templates/web/base/main_nav_items.html:31
 msgid "Admin"
-msgstr "Administratörskontrollpanel"
+msgstr "Admin"
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
@@ -376,8 +384,8 @@ msgstr "Bevakning %d skapad för %s av typen %s med parametrarna %s/%s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Bevakning %d avaktiverad (skapad %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Varsko mig om framtida uppdateringar"
 
@@ -389,10 +397,12 @@ msgstr "Bevakningar:"
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "Alla"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Alla rapporter"
@@ -432,6 +442,11 @@ msgstr "Alla rapporter mellan %s och %s"
 msgid "All time"
 msgstr "Ärenden på årsbasis"
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Dölj rapporter i denna kategori"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr "Redan rapporterat?"
@@ -467,7 +482,7 @@ msgstr "Anonym"
 msgid "Anonymous user"
 msgstr "Anonym användare"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -480,7 +495,7 @@ msgid "Another user"
 msgstr "Annan användare"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Är du säker på att du vill avbryta den här uppladdningen?"
 
@@ -489,8 +504,8 @@ msgstr "Är du säker på att du vill avbryta den här uppladdningen?"
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Är du säker?"
@@ -501,7 +516,7 @@ msgstr "Är du säker?"
 msgid "Area covered"
 msgstr "Område som täcks"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr "Område:"
 
@@ -514,27 +529,32 @@ msgstr "Eftersom detta är en testsajt och %s är falskt kommer rapporter gjorda
 msgid "Assign selected to role:"
 msgstr "Tilldela roll till urval:"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Tilldela behörig förvaltning:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Lägg i en annan kategori:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Tilldela extern förvaltning:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Tilldela underavdelning:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr "Tilldela användare till områden"
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Samtliga kategorier"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Tilldelad %s"
@@ -547,7 +567,7 @@ msgstr "Som mest returneras %d svar i varje förfrågan. De returnerade svaren 
 msgid "At the moment only searching for and looking at reports work."
 msgstr "För tillfället fungerar det endast att söka för eller leta efter rapporter."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr "Bemyndigade kommunanvändare kan vara associerade med de kategorier som de arbetar med."
 
@@ -555,11 +575,11 @@ msgstr "Bemyndigade kommunanvändare kan vara associerade med de kategorier som
 msgid "Auto Response"
 msgstr "Automatiskt svar"
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Autosvar:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr "Fyll i rapportämne och -detaljer automatiskt"
 
@@ -571,12 +591,13 @@ msgstr "Genomsnittlig tid från det att ett problem rapporteras till dess att de
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Undvik personlig information och nummerplåtar"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Väntar på att granskas"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Tillbaka"
@@ -597,14 +618,12 @@ msgstr "Förbjud användare"
 msgid "Behaviour"
 msgstr "Beteende"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Förvaltningar"
 
@@ -617,11 +636,13 @@ msgstr "Förvaltningar"
 msgid "Body"
 msgstr "Förvaltning"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Förvaltning:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr "CSV-fil"
 
@@ -633,8 +654,7 @@ msgstr "Kan du inte hitta vårt e-brev? Kolla din skräppostmapp &ndash; det är
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Kan du inte se kartan? <em>Hoppa över det här steget</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -650,15 +670,13 @@ msgstr "Kategorier:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -668,7 +686,7 @@ msgstr "Kategori"
 msgid "Category and State"
 msgstr "Kategori och tillstånd"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Kategori ändrat från ‘%s’ till ‘%s’"
 
@@ -691,6 +709,11 @@ msgstr "Kategori:"
 msgid "Change"
 msgstr "Ändra"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Ändra lösenord"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -707,7 +730,7 @@ msgstr "Ändra lösenord"
 msgid "Change phone number"
 msgstr "Ändra telefonnummer"
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr "Ändra tvåfaktorsautentisering"
 
@@ -717,12 +740,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr "Välj ett <strong>kategorinamn</strong> som å ena sidan är förståeligt för allmänheten (som t. ex. \"Väggrop\" eller \"Gatubelysning\") men som också är hjälpsamt för förvaltningen. Dessa kommer att visas i en rullgardinsmeny på problemrapporteringssidan."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr "Välj en annan"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr "Rensa offline-data"
 
@@ -759,8 +782,8 @@ msgid "Close"
 msgstr "Stäng"
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -770,11 +793,7 @@ msgstr "Stäng"
 msgid "Closed"
 msgstr "Stängd"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Stängd av kommunen"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr "Stängd för uppdateringar"
 
@@ -807,13 +826,12 @@ msgid "Code"
 msgstr "Kod"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr "Vik ihop karta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Konfiguration"
@@ -930,7 +948,7 @@ msgstr "Skapa en rapport"
 msgid "Create an account"
 msgstr "Skapa ett konto"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Skapa en kategori"
@@ -940,27 +958,25 @@ msgstr "Skapa en kategori"
 msgid "Create priority"
 msgstr "Skapa prioritet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr "Skapa rapporter/uppdateringar som anonym användare"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "Skapa rapporter/uppdateringar som kommunen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr "Skapa rapporter/uppdateringar på en användares vägnar"
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Välj mall"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Skapad"
@@ -969,6 +985,17 @@ msgstr "Skapad"
 msgid "Created %d new users"
 msgstr "Skapade %d nya användare"
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Skapad"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Skapad"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -980,10 +1007,6 @@ msgstr "Skapad:"
 msgid "Current password:"
 msgstr "Nuvarande lösenord:"
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr "Nuvarande token:"
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr "För närvarande grupperade efter %s"
@@ -993,19 +1016,21 @@ msgstr "För närvarande grupperade efter %s"
 msgid "Currently no bodies have been created."
 msgstr "Inga förvaltningar har skapats ännu."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "Kund ej kontaktbar"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Översikt"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr "Inaktivera tvåfaktorsautentisering"
 
@@ -1017,7 +1042,7 @@ msgstr "Hanterat av underavdelning inom 5 arbetsdagar"
 msgid "Default"
 msgstr "Standard"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr "Skapa, som standard, rapporter/uppdateringar som kommunen"
 
@@ -1027,7 +1052,7 @@ msgid "Delete"
 msgstr "Ta bort"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Ta bort mall"
@@ -1048,9 +1073,7 @@ msgid "Describe why you are moderating this"
 msgstr "Beskriv varför du modererar detta"
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -1058,7 +1081,7 @@ msgstr "Beskrivning"
 msgid "Destination"
 msgstr "Destination"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr "Detaljerad information är begränsad till %d tecken."
 
@@ -1094,7 +1117,7 @@ msgid "Disable"
 msgstr "Inaktivera"
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr "Avaktivera formulär när denna kategori väljs"
 
@@ -1102,6 +1125,16 @@ msgstr "Avaktivera formulär när denna kategori väljs"
 msgid "Disable form when this option is selected"
 msgstr "Avaktivera formulär när detta alternativ väljs"
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Dölj rapporter i denna kategori"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Dölj rapporter i denna kategori"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr "Inaktiverad:"
@@ -1136,24 +1169,24 @@ msgstr "Vet ej"
 msgid "Don't like forms?"
 msgstr "Gillar du inte formulär?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr "Ner en"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Släpp foton här eller  <u>klicka för att ladda upp</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr "Rullgardinsmeny"
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr "Dublett av"
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr "Dubletter"
 
@@ -1165,7 +1198,7 @@ msgid ""
 "    "
 msgstr "Varje förvaltningskontakt har en kategori, och denna visas för allmänheten. Olika kategorier <strong>kan ha samma kontakt</strong> (e-postadress). Detta betyder att du kan lägga till flera kategorier även om du bara har en förvaltningskontakt."
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr "Easting/Northing:"
@@ -1177,7 +1210,7 @@ msgstr "Easting/Northing:"
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Ändra"
@@ -1188,12 +1221,11 @@ msgstr "Ändra"
 msgid "Edit body details"
 msgstr "Ändra förvaltningsdetaljer"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "Redigera andra användares rättigheter"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr "Redigera rapportkategori"
 
@@ -1201,17 +1233,15 @@ msgstr "Redigera rapportkategori"
 msgid "Edit report details"
 msgstr "Redigera rapportuppgifter"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr "Redigera rapportprioritet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Redigera rapporter"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr "Redigera användarnas detaljer/sök efter deras rapporter"
 
@@ -1248,8 +1278,9 @@ msgstr "Redaktör"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1258,15 +1289,14 @@ msgstr "Redaktör"
 msgid "Email"
 msgstr "Epost"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "E-postadress"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr "Epostadress (valfri)"
 
@@ -1286,12 +1316,13 @@ msgstr "Mejla mig en länk eller SMS:a mig en kod för att logga in"
 msgid "Email me a link to sign in"
 msgstr "Mejla mig en länk för att logga in"
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr "Epost bekräftad:"
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Epost:"
@@ -1366,11 +1397,11 @@ msgstr "Slutdatum"
 msgid "Endpoint"
 msgstr "Ändpunkt"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 msgid "Enter a Zürich street name"
 msgstr "Skriv in ett Zürich-gatunamn"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Ange gatunamn och ort eller ett postnummer"
 
@@ -1397,10 +1428,10 @@ msgstr "Skriv in information om problemet"
 msgid "Error"
 msgstr "Fel"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Allt"
 
@@ -1413,7 +1444,7 @@ msgstr "Exempelpostnummer %s"
 msgid "Examples:"
 msgstr "Exempel:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Befintlig kategori"
 
@@ -1422,7 +1453,7 @@ msgid "Existing users won't be modified."
 msgstr "Befintliga användare kommer inte att modifieras."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr "Expandera karta"
 
@@ -1447,7 +1478,7 @@ msgid "External body"
 msgstr "Extern förvaltning"
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr "Extern statuskod"
 
@@ -1459,20 +1490,20 @@ msgstr "Extern statuskod:"
 msgid "External team"
 msgstr "Externt arbetslag"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr "Ytterligare fält"
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Extra data:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1505,20 +1536,25 @@ msgid "Fill in your details manually."
 msgstr "Fyll i dina uppgifter manuellt."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr "Filter"
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Filtrera rapportlista"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Första gången"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Foton från närliggande rapporter"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Nya rapporter"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Lös detta genom att välja ett <strong>lämpligt område</strong> i <em>Ändra förvaltningsdetaljer</em> i formuläret nedan."
@@ -1548,7 +1584,7 @@ msgstr "Flagga som borttagen"
 msgid "Flag user"
 msgstr "Flagga användare"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Flaggat"
@@ -1557,7 +1593,7 @@ msgstr "Flaggat"
 msgid "Flagged reports and users"
 msgstr "Flaggade rapporter och användare"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Flaggade användare är listade på <a href='%s'>flaggningssidan</a>."
 
@@ -1565,8 +1601,8 @@ msgstr "Flaggade användare är listade på <a href='%s'>flaggningssidan</a>."
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Flaggade användare är inte begränsade på något sätt. Detta är bara en lista på användare som har markerats för uppmärksamhet."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Flaggat:"
 
@@ -1592,11 +1628,11 @@ msgstr "Glömt lösenord"
 msgid "Forgotten your password?"
 msgstr "Glömt ditt lösenord?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "Vidarebefordrad till extern förvaltning"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "Vidarebefordrade önskan till extern förvaltning"
 
@@ -1606,12 +1642,20 @@ msgstr "Vidarebefordrade önskan till extern förvaltning"
 msgid "Frequently Asked Questions"
 msgstr "Vanliga frågor"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr "Allmän förfrågan"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr "Generera token"
 
@@ -1633,7 +1677,7 @@ msgstr "Få uppdateringar av %s problem"
 msgid "Get updates of problems in this %s"
 msgstr "Få uppdateringar om problem i denna %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Ge mig ett RSS-flöde"
 
@@ -1649,15 +1693,15 @@ msgstr "Vi är glada att höra att det har blivit löst!"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1667,7 +1711,7 @@ msgstr "Gå"
 msgid "Going to send questionnaire?"
 msgstr "Skicka enkät?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr "Bevilja tillgång till administratörskontrollpanelen"
 
@@ -1693,6 +1737,7 @@ msgstr "Har du någonsin rapporterat ett problem till en kommun tidigare eller 
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr "Heatmap"
 
@@ -1727,7 +1772,8 @@ msgstr "Gömd"
 msgid "Hidden data in reporting form"
 msgstr "Dold data i rapportformulär"
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr "Dölj alla rapporter och uppdateringar"
 
@@ -1755,7 +1801,7 @@ msgstr "Dölj mitt namn i den här rapporten"
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Göm kartnålar"
 
@@ -1808,11 +1854,9 @@ msgstr "Tyvärr kunde vi inte hitta ditt problem i databasen.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "ID"
 
@@ -1831,15 +1875,15 @@ msgstr "Om en användare är associerad med adressen som du skrev in, så har vi
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr "Om denna prioritet skickas vidare till en extern tjänst (t.ex. Exor/Confirm), skriv prioritetskoden för den tjänsten här."
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr "Om ikryssad kommer formuläret avaktiveras och notis-texten visas."
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr "Om ikryssad kommer denna extra data inte redigeras eller tas bort av Open311 populeringsscriptet."
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr "Om ikryssad kommer den här mallen att användas för Open311-uppdateringar som försätter rapporter i detta tillstånd."
 
@@ -1853,7 +1897,7 @@ msgstr "Om två eller fler förvaltningar delar på ett geografiskt område, kom
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr "Om du kontaktar oss angående en specifik rapport eller uppdatering, inkludera då en länk till rapporten i meddelandet."
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr "Om du genererar en ny token så kommer den token som används nu att sluta fungera."
 
@@ -1877,7 +1921,7 @@ msgstr "Om du bara vill att den här mallen skall vara valbar för specifika kat
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "Om du skapar en problemrapport här så kommer rapporten <strong>inte</strong> att skickas till kommunen."
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr "Om du vill använda den här mallen för att i förväg fylla i uppdateringsfältet när en rapports <strong>externa</strong> (t.ex. Bekräfta) statuskod ändras, skriv in statuskoden här."
 
@@ -1922,7 +1966,7 @@ msgstr ""
 "              <strong>FixaMinGata-användare</strong> ska stå som skaparen av dessa uppdateringar\n"
 "              när de visas på sajten. Skriv in ID-värdet (ett nummer) för den önskade användaren."
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr "Om du har gjort ändringar, lämna en beskrivande kommentar, som andra administratörer kan se."
 
@@ -1946,6 +1990,17 @@ msgstr "I missbrukstabellen?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "I tillägg, följande attribut som inte är del av Open311 v2-specifikationen returneras: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "Visa kommuner"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1955,20 +2010,20 @@ msgstr "Inaktiv"
 msgid "Inbox zero, here we come!"
 msgstr "Inbox zero, här kommer vi!"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Inkludera rapportörens personuppgifter"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Inkorrekt värde för has_photo, \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr "Inspektera rapport"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr "Instruera entreprenörer att lösa problem"
 
@@ -1984,16 +2039,12 @@ msgstr "Intern nyckel"
 msgid "Internal notes"
 msgstr "Interna anteckningar"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Inkorrekt värde för agency_responsible, \"%s\""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Inkorrekt format %s angivet."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Oglitlig plats. Samma kommun måste ansvara för den nya platsen."
 
@@ -2044,13 +2095,13 @@ msgstr "Senaste uppdatering:"
 msgid "Last&nbsp;update:"
 msgstr "Senaste&nbsp;uppdatering:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr "Latitud/Longitud:"
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr "Tidigast uppdaterad"
@@ -2067,7 +2118,7 @@ msgstr "Lista alla rapporterade problem"
 msgid "Loading reports…"
 msgstr "Laddar rapporter..."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Laddar..."
@@ -2105,17 +2156,18 @@ msgid "Log in with Twitter"
 msgstr "Logga in med Twitter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr "Logga in med e-post"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr "Logga in med epost/SMS"
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr "Logga ut från alla sessioner"
 
@@ -2133,19 +2185,20 @@ msgstr "Slå upp"
 msgid "MAP"
 msgstr "KARTA"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr "Gör till anonym på alla rapporter och uppdateringar"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
-msgstr "Hantera slutlista"
+msgstr "Hantera \"din lista\""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr "Manifest-tema"
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr "Manuell ordning"
@@ -2159,24 +2212,24 @@ msgstr "Karta"
 msgid "Mark as sent"
 msgstr "Markera som skickad"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Markera användare som du vill hålla ett öga på som <strong>flaggade</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr "Lägg till problemdetaljer"
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Meddelande"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "Meddelande till behörig förvaltning:"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "Meddelande till extern förvaltning:"
 
@@ -2189,7 +2242,7 @@ msgstr "Meddelande att visa när formuläret är avaktiverat (HTML tillåts)"
 msgid "Missing bodies:"
 msgstr "Saknade förvaltningar:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Saknat jurisdiction_id"
 
@@ -2197,8 +2250,7 @@ msgstr "Saknat jurisdiction_id"
 msgid "Moderate"
 msgstr "Moderera"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr "Moderera rapportdetaljer"
 
@@ -2221,7 +2273,7 @@ msgstr "Modererad av %s %s"
 msgid "Moderated by division within one working day"
 msgstr "Granskat av underavdelningen inom en arbetsdag"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr "Modereringshistorik"
@@ -2231,14 +2283,14 @@ msgstr "Modereringshistorik"
 msgid "Month"
 msgstr "Månad"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr "Mest kommenterad"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr "Flera grupper"
@@ -2266,9 +2318,10 @@ msgstr "Flera grupper"
 msgid "Name"
 msgstr "Namn"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Namn:"
@@ -2286,7 +2339,7 @@ msgstr "Navigera till det här problemet"
 msgid "Nearest calculated address:"
 msgstr "Beräknad närmaste adress:"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Närmaste namngivna gata till placeringen på kartan (genereras automatiskt via OpenStreetMap): %s%s"
 
@@ -2294,12 +2347,12 @@ msgstr "Närmaste namngivna gata till placeringen på kartan (genereras automati
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Närmaste postnummer till placeringen på kartan (genereras automatiskt): %s (%s meter bort)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Närmaste gata till placeringen på kartan (genereras automatiskt av Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2324,7 +2377,7 @@ msgstr "Nästan klart! Kolla meddelandet som har skickats till din telefon."
 msgid "New body added"
 msgstr "Ny förvaltning tillagd"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Nya kategorikontakter tillagda"
 
@@ -2337,8 +2390,8 @@ msgstr "Ny e-postadress:"
 msgid "New field"
 msgstr "Nytt fält"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Ny intern anteckning:"
 
@@ -2346,13 +2399,13 @@ msgstr "Ny intern anteckning:"
 msgid "New local problems on FixMyStreet"
 msgstr "Nya lokala problem på FixaMinGata"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr "Ny anteckning till DM:"
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Nytt lösenord:"
 
@@ -2429,7 +2482,7 @@ msgstr "Ny mall"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr "Nya uppdateringar i rapporten <a href=\"%s\">%s</a>"
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr "Senaste"
@@ -2442,7 +2495,6 @@ msgstr "Nästa"
 msgid "Next:"
 msgstr "Nästa:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2451,11 +2503,11 @@ msgstr "Nästa:"
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Nej"
 
@@ -2467,11 +2519,12 @@ msgstr "Ingen grupp"
 msgid "No account?"
 msgstr "Inget konto?"
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Ingen förvaltning"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Ingen kommun vald"
 
@@ -2487,8 +2540,8 @@ msgstr "Inga flaggade problem kunde hittas."
 msgid "No flagged users found."
 msgstr "Inga flaggade användare kunde hittas."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Inga fler uppdateringar"
 
@@ -2524,8 +2577,8 @@ msgstr "Inga supporters"
 msgid "None"
 msgstr "Inget"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
@@ -2533,8 +2586,8 @@ msgstr ""
 "Vanliga (offentliga) användare skall inte vara associerade med något <strong>område</strong>.<br>\n"
 "                  Godkända personalanvändare kan associeras med området inom vilket de är verksamma."
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2542,10 +2595,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr "Normala (publika) användare skall inte associeras med någon <strong>förvaltning</strong>.<br>Användare för behörig personal skall kunna bli associerade med den förvaltning som de representerar.<br>Beroende på implementationen kan personal ha tillgång till dashboard-sidan (som summerar förvaltningsaktiviteterna), möjligheten att dölja rapporter, eller möjligheten att sätta speciella rapportstatusvärden."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Inte för min underavdelning"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Ej rapporterat tidigare"
@@ -2593,12 +2650,12 @@ msgid "Offline"
 msgstr "Offline"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr "Offline-data rensad"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr "Offline-uppdateringsdata sparade"
 
@@ -2606,12 +2663,12 @@ msgstr "Offline-uppdateringsdata sparade"
 msgid "Old state"
 msgstr "Äldre status"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr "Äldst"
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr "På uppdrag av %s"
 
@@ -2620,7 +2677,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr "Endast kommunanvändare kommer kunna skapa rapporter i den här kategorin."
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2651,7 +2708,7 @@ msgstr "Open311"
 msgid "Open311 specification"
 msgstr "Open311 Specifikation"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr "Alternativ"
 
@@ -2663,7 +2720,7 @@ msgstr "Eller <a href=\"/\">sök efter en annan plats</a>"
 msgid "Or sign in with password to prefill this information."
 msgstr "Eller logga in med lösenord för att i förväg fylla i denna information."
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr "Eller prenumerera via RSS"
 
@@ -2671,16 +2728,16 @@ msgstr "Eller prenumerera via RSS"
 msgid "Order"
 msgstr "Ordning"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2712,7 +2769,7 @@ msgstr "Sidan hittas ej"
 msgid "Parent"
 msgstr "Förälder"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 msgid "Parent categories"
 msgstr "Föräldrakategorier"
 
@@ -2720,13 +2777,13 @@ msgstr "Föräldrakategorier"
 msgid "Partial"
 msgstr "Partiell"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Lösenord (valfritt)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 msgid "Password change cancelled."
 msgstr "Lösenordsbyte avbröts."
 
@@ -2738,7 +2795,7 @@ msgstr "Gammalt lösenord"
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Rättigheter:"
 
@@ -2746,19 +2803,24 @@ msgstr "Rättigheter:"
 msgid "Permit blank updates"
 msgstr "Tillåt tomma uppdateringar"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefonnummer:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr "Telefonrapportör:"
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Telefonnummer (valfritt)"
 
@@ -2766,30 +2828,26 @@ msgstr "Telefonnummer (valfritt)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr "Telefonnummer är begränsade till %s i teckenlängd."
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr "Telefonnummer verifierat:"
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefonnummer:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2809,9 +2867,8 @@ msgstr "Foto krävs"
 msgid "Photo upload failed."
 msgstr "Fotouppladdning misslyckades."
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Foton"
@@ -2820,7 +2877,7 @@ msgstr "Foton"
 msgid "Photos of recent nearby reports"
 msgstr "Foton från närliggande rapporter"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr "Foton/dokument"
 
@@ -2834,6 +2891,11 @@ msgstr "Välj din kommun"
 msgid "Pick your ward"
 msgstr "Välj din kommun"
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Placera nålen på kartan"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2861,27 +2923,26 @@ msgid "Please check your email address is correct"
 msgstr "Vänligen kontrollera att din epostadress är korrekt"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr "Kontrollera att ditt telefonnummer är korrekt"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Välj en kategori"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr "Välj ett ovanligare lösenord"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2900,27 +2961,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Var snäll och missbruka inte tjänsten, det förstör för alla."
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Skriv in ett meddelande"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr "Skriv in ett mobiltelefonnummer"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Skriv in ett namn"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr "Skriv in namnet på den här förvaltningen"
 
@@ -2933,16 +2994,16 @@ msgstr "Skriv in ett lösenord"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Skriv in ett ärende"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2953,20 +3014,20 @@ msgstr "Skriv in en giltig epostadress"
 msgid "Please enter a valid email address"
 msgstr "Skriv in en giltig epostadress"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr "Skriv in en giltig epostadress eller ett giltigt telefonnummer"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Skriv några detaljer"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2982,7 +3043,7 @@ msgid "Please enter your first name"
 msgstr "Skriv in ditt förnamn"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Skriv in ditt namn och efternamn om kommunen behöver den informationen. Om du inte vill att dit namn visas kan du välja det nedanför"
@@ -2993,9 +3054,9 @@ msgstr "Skriv in ditt namn och efternamn"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Skriv in ditt namn och efternamn"
@@ -3036,18 +3097,18 @@ msgstr "Fyll i information om problemet nedan och beskriv den exakta platsen fö
 msgid "Please generate a two-factor code and enter it below:"
 msgstr "Generera en tvåfaktorskod och skriv in den nedan:"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Ange ifall du vill ta emot ett annat frågeformulär"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 msgid "Please make sure you are not including an email address"
 msgstr "Se till att inte ta med en e-postadress"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr "Välj ett lösenord som är minst %d tecken långt"
@@ -3074,24 +3135,28 @@ msgstr "Observera att din uppdatering <strong>inte har publicerats än</strong>.
 msgid "Please note:"
 msgstr "Observera:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr "Ange ett dublett-ID eller en offentlig uppdatering för den här rapporten."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr "Tillhandahåll en offentlig uppdatering för den här rapporten."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Skriv en förklaring till varför du öppna de här rapporten igen"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Skriv lite förklarande text tillsammans med ett foto"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Ange om du har anmält ett problem till kommunen tidigare eller ej"
 
@@ -3099,7 +3164,7 @@ msgstr "Ange om du har anmält ett problem till kommunen tidigare eller ej"
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr "Scanna bilden med din app, eller mata in textkoden i din app, skapa sedan en ny engångskod och ange den nedan:"
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "Välj en förvaltning."
 
@@ -3111,7 +3176,7 @@ msgstr "Välj det RSS-flöde du vill ha"
 msgid "Please select the type of alert you want"
 msgstr "Välj den kategori av rapporter du vill ha"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Ange om problemet har lösts eller ej"
 
@@ -3119,12 +3184,12 @@ msgstr "Ange om problemet har lösts eller ej"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Ladda upp endast en bild"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr "Verifiera epostadressen, telefonnumret, eller båda"
 
@@ -3132,27 +3197,23 @@ msgstr "Verifiera epostadressen, telefonnumret, eller båda"
 msgid "Please write a message"
 msgstr "Skriv ett meddelande"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Skicka"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr "Postnummer eller gatunamn och område"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Postat anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Postat av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Postat av <strong>%s</strong> (%s) %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Postat av <strong>%s</strong> %s"
 
@@ -3168,7 +3229,7 @@ msgstr "Förhindra att nya rapporter använder denna kategori, <em>och</em> ta 
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr "Förhindra att nya rapporter använder denna kategori, men behåll den i kartfilter."
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr "Förhindra att användaren skickar in formuläret tills detta fält är ifyllt."
 
@@ -3176,11 +3237,11 @@ msgstr "Förhindra att användaren skickar in formuläret tills detta fält är
 msgid "Previous"
 msgstr "Föregående"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr "Prioriteringar"
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr "Prioritet"
@@ -3196,9 +3257,9 @@ msgid "Privacy and cookies"
 msgstr "Integritetsskydd och kakor"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Privat"
 
@@ -3216,7 +3277,7 @@ msgstr "Rapport %d skapat"
 
 #: templates/web/base/admin/users/log.html:54
 msgid "Problem %s added to shortlist"
-msgstr "Rapport %s tillagd i slutlista"
+msgstr "Rapport %s tillagd i \"din lista\""
 
 #: templates/web/base/admin/timeline.html:24
 msgid "Problem %s confirmed"
@@ -3232,7 +3293,7 @@ msgstr "Rapport %s skapad för %s"
 
 #: templates/web/base/admin/users/log.html:56
 msgid "Problem %s removed from shortlist"
-msgstr "Rapport %s borttagen från slutlista"
+msgstr "Rapport %s borttagen från \"din lista\""
 
 #: templates/web/base/admin/timeline.html:26
 msgid "Problem %s sent to council %s"
@@ -3244,7 +3305,7 @@ msgstr "Rapport %s skickad till %s"
 msgid "Problem breakdown by state"
 msgstr "Rapporter per status"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problemet markerat som öppet."
 
@@ -3252,8 +3313,7 @@ msgstr "Problemet markerat som öppet."
 msgid "Problem state change based on survey results"
 msgstr "Problemets status ändrats baserat på utredningsresultat"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problem"
@@ -3278,18 +3338,18 @@ msgstr "Problem nyligen rapporterade som lösta på FixaMinGata"
 msgid "Problems within %.1fkm of %s"
 msgstr "Problem inom %.1f km av %s"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Problem inom %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Problem inom området %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr "Problem inom %s område, %s"
 
@@ -3297,7 +3357,7 @@ msgstr "Problem inom %s område, %s"
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "Problem inom %s, %s"
 
@@ -3305,11 +3365,15 @@ msgstr "Problem inom %s, %s"
 msgid "Property address:"
 msgstr "Fastighetsadress:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr "Skydda från Open311-ändringar"
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 #, fuzzy
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr "Skydda från Open311-ändringar"
@@ -3324,11 +3388,11 @@ msgstr "Ge en uppdatering"
 msgid "Provide update as"
 msgstr "Tillhandahåll uppdatering som"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr "Att ange ett lösenord är valfritt, men om du gör det kommer du lättare att kunna rapportera framtida problem, lämna uppdateringar och hantera dina rapporter."
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Att ange ett lösenord är valfritt, men om du gör det kommer du lättare att kunna rapportera problem, lämna uppdateringar och hantera dina rapporter."
 
@@ -3336,12 +3400,12 @@ msgstr "Att ange ett lösenord är valfritt, men om du gör det kommer du lätta
 msgid "Public details"
 msgstr "Offentliga uppgifter"
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Offentligt svar:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr "Offentlig uppdatering:"
 
@@ -3383,11 +3447,11 @@ msgstr "Frågeformulär ifyllt av rapportören"
 msgid "RSS feed"
 msgstr "RSS-flöde"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS-flöde för %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS-flöde för område %s, %s"
 
@@ -3395,11 +3459,11 @@ msgstr "RSS-flöde för område %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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS-flöde för %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS-flöde för %s, inom område %s"
 
@@ -3407,13 +3471,13 @@ msgstr "RSS-flöde för %s, inom område %s"
 msgid "RSS feed of nearby problems"
 msgstr "RSS-flöde av närliggande problem"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "RSS-flöde för problem inom %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS-flöde för problem inom område %s"
 
@@ -3427,11 +3491,11 @@ msgstr "RSS-flöde för senaste lokala problemen"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS-flöde för uppdateringar till denna rapport"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr "Läs mindre"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr "Läs mer"
 
@@ -3444,7 +3508,7 @@ msgstr "Anledning:"
 msgid "Receive email when updates are left on this problem."
 msgstr "Erhåll epost när uppdateringar ges till denna rapport"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr "Mottagen av %s kort därefter"
 
@@ -3458,7 +3522,7 @@ msgstr "Senaste lokala rapporterna, %s"
 msgid "Recently reported problems"
 msgstr "Senaste rapporterade problemen"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr "Senast uppdaterad"
@@ -3471,7 +3535,8 @@ msgstr "Avvisa rapport"
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Kom ihåg att FixaMinGata primärt är avsett för att rapportera fysiska problem som kan åtgärdas. Om ditt problem inte lämpar sig för att rapportera via den här webbsidan kan du kontakta din kommun direkt via deras webbsida."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr "Ta bort kontouppgifter"
 
@@ -3483,13 +3548,13 @@ msgstr "Ta bort fält"
 msgid "Remove flag"
 msgstr "Ta bort flagga"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
 msgid "Remove from shortlist"
-msgstr "Ta bort från slutlista"
+msgstr "Ta bort från din lista"
 
 #: templates/web/base/report/display_tools.html:7
 msgid "Remove from site"
@@ -3499,17 +3564,22 @@ msgstr "Ta bort från sajten"
 msgid "Remove option"
 msgstr "Ta bort alternativ"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Ta bort foto (kan inte ångras!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Redigera andra användares rättigheter"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr "Ersätt token"
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Besvara användare:"
 
@@ -3517,14 +3587,14 @@ msgstr "Besvara användare:"
 msgid "Report"
 msgstr "Rapportera"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr "Rapport-ID:"
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3533,7 +3603,7 @@ msgid "Report a problem"
 msgstr "Rapportera ett problem"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr "Rapportera ett problem här"
@@ -3548,7 +3618,7 @@ msgid "Report anonymously"
 msgstr "Rapportera anonymt"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3583,7 +3653,7 @@ msgstr "Rapportera, visa och diskutera lokala gaturelaterade problem."
 msgid "Report, view, or discuss local problems"
 msgstr "Rapportera, visa, eller diskutera lokala problem"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Rapporterat anonymt %s"
@@ -3594,7 +3664,7 @@ msgstr "Rapporterat anonymt %s"
 msgid "Reported before"
 msgstr "Rapporterat tidigare"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Rapporterat av %s, %s"
@@ -3608,27 +3678,27 @@ msgstr "Rapporterad av:"
 msgid "Reported in the %s category"
 msgstr "Rapporterat i kategori %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Anonym rapport i kategori %s, %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Rapporterat i kategori %s av %s, %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Rapporterat av %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Rapporterat av %s av %s, %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Rapporterat av %s i kategorin %s, anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Rapporterat av %s i kategorin %s av %s, %s"
 
@@ -3647,17 +3717,15 @@ msgstr "Rapporterad:"
 msgid "Reporting a problem"
 msgstr "Rapportera ett problem"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Rapporter"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3685,15 +3753,15 @@ msgid "Reports published"
 msgstr "Publicerade rapporter"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr "Rapporter sparade offline."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr "Rapporter skickas till %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr "Rapporter skickade till %s, inom området %s"
 
@@ -3706,7 +3774,7 @@ msgstr "Rapporter som väntar på att skickas"
 msgid "Reposition if needed, then hit Continue"
 msgstr "Flytta vid behov, tryck sen på Fortsätt"
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr "Obligatoriska"
 
@@ -3759,39 +3827,45 @@ msgstr "Återgå till orginalsammanfattningen"
 msgid "Right place?"
 msgstr "Rätt plats?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Vägoperatör för den här namngivna vägen (hämtat från vägens nummer och typ): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Vägoperatör för den här namngivna vägen (från OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr "Roll"
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr "Roll:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr "Roller"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3807,20 +3881,20 @@ msgstr "Rotation av detta foto kommer att radera osparade rapportändringar."
 msgid "Satellite"
 msgstr "Satellit"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr "Spara + stäng som dublett"
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3837,13 +3911,12 @@ msgid "Save with a public update"
 msgstr "Spara med en offentlig uppdatering"
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr "Sparar rapporter offline"
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Sök rapporter"
 
@@ -3856,7 +3929,7 @@ msgstr "Sök användare"
 msgid "Search for location of email alert or RSS feed"
 msgstr "Sök efter plats för epostbevakning eller RSS-flöde"
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Sök bland rapporter"
 
@@ -3871,12 +3944,12 @@ msgstr "Sök:"
 msgid "Searching found no reports."
 msgstr "Inga rapporter hittades."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Inga användare hittades."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr "Säkerhet"
@@ -3886,8 +3959,7 @@ msgstr "Säkerhet"
 msgid "See our privacy policy"
 msgstr "Se vår integritetsskyddspolicy"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr "Se användarinformation för rapporter skapade som kommunen"
 
@@ -3897,7 +3969,7 @@ msgid "Select a body"
 msgstr "Välj en förvaltning"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Välj ett område"
@@ -3918,7 +3990,7 @@ msgstr "Välj flera kommuner?"
 msgid "Select:"
 msgstr "Välj:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr "Skicka"
@@ -3931,7 +4003,7 @@ msgstr "Misslyckade försök att skicka:"
 msgid "Send extended Open311 statuses with service request updates"
 msgstr "Skicka utökade Open311-statusar med Service Request-uppdateringar"
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr "Skicka inloggningsmejl"
 
@@ -3940,11 +4012,11 @@ msgstr "Skicka inloggningsmejl"
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr "SMS-bekräftelsetexten kunde inte skickas: \"%s\""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "Skicka tillbaka rapport"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Skickades till %s, %s senare"
 
@@ -3980,23 +4052,23 @@ msgstr "Kort namn"
 #: templates/web/base/report/_main.html:27
 #: templates/web/base/report/_main.html:35
 msgid "Shortlist"
-msgstr "Slutlista"
+msgstr "Din lista"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
-msgstr "Kortlista alla synliga"
+msgstr "Lägg alla synliga i din lista"
 
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:26
 #: templates/web/base/report/_main.html:31
 #: templates/web/base/reports/_list-filter-status.html:24
 msgid "Shortlisted"
-msgstr "Satt på slutlistan"
+msgstr "Tillagd i din lista"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
-msgstr "Satt på slutlistan av %s"
+msgstr "%s har den i sin lista"
 
 #: templates/web/base/report/update.html:23
 msgid "Show Photo?"
@@ -4018,8 +4090,8 @@ msgstr "Visa namn offentligt?"
 msgid "Show older"
 msgstr "Visa äldre"
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr "Visa äldre rapporter"
 
@@ -4030,7 +4102,7 @@ msgstr "Visa foto"
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Visa kartnålar"
 
@@ -4092,7 +4164,7 @@ msgid "Some photos of recent reports"
 msgstr "Foton från de senaste rapporterna"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Lite text att lokalisera"
 
@@ -4101,12 +4173,11 @@ msgid "Someone has moderated this report since you started."
 msgstr "Någon har modererat den här rapporten sedan du började."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr "Tyvärr! Du har uppnått maximalt antal bifogade bilder för en rapport."
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Tyvärr, det verkar vara ett postnummer som vi inte täcker."
 
@@ -4124,9 +4195,9 @@ msgstr "Koden var inkorrekt."
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Tyvärr har det uppstått ett fel med att bekräfta ditt problem."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Tyvärr kan vi inte hitta den adressen."
 
@@ -4136,13 +4207,13 @@ msgstr "Tyvärr kan vi inte hitta den adressen."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr "Inloggningen misslyckades. Fyll i formuläret nedan."
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Tyvärr kan vi inte förstå den adressen. Försök gärna igen."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 msgid "Sorry, we couldn't save your file(s), please try again."
@@ -4156,11 +4227,11 @@ msgstr "Anslutningen är inte tillräckligt bra för att hämta den sidan."
 msgid "Sorry, you don't have permission to do that."
 msgstr "Du har inte rättigheterna som krävs för att göra det."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr "Tyvärr har du inte rättigheter att göra detta. Om du är rapportören eller en handläggare, vänligen <a href=\"%s\">logga in</a> för att se rapporten."
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr "Sortera efter"
@@ -4169,11 +4240,11 @@ msgstr "Sortera efter"
 msgid "Staff only"
 msgstr "Endast kommunanvändare"
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr "Personalanvändare får logga in på administratörskontrollpanelen."
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr "Personal:"
 
@@ -4197,18 +4268,18 @@ msgstr "Startdatum"
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Status"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr "Tillstånd och externa statuskoder kan inte användas samtidigt."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4217,31 +4288,28 @@ msgstr "Tillstånd ändrat till:"
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Status:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr "Tillstånd"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Statistik"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Status"
 
@@ -4259,7 +4327,7 @@ msgstr "Street View"
 msgid "Subcategory"
 msgstr "Underkategori"
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Underavdelning/Förvaltning"
 
@@ -4278,50 +4346,48 @@ msgstr "Ärende:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Skicka"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Skicka förändringar"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Skicka frågeformulär"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Skickad"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr "Prenumerera med epost"
 
@@ -4333,7 +4399,7 @@ msgstr "Prenumererad:"
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Sammanfattningar är begränsade till %d tecken. Vänligen korta ner din sammanfattning"
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr "Sammanfattningar är begränsade till %s tecken. Vänligen korta ner din sammanfattning"
@@ -4347,20 +4413,19 @@ msgstr "Sammanfattningar är begränsade till {0} tecken. Vänligen korta ner di
 msgid "Summarise the problem"
 msgstr "Sammanfatta problemet"
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr "Sammanfatta dina ändringar"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Sammanfattning"
 
@@ -4371,14 +4436,20 @@ msgstr "Sammanställningsrapporter"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr "Sammanfattningsstatistik"
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Superuser"
+msgstr "Superanvändare:"
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr "Superanvändare:"
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "Superanvändare har rättigheter att utföra <strong>samtliga åtgärder</strong> i administratörskontrollpanelen."
 
@@ -4396,13 +4467,18 @@ msgstr "Berätta för oss om dig"
 msgid "Template &laquo;%s&raquo;"
 msgstr "Mall &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Mallar"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+#, fuzzy
+msgid "Ten least recently updated open reports"
+msgstr "Tidigast uppdaterad"
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Text"
@@ -4423,6 +4499,11 @@ msgstr "Version med endast text"
 msgid "Text:"
 msgstr "Text:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Text"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Tack för att du rapporterade detta ärende!"
@@ -4452,7 +4533,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Tack, vi är glada över att det har blivit åtgärdat. Har du rapporterat ett problem till en kommun tidigare?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr "Tack, du har aktiverat tvåfaktorsautentisering för ditt konto."
 
@@ -4464,27 +4545,29 @@ msgstr "Bilden verkar inte ha laddats upp korrekt (%s), vänligen försök igen.
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Den positionen verkar inte täckas av någon kommun och ligger eventuellt utanför kartan eller utanför landet. Försök gärna med en ny position."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Den positionen verkar inte vara i Sverige: försök gärna igen."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Det postnumret finns tyvärr inte."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Problemet har markerats som skickat."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Rapporten kommer nu att skickas om."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Rapporten har tagits bort från FixaMinGata."
 
@@ -4530,8 +4613,8 @@ msgstr "<strong>Jurisdiktion</strong> behövs bara om samma ändpunkt används a
 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 "<strong>Namnet</strong> är en text som representerar namnet på webbapplikationen som det vanligtvis visas för användaren (t.ex. i en lista bland andra applikationer, eller som en etikett för en ikon)."
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4585,7 +4668,7 @@ msgstr "Felet var: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "Följande Open311 v2-attribut returneras för varje begäran: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "Följande information om den närmaste vägen kan vara inexakt eller ogiltigt om problemet är nära flera olika vägar eller nära en väg utan ett namn i OpenStreetMap."
 
@@ -4647,8 +4730,8 @@ msgstr "Användaren kunde inte lokalisera problemet på kartan men angav en area
 msgid "The user has been sent a login email"
 msgstr "Användaren har blivit skickad ett inloggningsmejl"
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4681,7 +4764,7 @@ msgstr "Det finns liknande problem i området, är ett av dom ditt problem?"
 msgid "There is already a template with that title."
 msgstr "Det finns redan en svarsmall med den titeln."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr "Det finns redan en automatiskt svarsmall för denna kategori eller detta tillstånd."
 
@@ -4699,12 +4782,12 @@ msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen se
 msgid "There was a problem with your login information."
 msgstr "Det var ett problem med din inloggningsinformation."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr "Dina inloggningsuppgifter stämde inte. Om du inte kommer ihåg ditt lösenord, eller inte har ett lösenord, fyll då i ‘Nej’-sektionen av formuläret."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Det uppstod ett problem med din uppdatering. Försök igen."
 
@@ -4712,7 +4795,7 @@ msgstr "Det uppstod ett problem med din uppdatering. Försök igen."
 msgid "There were problems with your report. Please see below."
 msgstr "Det uppstod ett problem med din rapport. Se nedan."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Det uppstod ett problem med din uppdatering. Se nedan."
 
@@ -4788,10 +4871,10 @@ msgstr "Det här brevet har skickats till flera adresser eftersom rapportören i
 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 "Det här brevet har skickats till flera adresser eftersom rapportören inte angav någon kategori, eller den kategori som angavs hör till flera olika enheter. Du kan ignorera det här brevet om du inte är rätt person att hantera det, men det vore också mycket hjälpsamt om du kan ta reda på vem som är rätt person och anmäla detta till oss så att vi kan ändra databasen för framtida brev."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Den här informationen krävs"
 
@@ -4808,19 +4891,23 @@ msgstr "Detta är den <strong>offentliga</strong> text som kommer att visas på
 msgid "This is the problem"
 msgstr "Detta är problemet"
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr "Den här sidan är ett snabbt sätt att skapa många nya kommunanvändare i ett svep."
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Det här problemet har lösts"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Det här problemet har inte lösts"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr "Detta problem är fortfarande aktuellt"
 
@@ -4833,26 +4920,26 @@ msgstr "Denna rapport"
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr "Den här rapporten är en dublett. Lämna uppdateringar på den ursprungliga rapporten:"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Den här rapporten väntar på att granskas."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Den här rapporten är markerad som stängd"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Det här problemet är markerat som löst"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Den här rapporten är öppen"
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr "Den här rapporten är nu stängd för uppdateringar."
 
@@ -4860,15 +4947,18 @@ msgstr "Den här rapporten är nu stängd för uppdateringar."
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Länken ovan innehåller också ett foto av problemet."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "Nedlagd tid (i minuter):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4892,6 +4982,10 @@ msgstr "Titel"
 msgid "Title:"
 msgstr "Titel:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "Skriv in postnummer eller gatunamn och ort för %s för att se rapporter kring den platsen."
@@ -4917,7 +5011,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "För att visa en karta med den exakta positionen för problemet"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr "Token"
 
@@ -4942,11 +5036,6 @@ msgstr "Topp 5-kommuner"
 msgid "Total"
 msgstr "Totalt"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr "Krävs trafikövervakning?"
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr "Översättning"
@@ -4969,16 +5058,16 @@ msgstr "Prova att skicka ett e-brev till oss direkt:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr "Tvåfaktorsautentisering"
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr "Tvåfaktorsautentisering av aktiverats"
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr "Tvåfaktorsautentisering av inaktiverats"
 
@@ -4988,7 +5077,7 @@ msgstr "Tvåfaktorsautentisering av inaktiverats"
 msgid "Type"
 msgstr "Typ"
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr "Ta tillbaka förbud"
 
@@ -5018,10 +5107,10 @@ msgstr "Okänt fel"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "Okänt problemnummer"
 
@@ -5031,15 +5120,15 @@ msgstr "Okänt uppdaterings-ID"
 
 #: templates/web/base/reports/_list-filter-status.html:25
 msgid "Unshortlisted"
-msgstr "Okortlistade"
+msgstr "Ej i din lista"
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr "Upp en"
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Uppdatering"
 
@@ -5089,29 +5178,27 @@ msgstr "Uppdateringen öppnade rapporten på nytt"
 msgid "Update statuses"
 msgstr "Uppdaterad status"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Uppdaterad"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr "Uppdaterad av <strong>%s</strong> (%s) %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr "Uppdaterad av <strong>%s</strong> %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Uppdaterad!"
 
@@ -5122,7 +5209,7 @@ msgstr "Uppdaterad!"
 msgid "Updates"
 msgstr "Uppdateringar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Uppdateringar kan inte innehålla mer än %s tecken. Vänligen korta ner din uppdatering"
 
@@ -5152,6 +5239,14 @@ msgstr "Använd Open311-update-sending-utökningen"
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr "Använd detta för ärenden som medborgare ska kunna rapportera, men för vilka det inte finns något allmänt intresse att visa rapporten. T.ex. önskemål om en extra soptunna vid en specifik plats."
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr "Användar-ID att attribuera hämtade kommentarer till"
@@ -5165,8 +5260,8 @@ msgstr "Användarimport"
 msgid "User added to abuse list"
 msgstr "Användaren har lagts till i missbruklistan"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr "Användaren finns redan"
 
@@ -5184,7 +5279,7 @@ msgid "User flagged"
 msgstr "Användaren flaggad"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr "Användare i missbruktabell"
@@ -5197,27 +5292,25 @@ msgstr "Användarsökningen matchar mot användares namn och e-postadresser."
 msgid "User's alerts"
 msgstr "Användarens notifikationer"
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr "Användare:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Användare"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr "Användare kan tilldelas en eller flera roller för att ge dom alla rättigheter för dessa roller. Genom att välja en eller flera roller avaktiveras manuella val av rättigheter."
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr "Användare kan utföra följande åtgärder i deras tilldelade kommun eller område."
 
@@ -5225,9 +5318,9 @@ msgstr "Användare kan utföra följande åtgärder i deras tilldelade kommun el
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr "Användare med denna roll kan utföra följande åtgärder i deras tilldelade kommun eller område."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Värden uppdaterade"
 
@@ -5253,7 +5346,7 @@ msgstr "Verifiera telefonnummer"
 msgid "View report on site"
 msgstr "Visa rapporter på sidan"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Visa rapporter per område"
 
@@ -5261,7 +5354,7 @@ msgstr "Visa rapporter per område"
 msgid "View wards"
 msgstr "Visa kommuner"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr "Visa/Markera privata rapporter"
 
@@ -5279,7 +5372,7 @@ msgstr "Visa ett problem"
 msgid "Ward:"
 msgstr "Stadsdel:"
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Delområden i denna kommun"
 
@@ -5349,7 +5442,7 @@ msgstr "Vid avsändning"
 msgid "Which problems do you want alerts about?"
 msgstr "Vilka problem vill du få information om?"
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr "Vilken rapport är den en dublett av?"
 
@@ -5369,7 +5462,7 @@ msgstr "Inom den specificerade tidsramen:"
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "Vill du bidra till FixaMinGata? Vår kod är öppen programvara och <a href=\"https://fixmystreet.org\">tillgänglig på fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Vill du bli påmind om att kolla statusen med ett annat frågeformulär om fyra veckor?"
 
@@ -5381,7 +5474,6 @@ msgstr "Vill du bli notifierad när det här problemet uppdateras eller fixas?"
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Om du skriver ditt meddelande endast med versaler blir det svårare att läsa, precis som om du inte kommaterar korrekt."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5392,12 +5484,12 @@ msgstr "Om du skriver ditt meddelande endast med versaler blir det svårare att
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Ja"
 
@@ -5410,7 +5502,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr "Du är inte säker på ursprunget eller giltigheten för kontakten."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr "Du är offline"
 
@@ -5423,7 +5515,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Du vill anmäla missbruk, personlig inforation, eller motsvarande i följande uppdatering:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr "Du kan <a href=\"%s\">skapa en ny rapport på samma plats</a>."
 
@@ -5432,7 +5524,7 @@ msgstr "Du kan <a href=\"%s\">skapa en ny rapport på samma plats</a>."
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Du kan <a href=\"%s%s\">se problemet på den här webbplatsen</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Du kan lägga till en elakartade användares e-postadresser i missbrukarlistan, vilket automatiskt döljer (och aldrig skickar) rapporter som användarna skapar."
 
@@ -5462,7 +5554,7 @@ msgstr "Du kan hjälpa oss med att hitta kontaktadressen för %s och eposta till
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Du kan markera en förvaltning som borttagen om du inte vill att den skall vara aktiv på sajten."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr "Du kan inte döpa om en kategori till en existerande kategori."
 
@@ -5472,7 +5564,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Du nekade; vänligan fyll i rutan ovan"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr "Du har <a id=\"oFN\" href=\"\"><span>%s</span> sparad att skicka</a>."
 
@@ -5480,7 +5572,7 @@ msgstr "Du har <a id=\"oFN\" href=\"\"><span>%s</span> sparad att skicka</a>."
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Du har redan svarat på det här frågeformuläret. Om du har en fråga, <a href=\"%s\">kontakta oss</a> eller <a href=\"%s\">visa problemet</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Du har redan bifogat filer till den här rapporten. Notera att du kan bifoga som mest tre till rapporten (om du försöker ladda upp fler tas de tidigaste bort)."
 
@@ -5489,8 +5581,7 @@ msgstr "Du har redan bifogat filer till den här rapporten. Notera att du kan bi
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "Du har redan bifogat bilder till den här rapporten. Notera att du kan bifoga som mest tre bilder (om du försöker ladda upp fler tas de tidigaste bort)."
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr "Du har redan bifogat foton till din uppdatering. Notera att du kan bifoga som mest tre bilder (om du försöker ladda upp fler tas de tidigaste bort)."
 
@@ -5535,7 +5626,7 @@ msgstr "Du har inte skapat några rapporter än.  <a href=\"%s\">Rapportera ett
 
 #: templates/web/base/my/planned.html:21
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr "Du har inte satt några rapporter på slutlistan än."
+msgstr "Du har inte några rapporter i din lista än."
 
 #: templates/web/base/admin/index.html:19
 msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent."
@@ -5554,9 +5645,9 @@ msgstr "Dina rapporter"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Ditt konto"
@@ -5565,13 +5656,14 @@ msgstr "Ditt konto"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr "Ditt konto kräver tvåfaktorsautentisering."
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5600,16 +5692,16 @@ msgstr "Ditt namn och efternamn"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr "Ditt namn har redan skickats till %s, men vi kan dölja det på den här sidan:"
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr "Ditt namn har dolts från alla dina rapporter och uppdateringar."
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr "Ditt namn har dolts."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr "Dina offline-rapporter"
 
@@ -5629,8 +5721,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr "Ditt lösenord är gammalt, skapa ett nytt nedan. När du klickar på länken i vårt e-postmeddelande så kommer ditt lösenord att uppdateras."
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr "Ditt lösenord måste inkludera %d eller fler tecken."
@@ -5652,7 +5744,7 @@ msgstr "Dina rapporter"
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
 msgid "Your shortlist"
-msgstr "Din slutlista"
+msgstr "Din lista"
 
 #: templates/web/base/auth/generate_token.html:8
 msgid "Your token has been generated"
@@ -5663,7 +5755,7 @@ msgid "Your update"
 msgstr "Din uppdatering"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr "Din uppdatering har blivit sparad offline för att skickas när du kommer tillbaka online."
 
@@ -5694,19 +5786,19 @@ msgstr "administratör"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "samtliga"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr "en administratör"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr "och en defekt uppförd"
 
@@ -5714,8 +5806,8 @@ msgstr "och en defekt uppförd"
 msgid "by %s"
 msgstr "av %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "kommun"
 
@@ -5746,6 +5838,10 @@ msgstr "ändra användare"
 msgid "from %s different users"
 msgstr "från %s olika användare"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5763,7 +5859,7 @@ msgstr "Ej tillgängligt"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr "inga"
 
@@ -5843,12 +5939,12 @@ msgid "today"
 msgstr "idag"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr "uppdatering"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr "uppdateringar"
 
@@ -5873,7 +5969,7 @@ msgid "user removed from abuse list"
 msgstr "användare borttagen från missbruklista"
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "område"
 
@@ -5933,7 +6029,7 @@ msgid_plural "%d years"
 msgstr[0] "%d år"
 msgstr[1] "%d år"
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5954,7 +6050,7 @@ msgid_plural "%s problems reported"
 msgstr[0] "%s problem rapporterat"
 msgstr[1] "%s problem rapporterade"
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5975,21 +6071,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> löst problem senaste månaden"
 msgstr[1] "<big>%s</big> lösta problem senaste månaden"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> rapport senaste veckan"
 msgstr[1] "<big>%s</big> rapporter senaste veckan"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> rapport nyligen"
 msgstr[1] "<big>%s</big> rapporter nyligen"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6024,16 +6120,34 @@ msgid_plural "last updated %d days ago"
 msgstr[0] "senast uppdaterad för %d dag sedan"
 msgstr[1] "senast uppdaterad för %d dagar sedan"
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] "månad"
 msgstr[1] "månader"
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] "rapport"
 msgstr[1] "rapporter"
+
+#~ msgid "Closed by council"
+#~ msgstr "Stängd av kommunen"
+
+#~ msgid "Current token:"
+#~ msgstr "Nuvarande token:"
+
+#~ msgid "Filter report list"
+#~ msgstr "Filtrera rapportlista"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Inkorrekt värde för agency_responsible, \"%s\""
+
+#~ msgid "Post"
+#~ msgstr "Skicka"
+
+#~ msgid "Traffic management required?"
+#~ msgstr "Krävs trafikövervakning?"
diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po
index fb4a4c240..2ccde09b7 100644
--- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/mysociety/teams/12067/tr_TR/)\n"
@@ -20,8 +20,8 @@ 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/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "ve"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - Özet raporlar"
 
@@ -111,7 +111,7 @@ msgstr "%s bildirim &ndash; %s cevaplandı (%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s ref:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>katkıda bulunanlar"
 
@@ -157,6 +157,8 @@ msgstr "(artık mevcut değil)"
 msgid "(not sent to council)"
 msgstr "(kurula gönderilmemiş)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(her ikisine de gönderildi)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr "(%s problemi için RSS bildirimimiz var)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Kategori seçiniz--"
@@ -205,17 +207,18 @@ msgstr ""
 "Belkide yapılandırma dosyanıza bazı <code>MAPIT_TYPES</code> eklemelisiniz?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -245,7 +248,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Evet</strong> şifrem var"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -262,7 +265,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -286,7 +289,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Aşağıdaki formu kullanarak iletişim bilgisi ekleyin"
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Yeni kategori ekle"
@@ -319,7 +322,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Yeni kategori ekle"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr "opsiyon ekle"
 
@@ -328,8 +331,8 @@ msgstr "opsiyon ekle"
 msgid "Add phone number"
 msgstr "telefon numarası ekle"
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -337,21 +340,20 @@ msgid "Add to shortlist"
 msgstr "kısa listeye ekle"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Kullanıcı ekle"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "problem kategorisi ekle/düzenle"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -367,6 +369,12 @@ msgstr ""
 msgid "Admin"
 msgstr "yönetici"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Tekrar:"
@@ -379,8 +387,8 @@ msgstr "Uyarı %d için oluşturulmuş %s, tür %s, değişkenler %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "Uyarı %d engellendi (oluşturuldu %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Güncellemeleri bildir"
 
@@ -392,10 +400,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr "tümü"
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Tüm Bildirimler"
@@ -435,6 +445,11 @@ msgstr "%s ve %s arasındaki tüm bildirimler"
 msgid "All time"
 msgstr "her zaman"
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "%s kategorisine bildirilmiştir"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -471,7 +486,7 @@ msgstr "Anonim"
 msgid "Anonymous user"
 msgstr "isimsiz kullanıcı"
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -484,7 +499,7 @@ msgid "Another user"
 msgstr "başka kullanıcı"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -493,8 +508,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -505,7 +520,7 @@ msgstr ""
 msgid "Area covered"
 msgstr "Kapsadığı alan"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -519,27 +534,32 @@ msgstr "Burası geçiş sayfası ve %s yanlış olduğu için, bu sayfada yapıl
 msgid "Assign selected to role:"
 msgstr "%s atamak"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Farklı bir kategori atamak:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Dışarıdan bir organ atamak:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Alt bölüm atamak:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "tüm kategoriler"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "%s atamak"
@@ -552,7 +572,7 @@ msgstr "En çok geri dönen %d talepler sorgulama neticesinde geri dönmüştür
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Şu an sadece arama ve raporlara göz atma kısımları çalışıyor."
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -560,11 +580,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -576,12 +596,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Denetleme bekliyor"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Geri"
@@ -602,14 +623,12 @@ msgstr "kullanıcıyı yasakla"
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Bölümler"
 
@@ -622,11 +641,13 @@ msgstr "Bölümler"
 msgid "Body"
 msgstr "Bölüm"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Bölüm:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -638,8 +659,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Haritayı göremiyor musunuz? <em>Bu adımı atlayın</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -655,15 +675,13 @@ msgstr "Kategoriler:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -673,7 +691,7 @@ msgstr "Kategori"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -696,6 +714,11 @@ msgstr "Kategori:"
 msgid "Change"
 msgstr "değiştir"
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Şifreyi değiştir"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -712,7 +735,7 @@ msgstr "Şifreyi değiştir"
 msgid "Change phone number"
 msgstr "telefon numarasını değiştir"
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -724,12 +747,12 @@ msgstr ""
 "Herkes tarafından kolay anlaşılabilecek bir <strong>kategori</strong> ismi seçin (ör: \"çukur\", \"sokak lambası\") aynı zamanda birime de\n"
 "yardımcı olacak. Bunlar problem-bildir sayfasındaki açılan menüde görüntülenecektir."
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -766,8 +789,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -777,11 +800,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Kapalı"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Kurul tarafından kapatıldı"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -814,13 +833,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Yapılandırma"
@@ -937,7 +955,7 @@ msgstr "Bildiri oluştur"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Kategori oluştur"
@@ -947,27 +965,25 @@ msgstr "Kategori oluştur"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr ""
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Oluşturuldu"
@@ -976,6 +992,17 @@ msgstr "Oluşturuldu"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Oluşturuldu"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Oluşturuldu"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -987,10 +1014,6 @@ msgstr "Oluşturuldu:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -1000,19 +1023,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "Şu anda hiçbir organları oluşturulmamıştır."
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Kontrol Paneli "
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1024,7 +1049,7 @@ msgstr "Alt komisyon tarafından 5 iş günü içinde üstesinden gelinilecek"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1034,7 +1059,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr ""
@@ -1056,9 +1081,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Tanım"
 
@@ -1067,7 +1090,7 @@ msgstr "Tanım"
 msgid "Destination"
 msgstr "Tanım"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1103,7 +1126,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1111,6 +1134,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "%s kategorisine bildirilmiştir"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "%s kategorisine bildirilmiştir"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1145,24 +1178,24 @@ msgstr "Don&rsquo;t know"
 msgid "Don't like forms?"
 msgstr "Şekilleri beğenmediniz mi?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1174,7 +1207,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1186,7 +1219,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Ekle"
@@ -1197,12 +1230,11 @@ msgstr "Ekle"
 msgid "Edit body details"
 msgstr "Bölümün detaylarını düzenle"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1210,17 +1242,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1257,8 +1287,9 @@ msgstr "Editör"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1267,15 +1298,14 @@ msgstr "Editör"
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1295,12 +1325,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "E-posta:"
@@ -1367,12 +1398,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Varılan nokta"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Bir Z&uuml;rich sokak ismi giriniz"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Yakınlardaki bir posta kodu, cadde veya bölge ismi giriniz"
 
@@ -1399,10 +1430,10 @@ msgstr "Problem hakkında detaylı bilgi giriniz"
 msgid "Error"
 msgstr "Hata"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr ""
 
@@ -1415,7 +1446,7 @@ msgstr "Örnek postakodu "
 msgid "Examples:"
 msgstr "Örnekler:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1424,7 +1455,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1449,7 +1480,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1461,20 +1492,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "İlave veriler:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1507,20 +1538,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Bildiri listesini filtrele"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "İlk kez"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Son zamanlarda bildirilen çevredeki fotoğraflar "
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Yeni bildiriler"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
@@ -1550,7 +1586,7 @@ msgstr "Silindi olarak seçildi"
 msgid "Flag user"
 msgstr "Kullanıcıyı seç"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Seçildi"
@@ -1559,7 +1595,7 @@ msgstr "Seçildi"
 msgid "Flagged reports and users"
 msgstr "Seçilen bildirimler ve kullanıcılar"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Seçilen kullanıcılar <a href='%s'>etiketliler</a>sayfasında listelendi."
 
@@ -1567,8 +1603,8 @@ msgstr "Seçilen kullanıcılar <a href='%s'>etiketliler</a>sayfasında listelen
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Seçilen kullanıcılar hiç bir şekilde kısıtlanmamıştır. Bu sadece dikkate alınmak üzere işaretlenen kullanıcıların listesidir."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Seçilenler:"
 
@@ -1594,11 +1630,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Şifrenizi mi unuttunuz?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1608,12 +1644,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Sıkça Sorulan Sorular"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1635,7 +1679,7 @@ msgstr "%s Problemlerin güncellemelerini yap"
 msgid "Get updates of problems in this %s"
 msgstr " Bu %s'te problemlerin güncellemelerini yap"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Bana RSS hakkında geri dönüş yapın"
 
@@ -1651,15 +1695,15 @@ msgstr "Problemin çözüldüğünü duymak güzel"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1669,7 +1713,7 @@ msgstr "Git"
 msgid "Going to send questionnaire?"
 msgstr "Anket gönderecek misiniz?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1695,6 +1739,7 @@ msgstr "Daha önce bir problemi bir kurula bildirdiniz mi, yoksa bu ilk defa mı
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1729,7 +1774,8 @@ msgstr "Gizli"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1757,7 +1803,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "İğneler gizle"
 
@@ -1811,11 +1857,9 @@ msgstr "Maalesef veri tabanında sorunun yerini bulamadık.\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "Kimlik"
 
@@ -1834,15 +1878,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1856,7 +1900,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1880,7 +1924,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1917,7 +1961,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1941,6 +1985,17 @@ msgstr "Gereksiz bölümüne atılsın mı?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "bölge"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1950,20 +2005,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr "Gelen kutusu boş "
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Bildiren kişinin kişisel bilgilerini dahil et"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Hatalı sahip_fotoğraf değer \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1980,16 +2035,12 @@ msgstr "İç notlar"
 msgid "Internal notes"
 msgstr "İç notlar"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Geçersiz ajans_sorumlu değer %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Geçersiz format %s belirlenmiş."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Geçersiz konum. Aynı konsil tarafından yeni konum girilmeli."
 
@@ -2041,13 +2092,13 @@ msgstr "Son güncelleme:"
 msgid "Last&nbsp;update:"
 msgstr "Son&nbsp;güncelleme:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2064,7 +2115,7 @@ msgstr "Bildirilmiş problemleri güncelle"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Yükleniyor..."
@@ -2102,17 +2153,18 @@ msgid "Log in with Twitter"
 msgstr "Twitter ile giriş yap"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2131,19 +2183,20 @@ msgstr ""
 msgid "MAP"
 msgstr "HARİTA"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2157,24 +2210,24 @@ msgstr "Harita"
 msgid "Mark as sent"
 msgstr "Gönderildi olarak işaretle"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "İleti"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2187,7 +2240,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Eksik yetki_id"
 
@@ -2195,8 +2248,7 @@ msgstr "Eksik yetki_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2219,7 +2271,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "Bir iş gününe bölünmüş bir şekilde yönetilmiştir"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2229,14 +2281,14 @@ msgstr ""
 msgid "Month"
 msgstr "Ay"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2264,9 +2316,10 @@ msgstr ""
 msgid "Name"
 msgstr "İsim"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "İsim:"
@@ -2284,7 +2337,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
@@ -2292,12 +2345,12 @@ msgstr ""
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2320,7 +2373,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Yeni bölüm eklendi"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Yeni kategori bilgisi eklendi"
 
@@ -2334,8 +2387,8 @@ msgstr ""
 msgid "New field"
 msgstr "alan ekle"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Yeni iç bilgi notu: "
 
@@ -2343,13 +2396,13 @@ msgstr "Yeni iç bilgi notu: "
 msgid "New local problems on FixMyStreet"
 msgstr "FixMyStreet'taki yeni yerel problemler"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2426,7 +2479,7 @@ msgstr ""
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2439,7 +2492,6 @@ msgstr "Sonraki"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2448,11 +2500,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Hayır"
 
@@ -2464,11 +2516,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Birim yok"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Seçilmiş kurul yok"
 
@@ -2484,8 +2537,8 @@ msgstr "İşaretlenen problemler bulunamadı."
 msgid "No flagged users found."
 msgstr "İşaretlenen kullanıcılar bulunamadı."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Güncelleme yok"
 
@@ -2521,15 +2574,15 @@ msgstr "Destek sağlayıcı yok"
 msgid "None"
 msgstr "Hiçbiri"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2537,10 +2590,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Benim bölümüm için değil"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Daha önce bildirilmedi"
@@ -2588,12 +2645,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2601,12 +2658,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Eski durum"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2615,7 +2672,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2646,7 +2703,7 @@ msgstr "Open311 giriş sayfası"
 msgid "Open311 specification"
 msgstr "Open311 özellikleri"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2658,7 +2715,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2666,16 +2723,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2707,7 +2764,7 @@ msgstr "Sayfa bulunamadı"
 msgid "Parent"
 msgstr "Ebeveyn"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "tüm kategoriler"
@@ -2716,13 +2773,13 @@ msgstr "tüm kategoriler"
 msgid "Partial"
 msgstr "Kısmi"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Şifre (isteğe bağlı)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Şifren değiştirildi"
@@ -2737,7 +2794,7 @@ msgstr "Şifre (isteğe bağlı)"
 msgid "Permissions"
 msgstr "Permalink"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2745,19 +2802,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Telefon:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Telefon numarası"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Telefon numarası (isteğe bağlı)"
 
@@ -2765,30 +2827,26 @@ msgstr "Telefon numarası (isteğe bağlı)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Telefon:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2808,9 +2866,8 @@ msgstr ""
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2819,7 +2876,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr "Son zamanlarda bildirilen çevredeki fotoğraflar "
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2833,6 +2890,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Harita üzerine işaretleyin"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2860,27 +2922,26 @@ msgid "Please check your email address is correct"
 msgstr "E-posta adresinizin doğruluğunu kontrol ediniz"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Kategori seçiniz"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2899,27 +2960,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Mesaj giriniz"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2932,16 +2993,16 @@ msgstr "Şifre giriniz"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Konu giriniz"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2952,20 +3013,20 @@ msgstr "Geçerli e-posta giriniz"
 msgid "Please enter a valid email address"
 msgstr "Geçerli e-posta adresi giriniz"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Lütfen bir kaç ayrıntı giriniz"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2981,7 +3042,7 @@ msgid "Please enter your first name"
 msgstr "Ad giriniz"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Lütfen adınızı ve soyadınızı giriniz, kurullar için gereklidir – eğer isminizin sitede kullanılmasını istemiyorsanız, aşağıda bulunan kutucuktan tiki kaldırınız."
@@ -2993,9 +3054,9 @@ msgstr "Lütfen isminizi giriniz"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Lütfen isminizi giriniz"
@@ -3036,19 +3097,19 @@ msgstr "Lütfen aşağıda verilen formu problemin detayları ile ilgili dolduru
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Başka bir anket doldurmak istediğinizi belirtiniz."
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Geçerli e-posta adresi giriniz"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3075,24 +3136,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Lütfen dikkat:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Bu bildirimi neden paylaşatığınza dair lütfen bir kaç açıklama yapın"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Hem metin hem de fotoğraf ekleyiniz"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Bir kurula daha önce sorun bildirip bildirmediğinizi belirtin"
 
@@ -3100,7 +3165,7 @@ msgstr "Bir kurula daha önce sorun bildirip bildirmediğinizi belirtin"
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3112,7 +3177,7 @@ msgstr "Bilgilendirme seçiniz"
 msgid "Please select the type of alert you want"
 msgstr "İstediğiniz bir bildiri şekli secin"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Problemin giderilmiş veya giderilmemiş olması durumunu bildiriniz lütfen"
 
@@ -3120,12 +3185,12 @@ msgstr "Problemin giderilmiş veya giderilmemiş olması durumunu bildiriniz lü
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3133,27 +3198,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Mesaj gönderin"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Paylaş"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "%s Anonim olarak gönderildi"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Tarafından paylaşıldı %s saat %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "<strong>%s</strong> (%s) tarafından %s 'te paylaşılmıştır"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "<strong>%s</strong> tarafından %s 'te paylaşılmıştır"
 
@@ -3169,7 +3230,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3177,11 +3238,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Önceki"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3197,9 +3258,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Özel"
 
@@ -3248,7 +3309,7 @@ msgstr "Problem %s kurula gönderildi %s"
 msgid "Problem breakdown by state"
 msgstr "Sorun devlet tarafından meydana gelmiştir"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Problem çözülmemiş olarak işaretlenmiştir."
 
@@ -3256,8 +3317,7 @@ msgstr "Problem çözülmemiş olarak işaretlenmiştir."
 msgid "Problem state change based on survey results"
 msgstr "Araştırma sonucu göz önünde bulundurularak problemin durumundaki değişim"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Sorunlar"
@@ -3282,18 +3342,18 @@ msgstr "FixMyStreet'te kısa bir süre önce onarıldı olarak bildirilen proble
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "%s deki problemler"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "%s semtindeki sorunlar"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3301,7 +3361,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3309,11 +3369,15 @@ msgstr ""
 msgid "Property address:"
 msgstr "Emlak adresi:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3327,11 +3391,11 @@ msgstr "Güncellemeye izin ver"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Şifre sağlamak isteğe bağlıdır, fakat şifre almış olmanız durumunda sorunları bildirmek, güncellemeleri yapmak ve bildirimleri yönetmek daha kolay olacaktır."
 
@@ -3339,12 +3403,12 @@ msgstr "Şifre sağlamak isteğe bağlıdır, fakat şifre almış olmanız duru
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Toplumsal geri bildirim:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3387,11 +3451,11 @@ msgstr "Anket sorun bildirici tarafından dolduruldu"
 msgid "RSS feed"
 msgstr "RSS besleme"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "%s için RSS Besleme"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "%s için %s gözetiminde RSS besleme"
 
@@ -3399,11 +3463,11 @@ msgstr "%s için %s gözetiminde RSS besleme"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "%s için RSS besleme"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "%s içinde %s gözetimiyle RSS besleme"
 
@@ -3411,13 +3475,13 @@ msgstr "%s içinde %s gözetimiyle RSS besleme"
 msgid "RSS feed of nearby problems"
 msgstr "Civardaki problemlerle alakalı RSS besleme"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "%s içerisindeki problemlerle alakalı RSS besleme"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "%s bölgesi içerisindeki problemlerle alakalı RSS besleme"
 
@@ -3431,11 +3495,11 @@ msgstr "Son günlerdeki yerel problemlerle alakalı RSS besleme"
 msgid "RSS feed of updates to this problem"
 msgstr "Bu problemin güncellemelerini RSS olarak besle"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3448,7 +3512,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Bu sorunda herhangi bir güncelleme olduğunda e-posta ile bildir."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3462,7 +3526,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Yakın zamanda bildirilen problemler"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3475,7 +3539,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "Şehir Dedektifi uygulamasının temel amacının, kamusal alanlardaki alt ve üst yapıları ile alakalı problemlerin ilgili kurumlara iletilmesini sağlamak olduğunu hatırlatır, bahse konu alanlar dışındaki problem veya şikayetlerin ilgili kuruma direk olarak iletilmesini tavsiye ederiz."
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3487,8 +3552,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "İşareti kaldır"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3504,17 +3569,21 @@ msgstr ""
 msgid "Remove option"
 msgstr "opsiyon ekle"
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Fotoğrafı kaldır (mümkün olmayabilir)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr ""
 
@@ -3522,14 +3591,14 @@ msgstr ""
 msgid "Report"
 msgstr "Bildirim"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3538,7 +3607,7 @@ msgid "Report a problem"
 msgstr "Bir problem bildir"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3554,7 +3623,7 @@ msgid "Report anonymously"
 msgstr "%s 'e ananim olarak bildirilmiş"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3590,7 +3659,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Yerel problemleri bildir, göster ve tartış"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "%s 'e ananim olarak bildirilmiş"
@@ -3601,7 +3670,7 @@ msgstr "%s 'e ananim olarak bildirilmiş"
 msgid "Reported before"
 msgstr "Önceden bildirilmiş"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "%s tarafından %s de bildirilmiştir"
@@ -3615,27 +3684,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "%s kategorisine bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "%s kategorisine anonim olarak %s de bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr " %s tarafından %s kategorisinde %s de bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "%s aracılığıyla anonim olarak %s de bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "%s yoluyla %s tarafından %s da bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "%s aracılığıyla %s kategorisine anonim olarak %s de bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr " %s tarafından %s kategorisinde %s aracılığıyla %s 'e bildirilen raporlar"
 
@@ -3654,17 +3723,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr "Bir problemin bildirilmesi"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Bildirimler"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3692,15 +3759,15 @@ msgid "Reports published"
 msgstr "Yayınlanmış bildirimler"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3713,7 +3780,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3766,39 +3833,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "Doğru yer mi?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Bu isimli yol için yol operatörü (yol referans numarası ve türünden elde edilmiş): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Bu isimli yol için yol operatörü (OpenStreetMap'ten): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Sola Yerleştir"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3814,20 +3887,20 @@ msgstr ""
 msgid "Satellite"
 msgstr "Uydu"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3844,13 +3917,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Bildirimleri ara"
 
@@ -3863,7 +3935,7 @@ msgstr "Kullanıcı Ara"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Bildirimleri ara"
 
@@ -3878,12 +3950,12 @@ msgstr "Ara:"
 msgid "Searching found no reports."
 msgstr "Aranan sonuç bulunamadı."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Arama sonucu kullanıcı bulunamadı"
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3893,8 +3965,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3904,7 +3975,7 @@ msgid "Select a body"
 msgstr "Bir bölüm seç"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Bölge seç"
@@ -3925,7 +3996,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3938,7 +4009,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3947,11 +4018,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "%s %s sonra gönder"
 
@@ -3989,7 +4060,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4000,7 +4071,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4025,8 +4096,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4037,7 +4108,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "İşaretlemeleri göster"
 
@@ -4097,7 +4168,7 @@ msgid "Some photos of recent reports"
 msgstr "Son bildirimlerden bazı fotograflar"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Konumun belirlenebilmesi için tarif"
 
@@ -4106,12 +4177,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Üzgünüz, bu posta kodu bizim sınırlarımız dışında yer almaktadır."
 
@@ -4129,9 +4199,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Üzgünüz, sorununuzu onaylarken bir hata oluştu."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Üzgünüz, konum bulunamadı."
 
@@ -4141,13 +4211,13 @@ msgstr "Üzgünüz, konum bulunamadı."
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Üzgünüz, konum ayrıştırılamadı. Daha sonra tekrar deneyin."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4162,11 +4232,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4175,11 +4245,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4203,18 +4273,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Devlet"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4223,31 +4293,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Devlet:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "İstatistik"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Durum"
 
@@ -4265,7 +4332,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Alt bölüm/Bölüm"
 
@@ -4284,50 +4351,48 @@ msgstr "Konu:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Kaydet"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Değişiklikleri kaydet"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Anketi kaydet"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Kaydedildi"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Kaydet"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4340,7 +4405,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Güncellemeler %s uzunluğunda karakter ile sınırlıdır. Lütfen güncellemenizi kısaltın."
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4354,20 +4419,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Özet"
 
@@ -4378,14 +4442,19 @@ msgstr "Özet bildirimler"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4403,13 +4472,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Metin"
@@ -4431,6 +4504,11 @@ msgstr "Salt metin sürümü "
 msgid "Text:"
 msgstr "Metin:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Metin"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Bu konuyu bildirdiğiniz için teşekkür ederiz!"
@@ -4460,7 +4538,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Teşekkürler, sorunun hallolduğuna sevindim. Bu sorunu daha önce herhangi bir birime bildirmiş miydiniz?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4472,27 +4550,29 @@ msgstr "Bu şekilde resim doğru yüklemiş gibi görünmüyor (%s), lütfen tek
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Bu konuma bir kurul tarafından ele alınacak gibi görünmüyor; belki de deniz ya da ülke dışındadır. Lütfen tekrar deneyin."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "Konum İngiltere'de görünmüyor; lütfen tekrar deneyin."
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Üzgünüz, bu posta kodu bulunamadı."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "Problem gönderildi olarak işaretlenmiştir."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Bu problem yeniden gönderilecektir."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Bu bildirim FixMyStreet'ten kaldırılmışır."
 
@@ -4538,8 +4618,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4594,7 +4674,7 @@ msgstr "Hata buydu: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "Eğer problem farklı yollarla ilgili veya OpenStreetMap'te kayıtlı olmayan bir isim ise,  En yakın yol ile ilgili şu bilgi yanlış ya da alakasız olabilir."
 
@@ -4656,8 +4736,8 @@ msgstr "Kullanıcı sorunu harşta üzerinde konumlandıramadı ama onların gir
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4690,7 +4770,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4708,12 +4788,12 @@ msgstr "Bu sayfa görüntülenirken bir sorun oluştu. Lütfen daha sonra tekrar
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Güncelleme esnasında bir hata oluştu. Lütfen tekrar deneyiniz."
 
@@ -4721,7 +4801,7 @@ msgstr "Güncelleme esnasında bir hata oluştu. Lütfen tekrar deneyiniz."
 msgid "There were problems with your report. Please see below."
 msgstr "Bildiriminiz esnasında hata oluştu. Lütfen aşağıya bakınız."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "Güncellemede bir hata oluştu. Lütfen aşağıya bakınız."
 
@@ -4797,10 +4877,10 @@ msgstr "Kullanıcının problemi sınıflandırmama durumunda, bu e-posta proble
 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 "Bu e-posta problemin konumunu kapsayan çeşitli kurullara gönderilmiştir. Seçilmiş kategori kurulun yetki alanı dışındaysa, bu sorunu dikkate almayın."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Bu bilgi gereklidir"
 
@@ -4817,19 +4897,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Bu problem çözüldü"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Bu problem giderilemedi"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4842,26 +4926,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Bu rapor işlenmeyi bekliyor."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Bu rapor şu an kapalı olarak işaretlenmiş."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Bu rapor şu an onarıldı olarak işaretlenmiş."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Bu rapor şu an açık olarak işaretlenmiş."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4869,15 +4953,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Bu internet sitesine problemin fotoğrafı da kullanıcı tarafından eklenmiştir. "
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4901,6 +4988,10 @@ msgstr "Başlık"
 msgid "Title:"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4926,7 +5017,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "Bu konudaki kesin lokasyonu haritasını göstermek için"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4951,11 +5042,6 @@ msgstr ""
 msgid "Total"
 msgstr "Toplam"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4978,16 +5064,16 @@ msgstr "Direkt olarak e-posta gönderin:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4997,7 +5083,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5027,10 +5113,10 @@ msgstr "Bilinmeyen hata"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "Bilinmeyen ID problemi"
 
@@ -5042,13 +5128,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Güncelleme"
 
@@ -5099,29 +5185,27 @@ msgstr "Tekrardan değerlendirilen problemi güncelle"
 msgid "Update statuses"
 msgstr "Güncelleme durumu"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Güncellendi"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Güncellendi!"
 
@@ -5132,7 +5216,7 @@ msgstr "Güncellendi!"
 msgid "Updates"
 msgstr "Güncellemeler"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Güncellemeler %s uzunluğunda karakter ile sınırlıdır. Lütfen güncellemenizi kısaltın."
 
@@ -5162,6 +5246,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5175,8 +5267,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5194,7 +5286,7 @@ msgid "User flagged"
 msgstr "Kullanıcı etiketlendi"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5207,27 +5299,25 @@ msgstr "Arama sonuçları kullanıcı adı ve e-posta adresi ile uyumludur."
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5235,9 +5325,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Değerler güncellendi"
 
@@ -5263,7 +5353,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Raporun sitede görüntülemek"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Semte göre bildirimleri görüntüle"
 
@@ -5271,7 +5361,7 @@ msgstr "Semte göre bildirimleri görüntüle"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5289,7 +5379,7 @@ msgstr "Bir problemi görüntülemek"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Bu kurulun ilgilendiği bölge"
 
@@ -5359,7 +5449,7 @@ msgstr "Gönderildiğinde"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5379,7 +5469,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "FixMyStreet'e katkıda bulunmak ister misin? Şifremiz herkese açıktır ve <a href=\"https://fixmystreet.org\"> burdan ulaşılabilir fixmystreet.org</a>."
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Durumunu kontrol etmek için 4 hafta sonra bir anket yolu ile hatırlatma ister misiniz?"
 
@@ -5391,7 +5481,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Gönderdiğin bildiriminin kalıp halinde ve eksik noktalama işaretleri ile olması, okumayı zorlaştırıyor."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5402,12 +5491,12 @@ msgstr "Gönderdiğin bildiriminin kalıp halinde ve eksik noktalama işaretleri
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Evet"
 
@@ -5420,7 +5509,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr "Çevrimdışısınız"
 
@@ -5433,7 +5522,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "Aşağıdaki kişisel bilgi veya benzeri kötü niyetli raporları içeren güncellemeleri bildiriyorsun: "
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5442,7 +5531,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Problemi <a href=\"%s%s\">bu site üzerinde görüntüleyebilir siniz</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "Kötü niyetli bir kullanıcının e-postasını otomatik olarak gizlenen (ve asla gönderilmeyen) raporların bulunduğu kara listeye ekleyebilirsiniz."
 
@@ -5474,7 +5563,7 @@ msgstr "Lokal problemler için bize iletişim kurabileceğimiz e-posta adresi bu
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "Eğer bir bölümü sitede aktif olarak bulunsun istemiyorsanız, silindi olarak işaretleyebilir siniz."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5484,7 +5573,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Kabul etmediniz; lütfen yukardaki kutuyu doldurun"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5492,7 +5581,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "Bu anketi doldurdunuz. Eğer bir sorunuz var ise, lütfen <a href='%s'>iletişime geçin</a>, veya <a href='%s'>problemini sun</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5501,8 +5590,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5566,9 +5654,9 @@ msgstr "Bildirimlerin"
 
 #: templates/web/base/auth/2fa/intro.html:12
 #: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Hesabınız"
@@ -5577,13 +5665,14 @@ msgstr "Hesabınız"
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5612,16 +5701,16 @@ msgstr "Adınız"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr "İsminiz%s'e gönderildi, ancak şu sayfada adınızı gizleyemedik:"
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr "İsminiz tüm rapor ve güncellemelerde gizlendi."
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr "İsminiz gizlendi."
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr "Çevrimdışı raporlarınız"
 
@@ -5641,8 +5730,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5675,7 +5764,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5706,19 +5795,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "tümü"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5726,8 +5815,8 @@ msgstr ""
 msgid "by %s"
 msgstr "%s tarafından"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "Kurul"
 
@@ -5758,6 +5847,10 @@ msgstr "kullanıcı düzenle"
 msgid "from %s different users"
 msgstr " %s farklı kullanıcılardan"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5775,7 +5868,7 @@ msgstr "n/a"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr "hiçbiri"
 
@@ -5858,12 +5951,12 @@ msgid "today"
 msgstr "bugün"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr "güncelleme"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr "güncellemeler"
 
@@ -5888,7 +5981,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "bölge"
 
@@ -5948,7 +6041,7 @@ msgid_plural "%d years"
 msgstr[0] "%d yıl"
 msgstr[1] "%d yıl"
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5969,7 +6062,7 @@ msgid_plural "%s problems reported"
 msgstr[0] "%s raporlanan problem"
 msgstr[1] "%s raporlanan problem"
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -5990,21 +6083,21 @@ msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "<big>%s</big> geçen ay onarıldı"
 msgstr[1] "<big>%s</big> geçen ay onarıldı"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> geçen haftaki bildirimler"
 msgstr[1] "<big>%s</big> geçen haftaki bildirimler"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "<big>%s</big> son bildirimler"
 msgstr[1] "<big>%s</big> son bildirimler"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6039,20 +6132,32 @@ msgid_plural "last updated %d days ago"
 msgstr[0] "son güncelleme %dgün önce"
 msgstr[1] "son güncelleme %dgün önce"
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] "raporlar"
 msgstr[1] "raporlar"
 
+#~ msgid "Closed by council"
+#~ msgstr "Kurul tarafından kapatıldı"
+
+#~ msgid "Filter report list"
+#~ msgstr "Bildiri listesini filtrele"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Geçersiz ajans_sorumlu değer %s"
+
+#~ msgid "Post"
+#~ msgstr "Paylaş"
+
 #~ msgid "(ignored if type is \"String\")"
 #~ msgstr "(\"String\" yazılırsa yoksay)"
 
diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po
index 9ded4de18..3267b3dbf 100644
--- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Ukrainian (Ukraine) (https://www.transifex.com/mysociety/teams/12067/uk_UA/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "і"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s - підсумкових звітів"
 
@@ -111,7 +111,7 @@ msgstr "%s опитувань надіслано &ndash; на %s відпові
 msgid "%s ref:&nbsp;%s"
 msgstr "%s посилання:&nbsp;%s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -157,6 +157,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "(не відправлено муніципалітету)"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -175,8 +177,8 @@ msgstr "(відправлено обидвом)"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "-- Оберіть категорію --"
@@ -205,17 +207,18 @@ msgstr ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -245,7 +248,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Так</strong> В мене є пароль"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -262,7 +265,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -282,7 +285,7 @@ msgstr "Додайте <strong>запис</strong> для кожної адмі
 msgid "Add a contact using the form below."
 msgstr "Додати контакт через форму нижче."
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "Додати нову категорію"
@@ -315,7 +318,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "Додати нову категорію"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -324,8 +327,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -333,21 +336,20 @@ msgid "Add to shortlist"
 msgstr "Додати до переліку"
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "Додати користувача"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr "Додати/редагувати категорію"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr "Додати/редагувати пріоритет відповіді"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr "Додати/редагувати шаблон відповіді"
 
@@ -363,6 +365,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "Ще раз:"
@@ -375,8 +383,8 @@ msgstr "Сповіщення %d створено для %s, type %s, парам
 msgid "Alert %d disabled (created %s)"
 msgstr "Сповіщення %d відключено (створено %s)"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "Повідомляти мене про оновлення"
 
@@ -388,10 +396,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "Всі звіти"
@@ -431,6 +441,11 @@ msgstr "Всі звіти в проміжку з  %s по %s"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "Сповіщено в категорії %s "
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -467,7 +482,7 @@ msgstr "Анонім"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -480,7 +495,7 @@ msgid "Another user"
 msgstr "Інші користувачі"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Ви впевнені, що хочете скасувати завантаження?"
 
@@ -489,8 +504,8 @@ msgstr "Ви впевнені, що хочете скасувати завант
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr "Ви впевнені?"
@@ -501,7 +516,7 @@ msgstr "Ви впевнені?"
 msgid "Area covered"
 msgstr "Зона покрита"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -515,27 +530,32 @@ msgstr ""
 msgid "Assign selected to role:"
 msgstr "Назначити %s"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "Призначення компетентного органу:"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "Назначити іншу категорію:"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "Назначити зовнішньому відділу:"
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "Назначити підрозділу:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "Доступні категорії"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "Назначити %s"
@@ -548,7 +568,7 @@ msgstr "At most %d requests are returned in each query.  The returned requests a
 msgid "At the moment only searching for and looking at reports work."
 msgstr "Наразі лише роздивляюсь як працюють звіти"
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -556,11 +576,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr "Автоматична відповідь:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -572,12 +592,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Уникайте особистої інформації та номерних знаків транспортних засобів"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "Очікує перевірки модератором"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "Назад"
@@ -598,14 +619,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "Органи"
 
@@ -618,11 +637,13 @@ msgstr "Органи"
 msgid "Body"
 msgstr "Орган"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "Орган:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -634,8 +655,7 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Не бачите мапу? <em>Пропустіть цей крок</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -651,15 +671,13 @@ msgstr "Категорії:"
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -669,7 +687,7 @@ msgstr "Категорія"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Категорія змінена з ‘%s’ на ‘%s’"
 
@@ -692,6 +710,11 @@ msgstr "Категорія:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "Змінити пароль"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -708,7 +731,7 @@ msgstr "Змінити пароль"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -718,12 +741,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -760,8 +783,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -771,11 +794,7 @@ msgstr ""
 msgid "Closed"
 msgstr "Закрито"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "Закрито муніципалітетом"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -808,13 +827,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "Конфігурація"
@@ -931,7 +949,7 @@ msgstr "Створити сповіщення"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "Створити категорію"
@@ -941,27 +959,25 @@ msgstr "Створити категорію"
 msgid "Create priority"
 msgstr "Створити приоритет"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr "Створити звіт/оновлення для ради"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "Створити шаблон"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "Створено"
@@ -970,6 +986,17 @@ msgstr "Створено"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "Створено"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "Створено"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -981,10 +1008,6 @@ msgstr "Створено:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -994,19 +1017,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "Наразі жодних органів не було створено"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr ""
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "Дашборд"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1018,7 +1043,7 @@ msgstr "Dealt with by subdivision within 5 working days"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1028,7 +1053,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "Видалити шаблон"
@@ -1050,9 +1075,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "Опис"
 
@@ -1061,7 +1084,7 @@ msgstr "Опис"
 msgid "Destination"
 msgstr "Опис"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1097,7 +1120,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1105,6 +1128,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "Сповіщено в категорії %s "
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "Сповіщено в категорії %s "
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1139,25 +1172,25 @@ msgstr "Не знаю"
 msgid "Don't like forms?"
 msgstr "Не любите форми?"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 #, fuzzy
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr "Перетягніть фотографії сюди чи <u>натисніть для завантаження</u>"
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1169,7 +1202,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1181,7 +1214,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "Редагувати"
@@ -1192,12 +1225,11 @@ msgstr "Редагувати"
 msgid "Edit body details"
 msgstr "Редагувати дані про орган"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr "Редагувати права користувача"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1205,17 +1237,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr "Редагувати звіт"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1252,8 +1282,9 @@ msgstr "Редактор"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1262,15 +1293,14 @@ msgstr "Редактор"
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr "Адреса електронної пошти"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1290,12 +1320,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "Е-пошта:"
@@ -1358,12 +1389,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "Кінцева точка"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "Введіть назву вулиці чи району поблизу"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Вкажіть поштовий код UK або назву вулиці та місця"
 
@@ -1390,10 +1421,10 @@ msgstr "Введіть подробиці проблеми"
 msgid "Error"
 msgstr "Помилка"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "Всі"
 
@@ -1406,7 +1437,7 @@ msgstr "Зразок поштового коду %s"
 msgid "Examples:"
 msgstr "Приклади:"
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr "Категорії існують"
 
@@ -1415,7 +1446,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1440,7 +1471,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1452,20 +1483,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "Додаткові дані:"
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1498,20 +1529,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "Фільтрувати список звітів"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "Ім&rsquo;я"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "Фотографії найближчих сповіщень"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "Нові сповіщення"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "Полагодіть це вибравши <strong>зону покриття</strong> в <em>формі редагування органу </em> нижче."
@@ -1541,7 +1577,7 @@ msgstr "Відмітьте як видалене"
 msgid "Flag user"
 msgstr "Відмітьте користувача"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "Відмічено"
@@ -1550,7 +1586,7 @@ msgstr "Відмічено"
 msgid "Flagged reports and users"
 msgstr "Відмічені звіти та користувачі"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "Відмічені користувачі виписані на <a href='%s'>відміченій</a> сторінці."
 
@@ -1558,8 +1594,8 @@ msgstr "Відмічені користувачі виписані на <a href=
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "Відмічені користувачі не заборонені. Це просто список користувачів, які потребують уваги."
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "Відмічено:"
 
@@ -1585,11 +1621,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Забули пароль?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1599,12 +1635,20 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "Часто задавані питання"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1626,7 +1670,7 @@ msgstr "Отримувати оновлення по %s проблем"
 msgid "Get updates of problems in this %s"
 msgstr "Отримувати оновлення про проблеми в %s"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "Дайте RSS фід"
 
@@ -1642,15 +1686,15 @@ msgstr ""
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1660,7 +1704,7 @@ msgstr "Вперед"
 msgid "Going to send questionnaire?"
 msgstr "Збираєтесь відправити опитувальник?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr "Надання адміністративного доступу"
 
@@ -1686,6 +1730,7 @@ msgstr "Ви вже сповіщали про проблеми раніше, ч
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1720,7 +1765,8 @@ msgstr "Прихований"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1748,7 +1794,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "Приховати привязки"
 
@@ -1802,11 +1848,9 @@ msgstr "Нажаль ми не можем знайти вашу проблему
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "Ідентифікатор"
 
@@ -1827,15 +1871,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1851,7 +1895,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1875,7 +1919,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1912,7 +1956,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1936,6 +1980,17 @@ msgstr "В чорний список?"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "двір"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1945,20 +2000,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "Додати особисті дані автора сповіщення"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Невірне значення has_photo \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1975,16 +2030,12 @@ msgstr "Внутрішні нотатки"
 msgid "Internal notes"
 msgstr "Внутрішні нотатки"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "Невірне значення agency_responsible %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "Невірний формат %s ."
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2036,13 +2087,13 @@ msgstr "Останнє поновлення:"
 msgid "Last&nbsp;update:"
 msgstr "Останнє&nbsp;поновлення:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2059,7 +2110,7 @@ msgstr "Показати всі прозвітовані проблеми"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "Завантаження..."
@@ -2097,17 +2148,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2125,19 +2177,20 @@ msgstr ""
 msgid "MAP"
 msgstr "Мапа"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2151,24 +2204,24 @@ msgstr ""
 msgid "Mark as sent"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "Позначте користувачів, чию поведінку ви хочете відстежувати <strong>прапорцем</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "Повідомлення"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr ""
 
@@ -2181,7 +2234,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "Бракує jurisdiction_id"
 
@@ -2189,8 +2242,7 @@ msgstr "Бракує jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2213,7 +2265,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "Модерується підрозділом на протязі робочого дня"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2223,14 +2275,14 @@ msgstr ""
 msgid "Month"
 msgstr "Місяць"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2258,9 +2310,10 @@ msgstr ""
 msgid "Name"
 msgstr "Ім'я"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "Ім'я:"
@@ -2278,7 +2331,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Найближча дорога до шпильки на карті (автоматично згенеровано через OpenStreetMap): %s%s"
 
@@ -2286,12 +2339,12 @@ msgstr "Найближча дорога до шпильки на карті (а
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Найближчий поштовий індекс до шпильки на карті (автоматично згенеровано): %s (відстань: %sм)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Найближча дорога до шпильки на карті (автоматично згенеровано через Bing карти): %s%s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2316,7 +2369,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Новий орган додано"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "Новий контакт категорії додано"
 
@@ -2329,8 +2382,8 @@ msgstr "Нова адреса електронної пошти:"
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "Новий внутрішній нотаток:"
 
@@ -2338,13 +2391,13 @@ msgstr "Новий внутрішній нотаток:"
 msgid "New local problems on FixMyStreet"
 msgstr "Нові місцеві проблеми"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr "Новий пароль:"
 
@@ -2421,7 +2474,7 @@ msgstr "Новий шаблон"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2434,7 +2487,6 @@ msgstr "Далі"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2443,11 +2495,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "Ні"
 
@@ -2459,11 +2511,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "Без органу"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "Не вибраний департамент"
 
@@ -2479,8 +2532,8 @@ msgstr "Не знайдено маркованих проблем"
 msgid "No flagged users found."
 msgstr "Не знайдено маркованих користувачів"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "Подальші оновлення відсутні"
 
@@ -2516,15 +2569,15 @@ msgstr "Ніхто не підтримав"
 msgid "None"
 msgstr "Нічого"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2532,10 +2585,14 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "Не мій підрозділ"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "Не прозвітовано раніше"
@@ -2583,12 +2640,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2596,12 +2653,12 @@ msgstr ""
 msgid "Old state"
 msgstr "Застарілий стан"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2610,7 +2667,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2641,7 +2698,7 @@ msgstr ""
 msgid "Open311 specification"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2653,7 +2710,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2661,16 +2718,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2702,7 +2759,7 @@ msgstr "Сторінку не знайдено"
 msgid "Parent"
 msgstr "Предок"
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "Всі Категорії"
@@ -2711,13 +2768,13 @@ msgstr "Всі Категорії"
 msgid "Partial"
 msgstr "Частково"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "Пароль (опціонально)"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "Ваш пароль було змінено"
@@ -2732,7 +2789,7 @@ msgstr "Пароль (опціонально)"
 msgid "Permissions"
 msgstr "Дозволи:"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr "Дозволи:"
 
@@ -2740,19 +2797,24 @@ msgstr "Дозволи:"
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "Телефон:"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "Номер телефону"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "Номер телефону (опціонально)"
 
@@ -2760,30 +2822,26 @@ msgstr "Номер телефону (опціонально)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "Телефон:"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2803,9 +2861,8 @@ msgstr "Потрібне фото"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr "Фотографія"
@@ -2814,7 +2871,7 @@ msgstr "Фотографія"
 msgid "Photos of recent nearby reports"
 msgstr "Фотографії найближчих сповіщень"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2828,6 +2885,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "Розмістіть шпильку на карті"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2855,27 +2917,26 @@ msgid "Please check your email address is correct"
 msgstr "Будь ласка перевірте чи ваша адреса е-пошти вірна"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "Будь ласка оберіть категорію"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2894,27 +2955,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Будь ласка не використовуйте образи&nbsp;&mdash; ображаючи департамент ві підриваєте цінність сервісу для всіх користувачів"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "Будь ласка введіть повідомлення"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr "Будь ласка, введіть ім'я "
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2927,16 +2988,16 @@ msgstr "Будь ласка введіть пароль"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "Будь ласка вкажіть тему"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2947,20 +3008,20 @@ msgstr "Будь ласка введіть правильну адресу е-п
 msgid "Please enter a valid email address"
 msgstr "Будь ласка введіть правильну адресу е-пошти"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "Будь ласка додайте трохи подробиць"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -2976,7 +3037,7 @@ msgid "Please enter your first name"
 msgstr "Будь ласка введіть ім'я"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "Будь ласка введіть ім'я та прізвище - департаментам потрібні ці дані. Якщо не хочете їх показувати - не ставте галочку внизу."
@@ -2988,9 +3049,9 @@ msgstr "Будь ласка введіть ім'я"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "Будь ласка введіть ім'я"
@@ -3031,19 +3092,19 @@ msgstr "Будь ласка заповніть форму нижче подро
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Будь ласка вкажіть чи ви хочете отримати інші опитування."
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "Будь ласка введіть правильну адресу е-пошти"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3070,24 +3131,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "Будь ласка зауважте:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr "Будь ласка, оприлюдніть оновлений звіт."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Будь ласка додайте трохи пояснень стосовно перевідкриття сповіщення"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "Будь ласка додайте текст і фото"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Будь ласка розкажіть чи ви відправляли сповіщення департаменту раніше"
 
@@ -3095,7 +3160,7 @@ msgstr "Будь ласка розкажіть чи ви відправляли
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr ""
 
@@ -3107,7 +3172,7 @@ msgstr "Оберіть бажаний потік інформації"
 msgid "Please select the type of alert you want"
 msgstr "Будь ласка оберіть тип бажаних алярмів"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Будь ласка вкажіть чи була вирішена проблема"
 
@@ -3115,12 +3180,12 @@ msgstr "Будь ласка вкажіть чи була вирішена про
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr "Будь ласка, завантажте тільки зображення"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3128,27 +3193,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "Будь ласка напишіть повідомлення"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "Допис"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "Опубліковано анонімно в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "Опубліковано %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Опубліковано <strong>%s</strong> (%s) в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Опубліковано <strong>%s</strong> в %s"
 
@@ -3164,7 +3225,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3172,11 +3233,11 @@ msgstr ""
 msgid "Previous"
 msgstr "Попередній"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3192,9 +3253,9 @@ msgid "Privacy and cookies"
 msgstr ""
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "Приватний"
 
@@ -3244,7 +3305,7 @@ msgstr "Проблему %s надіслано департаменту %s"
 msgid "Problem breakdown by state"
 msgstr "Розбивка проблем по стану"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "Проблема маркована відкритою."
 
@@ -3252,8 +3313,7 @@ msgstr "Проблема маркована відкритою."
 msgid "Problem state change based on survey results"
 msgstr "Стан проблеми змінено базуючись на результатах опитувань"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Проблеми"
@@ -3278,18 +3338,18 @@ msgstr "Нещодавно вирішені проблеми"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "Проблеми в межах %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "Проблеми в межах %s району"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3297,7 +3357,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr ""
 
@@ -3305,11 +3365,15 @@ msgstr ""
 msgid "Property address:"
 msgstr "Адреса майна:"
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3323,11 +3387,11 @@ msgstr "Надішліть оновлення"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Вказання паролю не обов'язкове, проте це дозволить вам більш легко сповіщати про проблеми, залишати поновлення та керувати вашими сповіщеннями"
 
@@ -3335,12 +3399,12 @@ msgstr "Вказання паролю не обов'язкове, проте ц
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "Публічна відповідь:"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3383,11 +3447,11 @@ msgstr "Анкета заповнена автором сповіщення"
 msgid "RSS feed"
 msgstr "RSS потік"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "RSS потік для %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS потік для %s району, %s"
 
@@ -3395,11 +3459,11 @@ msgstr "RSS потік для %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:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "RSS потік з %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -3407,13 +3471,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -3427,11 +3491,11 @@ msgstr "RSS стрічка недавніх локальних проблем"
 msgid "RSS feed of updates to this problem"
 msgstr "RSS стрічка з оновленнями по цій проблемі"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3444,7 +3508,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Отримувати листа коли інформація по проблемі буде оновлена"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3458,7 +3522,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Нещодавно перевідкриті проблеми"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3471,7 +3535,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3483,8 +3548,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "Зняти прапорець"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3499,17 +3564,22 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "Видалити фото (це незворотня операція!)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+#, fuzzy
+msgid "Remove staff permissions"
+msgstr "Редагувати права користувача"
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "Відповісти "
 
@@ -3517,14 +3587,14 @@ msgstr "Відповісти "
 msgid "Report"
 msgstr "Звіт"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3533,7 +3603,7 @@ msgid "Report a problem"
 msgstr "Сповістити про проблему"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3549,7 +3619,7 @@ msgid "Report anonymously"
 msgstr "Сповіщено анонімно по %s"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3585,7 +3655,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Сповіщайте, переглядайте, або обговорюйте місцеві проблеми"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "Сповіщено анонімно по %s"
@@ -3596,7 +3666,7 @@ msgstr "Сповіщено анонімно по %s"
 msgid "Reported before"
 msgstr "Сповіщено раніше"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "Перевідкрито %s о %s"
@@ -3610,27 +3680,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Сповіщено в категорії %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Сповіщено в категорії %s анонімно о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "Сповіщено в категорію %s %s о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "Сповіщено %s анонімно о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "Сповіщено через %s %s о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Сповіщено через %s в категорію %s анонімно о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Сповіщено через %s в категорію %s %s о %s"
 
@@ -3649,17 +3719,15 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr "Сповістити про проблему"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "Сповіщення"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3687,15 +3755,15 @@ msgid "Reports published"
 msgstr "Сповіщення опубліковано"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3708,7 +3776,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3761,39 +3829,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "Те місце?"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "Обслуговувач цієї дороги (отримано з дорожнього сервісу): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Обслуговувач цієї дороги (з OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "Повернули вліво"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3809,20 +3883,20 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3839,13 +3913,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "Пошук сповіщень"
 
@@ -3858,7 +3931,7 @@ msgstr "Пошук користувачів"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "Пошук сповіщень"
 
@@ -3873,12 +3946,12 @@ msgstr "Пошук:"
 msgid "Searching found no reports."
 msgstr "Пошук не знайшов сповіщень."
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "Пошук не знайшов користувачів."
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3888,8 +3961,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3899,7 +3971,7 @@ msgid "Select a body"
 msgstr "Оберіть орган"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "Оберіть район"
@@ -3920,7 +3992,7 @@ msgstr ""
 msgid "Select:"
 msgstr "Оберіть:"
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3933,7 +4005,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3942,11 +4014,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "Відправити %s %s пізніше"
 
@@ -3984,7 +4056,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr "Перелік"
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -3995,7 +4067,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4020,8 +4092,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4032,7 +4104,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "Показувати шпильки"
 
@@ -4092,7 +4164,7 @@ msgid "Some photos of recent reports"
 msgstr "Деякі фото нещодавніх проблем"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "Певний текст для локалізації"
 
@@ -4101,12 +4173,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -4124,9 +4195,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Вибачте, сталася помилка"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "Вибачте, ми не знайшли це місце"
 
@@ -4136,13 +4207,13 @@ msgstr "Вибачте, ми не знайшли це місце"
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Вибачте, ми не можем розпізнати це місце. Спробуйте пізніше."
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4157,11 +4228,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4170,11 +4241,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4198,18 +4269,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "Стан"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4218,31 +4289,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Стан:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "Статистика"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "Статус"
 
@@ -4260,7 +4328,7 @@ msgstr ""
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "Підрозділ/Орган"
 
@@ -4279,50 +4347,48 @@ msgstr "Тема:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "Підтвердити"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "Підтвердити зміни"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "Підтвердити анкету"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "Підтверджено"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "Підписатись"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4335,7 +4401,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "Поновлення обмежені кількістю в %s символів. Будь ласка скоротіть текст."
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4349,20 +4415,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "Резюме"
 
@@ -4373,14 +4438,19 @@ msgstr "Сумарні сповіщення"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4398,13 +4468,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "Шаблони"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "Текст"
@@ -4425,6 +4499,11 @@ msgstr "Лише текстова версія"
 msgid "Text:"
 msgstr "Текст:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "Текст"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "Дякуємо, що розповіли про це!"
@@ -4454,7 +4533,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "Дякуєм, раді чути, що проблему вирішено! Можемо ми поцікавитись чи сповіщали ви органи про будь-яку проблему раніше?"
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4466,27 +4545,29 @@ msgstr "Під час завантаження фото трапилась по
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "Це місце не підпорядковане Чернівцям; можливо воно знаходиться за його межами? Спробуйте ще раз."
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "Поштовий код не розпізнано, вибачте."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "Цю проблему зараз перезвітують."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "Це сповіщення було видалено."
 
@@ -4534,8 +4615,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4589,7 +4670,7 @@ msgstr "Трапилась помилка: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 
@@ -4651,8 +4732,8 @@ msgstr "Користувач не зміг позначити проблему 
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4687,7 +4768,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4705,12 +4786,12 @@ msgstr "Сталась помилка при спробі показати ст
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "Сталась проблема з поновленням. Будь ласка спробуйте ще раз."
 
@@ -4718,7 +4799,7 @@ msgstr "Сталась проблема з поновленням. Будь ла
 msgid "There were problems with your report. Please see below."
 msgstr "Зі сповіщенням є негаразди. Гляньте нижче."
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "З поновленням щось негаразд. Гляньте нижче."
 
@@ -4794,10 +4875,10 @@ msgstr ""
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "Ця інформація обов'язкова"
 
@@ -4814,19 +4895,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "Цю проблему вирішено"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "Цю проблему не вирішено"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4839,26 +4924,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "Це сповіщення очікує модерації."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "Це сповіщення наразі відмічено закритим."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "Це сповіщення наразі відмічено вирішеним."
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "Це сповіщення відмічено відкритим."
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4866,15 +4951,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "Ця веб-сторінка також містить фото проблеми, які надав користувач."
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4898,6 +4986,10 @@ msgstr "Заголовок"
 msgid "Title:"
 msgstr "Назва:"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr ""
@@ -4923,7 +5015,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "До перегляду точного місцезнаходження проблеми на карті"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4948,11 +5040,6 @@ msgstr ""
 msgid "Total"
 msgstr "Загалом"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -4975,16 +5062,16 @@ msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -4994,7 +5081,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5024,10 +5111,10 @@ msgstr "Невідома помилка"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "Невідомий ідентифікатор проблеми"
 
@@ -5039,13 +5126,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "Поновлення"
 
@@ -5096,29 +5183,27 @@ msgstr "Поновлення перевідкрило проблему"
 msgid "Update statuses"
 msgstr "Поновити статуси"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "Поновлено"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "Поновлено!"
 
@@ -5129,7 +5214,7 @@ msgstr "Поновлено!"
 msgid "Updates"
 msgstr "Поновлення"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Поновлення обмежені кількістю в %s символів. Будь ласка скоротіть текст."
 
@@ -5159,6 +5244,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5172,8 +5265,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5191,7 +5284,7 @@ msgid "User flagged"
 msgstr "Користувач відмічений"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5204,27 +5297,25 @@ msgstr "Пошук користувачів знайшов співпадінн
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "Користувачі"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5232,9 +5323,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "Значення оновлено"
 
@@ -5260,7 +5351,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "Переглянути сповіщення на сайті"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "Переглянути сповіщення по району"
 
@@ -5268,7 +5359,7 @@ msgstr "Переглянути сповіщення по району"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5286,7 +5377,7 @@ msgstr "Переглядаєм проблему"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "Райони рад"
 
@@ -5356,7 +5447,7 @@ msgstr "Коли відправлено"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5376,7 +5467,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "Хочете отримати ще іншу анкету за 4 тижні, нагадуючу вам про перевірку статусу?"
 
@@ -5388,7 +5479,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "Повідомлення, написане суцільними великими літерами, робить його важким для сприйняття. Недосконала пунктуація так само."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5399,12 +5489,12 @@ msgstr "Повідомлення, написане суцільними вели
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "Так"
 
@@ -5417,7 +5507,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5430,7 +5520,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "You are reporting the following update for being abusive, containing personal information, or similar:"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5439,7 +5529,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "Ви можете <a href=\"%s%s\">переглянути проблему на цьому сайті</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 
@@ -5469,7 +5559,7 @@ msgstr ""
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5479,7 +5569,7 @@ msgid "You declined; please fill in the box above"
 msgstr "Ви відхилили. Будь ласка заповніть форму вище"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5487,7 +5577,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5496,8 +5586,7 @@ msgstr ""
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5564,9 +5653,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5575,13 +5664,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5610,16 +5700,16 @@ msgstr "Ваше ім'я"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5639,8 +5729,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5673,7 +5763,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5704,19 +5794,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr "всі"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5724,8 +5814,8 @@ msgstr ""
 msgid "by %s"
 msgstr "від %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "рада"
 
@@ -5756,6 +5846,10 @@ msgstr "редагувати користувача"
 msgid "from %s different users"
 msgstr "від %s різних користувачів"
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5773,7 +5867,7 @@ msgstr "недоступно"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5856,12 +5950,12 @@ msgid "today"
 msgstr "сьогодні"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5886,7 +5980,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "двір"
 
@@ -5962,7 +6056,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -5989,7 +6083,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6016,7 +6110,7 @@ msgstr[1] "<big>%s</big> полагоджено минувшого місяця"
 msgstr[2] "<big>%s</big> полагоджено минувшого місяця"
 msgstr[3] "<big>%s</big> полагоджено минувшого місяця"
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
@@ -6025,7 +6119,7 @@ msgstr[1] "<big>%s</big> звітів за минувший тиждень"
 msgstr[2] "<big>%s</big> звітів за минувший тиждень"
 msgstr[3] "<big>%s</big> звітів за минувший тиждень"
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
@@ -6034,7 +6128,7 @@ msgstr[1] "<big>%s</big> звітів недавно"
 msgstr[2] "<big>%s</big> звітів недавно"
 msgstr[3] "<big>%s</big> звітів недавно"
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6079,7 +6173,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
@@ -6088,7 +6182,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
@@ -6097,8 +6191,17 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#~ msgid "Available categories"
-#~ msgstr "Доступні категорії"
+#~ msgid "Closed by council"
+#~ msgstr "Закрито муніципалітетом"
+
+#~ msgid "Filter report list"
+#~ msgstr "Фільтрувати список звітів"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "Невірне значення agency_responsible %s"
+
+#~ msgid "Post"
+#~ msgstr "Допис"
 
 #~ msgid "Coordinates:"
 #~ msgstr "Координати:"
diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
index dd722962d..3feff2f1f 100644
--- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
 "PO-Revision-Date: 2019-04-29 18:03+0000\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
 "Language-Team: Chinese (https://www.transifex.com/mysociety/teams/12067/zh/)\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
 #: perllib/FixMyStreet/Queue/Item/Report.pm:194
 msgid " and "
 msgstr "與"
@@ -56,7 +56,7 @@ msgstr ""
 #: templates/web/base/dashboard/heatmap.html:0
 #: templates/web/base/dashboard/heatmap.html:9
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
 msgid "%s - Summary reports"
 msgstr "%s -申報總結"
 
@@ -117,7 +117,7 @@ msgstr "%s 問卷送出 &ndash; % 回覆(%s%%)"
 msgid "%s ref:&nbsp;%s"
 msgstr "%s 流水號:&nbsp;%s "
 
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap開放街道地圖</a> 貢獻者"
 
@@ -163,6 +163,8 @@ msgstr ""
 msgid "(not sent to council)"
 msgstr "不要向地方政府送出"
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -181,8 +183,8 @@ msgstr "兩個都送出"
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
 #: templates/web/zurich/admin/bodies/form.html:27
 msgid "-- Pick a category --"
 msgstr "選擇分類"
@@ -214,17 +216,18 @@ msgstr ""
 "可以在你的設定檔加入一些 <code>地圖連結別</code> "
 
 #: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
 msgstr ""
 
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
 msgid "<span>%s</span> saved."
 msgstr ""
 
@@ -254,7 +257,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>是</strong> 我有密碼"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
 msgid "<u>Take or choose existing photo</u>"
 msgstr ""
 
@@ -271,7 +274,7 @@ msgid "Access denied"
 msgstr ""
 
 #: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
 msgid "Activate two-factor authentication"
 msgstr ""
 
@@ -295,7 +298,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "增加聯絡人請使用下方表單"
 
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
 #, fuzzy
 msgid "Add another parent category"
 msgstr "新增種類"
@@ -328,7 +331,7 @@ msgstr ""
 msgid "Add new category"
 msgstr "新增種類"
 
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
 msgid "Add option"
 msgstr ""
 
@@ -337,8 +340,8 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
 #: templates/web/base/report/_main.html:149
 #: templates/web/base/report/_main.html:25
 #: templates/web/base/report/_main.html:36
@@ -346,21 +349,20 @@ msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
 msgid "Add user"
 msgstr "新增使用者"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -376,6 +378,12 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:51
 msgid "Again:"
 msgstr "再一次"
@@ -388,8 +396,8 @@ msgstr "%s創建之 %d通知,　種類 %s, 參數 %s / %s"
 msgid "Alert %d disabled (created %s)"
 msgstr "%d 關閉通知 "
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
 msgid "Alert me to future updates"
 msgstr "通知我此事後續"
 
@@ -401,10 +409,12 @@ msgstr ""
 #: templates/web/base/dashboard/index.html:52
 #: templates/web/base/dashboard/index.html:65
 #: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
 #: templates/web/zurich/reports/_list-filter-status.html:2
 msgid "All"
 msgstr ""
 
+#: templates/web/zurich/admin/reports/index.html:1
 #: templates/web/zurich/reports/index.html:14
 msgid "All Reports"
 msgstr "所有事件申報"
@@ -444,6 +454,11 @@ msgstr "%s 與  %s 之間申報"
 msgid "All time"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "%s 種類之申報"
+
 #: templates/web/base/report/new/duplicate_suggestions.html:7
 msgid "Already been reported?"
 msgstr ""
@@ -480,7 +495,7 @@ msgstr "匿名"
 msgid "Anonymous user"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
 #: templates/web/base/admin/update_edit.html:23
 #: templates/web/base/admin/update_edit.html:96
 #: templates/web/base/report/update/moderation_diff.html:5
@@ -493,7 +508,7 @@ msgid "Another user"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
@@ -502,8 +517,8 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:85
 #: templates/web/base/admin/roles/form.html:25
 #: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
 #: templates/web/base/report/display_tools.html:7
 msgid "Are you sure?"
 msgstr ""
@@ -514,7 +529,7 @@ msgstr ""
 msgid "Area covered"
 msgstr "涵蓋區域"
 
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
 msgid "Area:"
 msgstr ""
 
@@ -528,27 +543,32 @@ msgstr "作為一個支援平台　%s出錯，本站所作的申報將送達給
 msgid "Assign selected to role:"
 msgstr "派給　%s"
 
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
 msgid "Assign to competent body:"
 msgstr "分派給適任的機關　"
 
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
 #: templates/web/zurich/admin/stats/index.html:57
 msgid "Assign to different category:"
 msgstr "歸至其它種類"
 
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
 msgid "Assign to external body:"
 msgstr "分派給外部機："
 
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
 msgid "Assign to subdivision:"
 msgstr "交派給下級單位："
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
 msgid "Assign users to areas"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "派給　%s"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:185
 msgid "Assigned to %s"
 msgstr "派給　%s"
@@ -561,7 +581,7 @@ msgstr "每一則詢問的申報幾乎達 %d地回覆了。所有的要求，依
 msgid "At the moment only searching for and looking at reports work."
 msgstr "目前僅提供部份查詢與查閱"
 
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
 msgid "Authorised staff users can be associated with the categories in which they operate."
 msgstr ""
 
@@ -569,11 +589,11 @@ msgstr ""
 msgid "Auto Response"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
 msgid "Auto-response:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
 msgid "Automatically populate report subject/detail"
 msgstr ""
 
@@ -585,12 +605,13 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
 #: templates/web/zurich/report/_item.html:11
 msgid "Awaiting moderation"
 msgstr "待核可"
 
 #. ("JS")
+#: templates/web/base/dashboard/status.html:17
 #: templates/web/base/js/translation_strings.html:45
 msgid "Back"
 msgstr "回上層"
@@ -611,14 +632,12 @@ msgstr ""
 msgid "Behaviour"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
 #: templates/web/base/admin/bodies/index.html:1
 #: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
 msgid "Bodies"
 msgstr "有關單位"
 
@@ -631,11 +650,13 @@ msgstr "有關單位"
 msgid "Body"
 msgstr "有關單位"
 
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
 msgid "Body:"
 msgstr "有關單位:"
 
 #: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
 msgid "CSV File"
 msgstr ""
 
@@ -647,8 +668,7 @@ msgstr "你的信箱中找不到我們的來信嗎？先檢查看看垃圾回收
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "無法顯示地圖？ <em>略過本步驟</em>"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 #: templates/web/base/admin/responsepriorities/index.html:8
 #: templates/web/base/admin/templates/view.html:7
 msgid "Categories"
@@ -664,15 +684,13 @@ msgstr ""
 #: templates/web/base/admin/bodies/body.html:73
 #: templates/web/base/admin/stats/fix_rate.html:4
 #: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
 #: templates/web/base/report/new/category.html:23
 #: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/bodies/body.html:14
 #: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 #: templates/web/zurich/admin/stats/index.html:26
 #: templates/web/zurich/admin/stats/index.html:71
 msgid "Category"
@@ -682,7 +700,7 @@ msgstr "類別"
 msgid "Category and State"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -705,6 +723,11 @@ msgstr "類別:"
 msgid "Change"
 msgstr ""
 
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "更換密碼"
+
 #: templates/web/base/auth/change_email.html:2
 #: templates/web/base/auth/change_email.html:3
 msgid "Change email address"
@@ -721,7 +744,7 @@ msgstr "更換密碼"
 msgid "Change phone number"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
 msgid "Change two-factor authentication"
 msgstr ""
 
@@ -731,12 +754,12 @@ msgid ""
 "                  to the body too. These will appear in the drop-down menu on the report-a-problem page."
 msgstr "選擇民眾可理解的<strong>類別</strong>  (例如., \"路面坑洞\", \"街燈故障\") 也助於讓有關單位掌握. 此類別將會顯示在申報問題頁的下拉式選項上。"
 
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
 msgid "Choose another"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
 msgid "Clear offline data"
 msgstr ""
 
@@ -773,8 +796,8 @@ msgid "Close"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:72
 #: templates/web/base/admin/states/index.html:103
 #: templates/web/base/admin/states/index.html:27
@@ -784,11 +807,7 @@ msgstr ""
 msgid "Closed"
 msgstr "關閉"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "由地方政府關閉"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
 msgid "Closed to updates"
 msgstr ""
 
@@ -821,13 +840,12 @@ msgid "Code"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr "設定"
@@ -944,7 +962,7 @@ msgstr "創建申報"
 msgid "Create an account"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/zurich/admin/bodies/contact-form.html:51
 msgid "Create category"
 msgstr "創建類別"
@@ -954,27 +972,25 @@ msgstr "創建類別"
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
 msgid "Create reports/updates as anonymous user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
 #: templates/web/zurich/admin/templates/edit.html:32
 msgid "Create template"
 msgstr "創建模版"
 
 #: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
 #: templates/web/zurich/admin/templates/view.html:10
 msgid "Created"
 msgstr "建立"
@@ -983,6 +999,17 @@ msgstr "建立"
 msgid "Created %d new users"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "建立"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "建立"
+
 #: templates/web/base/admin/list_updates.html:39
 #: templates/web/base/admin/reports/edit.html:78
 #: templates/web/base/admin/update_edit.html:55
@@ -994,10 +1021,6 @@ msgstr "建立:"
 msgid "Current password:"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
 #: templates/web/base/dashboard/index.html:93
 msgid "Currently grouped by %s"
 msgstr ""
@@ -1007,19 +1030,21 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr "目前未創建內文"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
 msgid "Customer not contactable"
 msgstr "無法聨絡上的客戶"
 
 #: templates/web/base/dashboard/index.html:8
 #: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
 #: templates/web/base/reports/index.html:15
 #: templates/web/base/reports/index.html:18
 msgid "Dashboard"
 msgstr "控制台"
 
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
 msgid "Deactivate two-factor authentication"
 msgstr ""
 
@@ -1031,7 +1056,7 @@ msgstr "下屬單位5個工作天內處理。"
 msgid "Default"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
 msgid "Default to creating reports/updates as the council"
 msgstr ""
 
@@ -1041,7 +1066,7 @@ msgid "Delete"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
 #: templates/web/zurich/admin/templates/edit.html:36
 msgid "Delete template"
 msgstr "刪除模版"
@@ -1063,9 +1088,7 @@ msgid "Describe why you are moderating this"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
 msgid "Description"
 msgstr "描述"
 
@@ -1074,7 +1097,7 @@ msgstr "描述"
 msgid "Destination"
 msgstr "描述"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
 msgid "Detailed information is limited to %d characters."
 msgstr ""
 
@@ -1110,7 +1133,7 @@ msgid "Disable"
 msgstr ""
 
 #: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
 msgid "Disable form when this category is selected"
 msgstr ""
 
@@ -1118,6 +1141,16 @@ msgstr ""
 msgid "Disable form when this option is selected"
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "%s 種類之申報"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "%s 種類之申報"
+
 #: templates/web/base/admin/users/alerts.html:23
 msgid "Disabled:"
 msgstr ""
@@ -1152,24 +1185,24 @@ msgstr "不知道"
 msgid "Don't like forms?"
 msgstr "不喜歡此表單？"
 
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
 msgid "Down one"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
 msgid "Drag photos here or <u>browse photos</u>"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
 msgid "Drop-down list"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
 msgid "Duplicates"
 msgstr ""
 
@@ -1184,7 +1217,7 @@ msgstr ""
 "不同類別 <strong>能夠同一位承辦人</strong> (電子郵件)\n"
 "這表示你可以多加一些類別，即使你只聯絡一位承辦人員。"
 
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
 #: templates/web/base/report/inspect/information.html:22
 msgid "Easting/Northing:"
 msgstr ""
@@ -1196,7 +1229,7 @@ msgstr ""
 #: templates/web/base/admin/roles/index.html:24
 #: templates/web/base/admin/templates/view.html:31
 #: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
 #: templates/web/zurich/admin/templates/view.html:20
 msgid "Edit"
 msgstr "編輯"
@@ -1207,12 +1240,11 @@ msgstr "編輯"
 msgid "Edit body details"
 msgstr "編輯有關單位細節"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
 msgid "Edit report category"
 msgstr ""
 
@@ -1220,17 +1252,15 @@ msgstr ""
 msgid "Edit report details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
 msgid "Edit reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
 msgid "Edit users' details/search for their reports"
 msgstr ""
 
@@ -1267,8 +1297,9 @@ msgstr "編輯器"
 #: templates/web/base/admin/users/import.html:24
 #: templates/web/base/admin/users/import.html:47
 #: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
 #: templates/web/base/report/new/duplicate_suggestions.html:33
 #: templates/web/zurich/admin/bodies/body.html:15
 #: templates/web/zurich/admin/bodies/form.html:9
@@ -1277,15 +1308,14 @@ msgstr "編輯器"
 msgid "Email"
 msgstr "電子郵件"
 
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
 #: templates/web/base/auth/change_email.html:37
 #: templates/web/base/report/new/form_user_loggedin.html:39
 #: templates/web/base/report/update/form_user_loggedin.html:25
 msgid "Email address"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
 msgid "Email address (optional)"
 msgstr ""
 
@@ -1305,12 +1335,13 @@ msgstr ""
 msgid "Email me a link to sign in"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
 msgid "Email verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
 #: templates/web/zurich/admin/bodies/contact-form.html:23
 msgid "Email:"
 msgstr "電子郵件:"
@@ -1378,12 +1409,12 @@ msgstr ""
 msgid "Endpoint"
 msgstr "結束點"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
 #, fuzzy
 msgid "Enter a Zürich street name"
 msgstr "輸入街道名稱　"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "輸入本區的郵編，街名或區域。"
 
@@ -1410,10 +1441,10 @@ msgstr "請在此填寫問題的細節"
 msgid "Error"
 msgstr "錯誤"
 
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
 #: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
 msgid "Everything"
 msgstr "一切"
 
@@ -1426,7 +1457,7 @@ msgstr "郵遞區號範例 %s"
 msgid "Examples:"
 msgstr "範例："
 
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
 msgid "Existing category"
 msgstr ""
 
@@ -1435,7 +1466,7 @@ msgid "Existing users won't be modified."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
 msgid "Expand map"
 msgstr ""
 
@@ -1460,7 +1491,7 @@ msgid "External body"
 msgstr ""
 
 #: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
 msgid "External status code"
 msgstr ""
 
@@ -1472,20 +1503,20 @@ msgstr ""
 msgid "External team"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
 #: templates/web/base/admin/reportextrafields/edit.html:1
 #: templates/web/base/admin/reportextrafields/index.html:1
 msgid "Extra Fields"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
 #: templates/web/base/admin/reports/edit.html:134
 #: templates/web/base/admin/update_edit.html:97
 #: templates/web/base/report/update/moderation_diff.html:8
 msgid "Extra data:"
 msgstr "其它資料："
 
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
 #: templates/web/base/report/inspect/_extra_details_field.html:2
 #: templates/web/base/report/new/category_extras.html:15
 msgid "Extra details"
@@ -1518,20 +1549,25 @@ msgid "Fill in your details manually."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
 msgid "Filter"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "過濾初次申報　"
-
 #: templates/web/base/questionnaire/creator_fixed.html:16
 #: templates/web/base/questionnaire/index.html:68
 msgid "First time"
 msgstr "首次"
 
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "最近申報之照片"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "新的申報　"
+
 #: templates/web/base/admin/bodies/body.html:53
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr "選擇<strong>涵蓋的區域</strong> <em>編輯有關單位</em> 表單。"
@@ -1561,7 +1597,7 @@ msgstr "標記警告為刪除　"
 msgid "Flag user"
 msgstr "標記警告用戶"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
 #: templates/web/base/admin/users/index.html:47
 msgid "Flagged"
 msgstr "標記警告"
@@ -1570,7 +1606,7 @@ msgstr "標記警告"
 msgid "Flagged reports and users"
 msgstr "標記警告申報與用戶"
 
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
 msgstr "標記警告用戶其已被列入 <a href='%s'>警告頁</a>"
 
@@ -1578,8 +1614,8 @@ msgstr "標記警告用戶其已被列入 <a href='%s'>警告頁</a>"
 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
 msgstr "被標記警告的用戶其權限不受影響，只是列入特別關注名單"
 
-#: templates/web/base/admin/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
 msgid "Flagged:"
 msgstr "警告:"
 
@@ -1605,11 +1641,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "忘記您的密碼?"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
 msgid "Forwarded to external body"
 msgstr "轉寄給外部機構"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
 msgid "Forwarded wish to external body"
 msgstr "轉寄願望給外部機構"
 
@@ -1619,12 +1655,20 @@ msgstr "轉寄願望給外部機構"
 msgid "Frequently Asked Questions"
 msgstr "常見問題回覆　"
 
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
 #: templates/web/base/contact/enquiry/index.html:1
 #: templates/web/base/contact/enquiry/index.html:3
 msgid "General Enquiry"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
 msgid "Generate token"
 msgstr ""
 
@@ -1646,7 +1690,7 @@ msgstr "取得 %s問題之更新"
 msgid "Get updates of problems in this %s"
 msgstr "取得 %s區域內的問題更新"
 
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
 msgid "Give me an RSS feed"
 msgstr "我要訂閱RSS"
 
@@ -1662,15 +1706,15 @@ msgstr "很高興聽到問題已處理了。"
 #: templates/web/base/admin/index.html:37
 #: templates/web/base/admin/index.html:54
 #: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
 #: templates/web/base/admin/users/index.html:32
 #: templates/web/base/around/_postcode_submit_button.html:2
 #: templates/web/base/around/_postcode_submit_button.html:5
 #: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 #: templates/web/base/reports/index.html:89
 #: templates/web/zurich/admin/stats/index.html:37
 msgid "Go"
@@ -1680,7 +1724,7 @@ msgstr "走"
 msgid "Going to send questionnaire?"
 msgstr "即將送出問卷？"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1706,6 +1750,7 @@ msgstr "您之前是否曾向地方政府申報過問題？或者此為您的首
 
 #: templates/web/base/admin/stats/index.html:17
 #: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
 msgid "Heatmap"
 msgstr ""
 
@@ -1740,7 +1785,8 @@ msgstr "隱藏"
 msgid "Hidden data in reporting form"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
 msgid "Hide all reports and updates"
 msgstr ""
 
@@ -1768,7 +1814,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:65
 #: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
 msgid "Hide pins"
 msgstr "隱藏地圖標示"
 
@@ -1822,11 +1868,9 @@ msgstr " 我們無法在資料庫中找到您的問題。\n"
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports/index.html:12
 #: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
 #: templates/web/zurich/admin/list_updates.html:24
 #: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
 msgid "ID"
 msgstr "帳戶"
 
@@ -1847,15 +1891,15 @@ msgstr ""
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
 msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
 msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
 msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
 msgstr ""
 
@@ -1872,7 +1916,7 @@ msgstr ""
 msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
 msgid "If you generate a new token the existing token will no longer work."
 msgstr ""
 
@@ -1896,7 +1940,7 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
 msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
 msgstr ""
 
@@ -1935,7 +1979,7 @@ msgid ""
 "              when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
 msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
 msgstr ""
 
@@ -1959,6 +2003,17 @@ msgstr "濫用表格？"
 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
 msgstr "此外，下列理由並非為Open311 v2更新特定部份回覆傳送:  agency_sent_datetime, 主旨(部份回覆之敍述), interface_used, comment_count, requestor_name (只有在同意姓名公開下才會呈現)."
 
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "路檔"
+
 #: templates/web/base/admin/bodies/contact-form.html:35
 #: templates/web/zurich/admin/bodies/contact-form.html:40
 msgid "Inactive"
@@ -1968,20 +2023,20 @@ msgstr ""
 msgid "Inbox zero, here we come!"
 msgstr "信箱已閱畢！"
 
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
 msgid "Include reporter personal details"
 msgstr "包括申報人的個人細節"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
 msgid "Incorrect has_photo value \"%s\""
 msgstr "不正確的照片值數 \"%s\""
 
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
 msgid "Inspect report"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1998,16 +2053,12 @@ msgstr "內部筆記"
 msgid "Internal notes"
 msgstr "內部筆記"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "無效的權責單位數值 %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
 msgid "Invalid format %s specified."
 msgstr "無效的%s 特定格式"
 
 #: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
@@ -2059,13 +2110,13 @@ msgstr "上回更新:"
 msgid "Last&nbsp;update:"
 msgstr "上一次更新:"
 
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
 #: templates/web/base/report/inspect/information.html:26
 #: templates/web/base/report/update/moderation_diff.html:6
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
 #: templates/web/base/reports/_list-filters-sort.html:10
 msgid "Least recently updated"
 msgstr ""
@@ -2082,7 +2133,7 @@ msgstr "列出所有申報的問題　"
 msgid "Loading reports…"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
 #: templates/web/base/report/new/category_wrapper.html:9
 msgid "Loading..."
 msgstr "載入中...."
@@ -2120,17 +2171,18 @@ msgid "Log in with Twitter"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
 #: templates/web/base/report/form/user.html:27
 msgid "Log in with email"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
 msgid "Log in with email/text"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
 msgid "Log out of all sessions"
 msgstr ""
 
@@ -2148,19 +2200,20 @@ msgstr ""
 msgid "MAP"
 msgstr "地圖"
 
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
 msgid "Make anonymous on all reports and updates"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
 msgid "Manage shortlist"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
 msgid "Manifest Theme"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
 #: templates/web/base/reports/_list-filters-sort.html:5
 msgid "Manual order"
 msgstr ""
@@ -2174,24 +2227,24 @@ msgstr "地圖"
 msgid "Mark as sent"
 msgstr "標註為關閉"
 
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
 msgstr "標註用戶哪些行為您將要給予<strong>警告標記</strong>."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
 #: templates/web/base/contact/index.html:109
 msgid "Message"
 msgstr "留言"
 
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
 msgid "Message to competent body:"
 msgstr "給適任單位的訊息"
 
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
 msgid "Message to external body:"
 msgstr "給外部機構的訊息"
 
@@ -2204,7 +2257,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
 msgid "Missing jurisdiction_id"
 msgstr "遺失 jurisdiction_id"
 
@@ -2212,8 +2265,7 @@ msgstr "遺失 jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
 msgid "Moderate report details"
 msgstr ""
 
@@ -2236,7 +2288,7 @@ msgstr ""
 msgid "Moderated by division within one working day"
 msgstr "一個工作天內協調出部門"
 
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
 #: templates/web/base/admin/update_edit.html:86
 msgid "Moderation history"
 msgstr ""
@@ -2246,14 +2298,14 @@ msgstr ""
 msgid "Month"
 msgstr "月份"
 
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
 #: templates/web/base/reports/_list-filters-sort.html:11
 msgid "Most commented"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
 #: templates/web/base/admin/category-checkboxes.html:32
 msgid "Multiple Groups"
 msgstr ""
@@ -2281,9 +2333,10 @@ msgstr ""
 msgid "Name"
 msgstr "名字"
 
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
 #: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
 #: templates/web/zurich/admin/stats/index.html:62
 msgid "Name:"
 msgstr "名字："
@@ -2301,7 +2354,7 @@ msgstr ""
 msgid "Nearest calculated address:"
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "找出地圖標記上最近的街道名稱(利用 OpenStreetMap自動産生): %s%s"
 
@@ -2309,12 +2362,12 @@ msgstr "找出地圖標記上最近的街道名稱(利用 OpenStreetMap自動産
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "找出地圖標記上最近的郵遞區號(自動産生): %s(%sm away)"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
 #: perllib/FixMyStreet/Geocode/Address.pm:17
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "找出地圖標記上最近的街道(利用 Bing Maps自動産生): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -2339,7 +2392,7 @@ msgstr ""
 msgid "New body added"
 msgstr "新增內文"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
 msgid "New category contact added"
 msgstr "新增類別承辦 人"
 
@@ -2352,8 +2405,8 @@ msgstr ""
 msgid "New field"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
 msgid "New internal note:"
 msgstr "新內部筆記"
 
@@ -2361,13 +2414,13 @@ msgstr "新內部筆記"
 msgid "New local problems on FixMyStreet"
 msgstr "FixMyStreet之新近當地問題　"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
 msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:47
 #: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
 msgid "New password:"
 msgstr ""
 
@@ -2444,7 +2497,7 @@ msgstr "新模版"
 msgid "New updates on report <a href=\"%s\">%s</a>"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
 #: templates/web/base/reports/_list-filters-sort.html:7
 msgid "Newest"
 msgstr ""
@@ -2457,7 +2510,6 @@ msgstr "下一步"
 msgid "Next:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:5
@@ -2466,11 +2518,11 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
 #: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
 msgid "No"
 msgstr "無"
 
@@ -2482,11 +2534,12 @@ msgstr ""
 msgid "No account?"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
 msgid "No body"
 msgstr "無有關單位"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
 msgid "No council selected"
 msgstr "未選擇地方政府"
 
@@ -2502,8 +2555,8 @@ msgstr "未發現標記警告問題 "
 msgid "No flagged users found."
 msgstr "未發現標記警告用戶"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
 msgid "No further updates"
 msgstr "尚無更新"
 
@@ -2541,15 +2594,15 @@ msgstr "無支援"
 msgid "None"
 msgstr "沒有"
 
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
 msgid ""
 "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
 "                  Authorised staff users can be associated with the area in which they operate."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
 msgid ""
 "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
 "                Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2561,10 +2614,14 @@ msgstr ""
 "這要看具體落實執行狀況，工作人員可能有權使用控制台(其關構下的\n"
 "所有活動總覧)。也有能力隱暪某些申報或更改某些申報的狀況。"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
 msgid "Not for my subdivision"
 msgstr "非下屬單位"
 
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
 #: templates/web/base/admin/stats/questionnaire.html:6
 msgid "Not reported before"
 msgstr "之前未申報過"
@@ -2612,12 +2669,12 @@ msgid "Offline"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
 msgid "Offline data cleared"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
 msgid "Offline update data saved"
 msgstr ""
 
@@ -2625,12 +2682,12 @@ msgstr ""
 msgid "Old state"
 msgstr "舊陳述"
 
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
 #: templates/web/base/reports/_list-filters-sort.html:8
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
 msgid "On behalf of %s"
 msgstr ""
 
@@ -2639,7 +2696,7 @@ msgid "Only staff users will be able to add reports in this category."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71
 #: templates/web/base/admin/states/index.html:102
 #: templates/web/base/admin/states/index.html:25
@@ -2670,7 +2727,7 @@ msgstr "Open311 啟動網頁"
 msgid "Open311 specification"
 msgstr "Open311 規範　"
 
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
 msgid "Options"
 msgstr ""
 
@@ -2682,7 +2739,7 @@ msgstr ""
 msgid "Or sign in with password to prefill this information."
 msgstr ""
 
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
 msgid "Or subscribe by RSS"
 msgstr ""
 
@@ -2690,16 +2747,16 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
 #: perllib/FixMyStreet/Queue/Item/Report.pm:132
 #: perllib/FixMyStreet/Queue/Item/Report.pm:195
 msgid "Other"
@@ -2731,7 +2788,7 @@ msgstr "找無此頁"
 msgid "Parent"
 msgstr "上級 "
 
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
 #, fuzzy
 msgid "Parent categories"
 msgstr "創建類別"
@@ -2740,13 +2797,13 @@ msgstr "創建類別"
 msgid "Partial"
 msgstr "部份"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
 #: templates/web/zurich/auth/general.html:20
 #: templates/web/zurich/auth/general.html:46
 msgid "Password (optional)"
 msgstr "密碼(任選):"
 
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
 #, fuzzy
 msgid "Password change cancelled."
 msgstr "密碼已更新"
@@ -2761,7 +2818,7 @@ msgstr "密碼(任選):"
 msgid "Permissions"
 msgstr "永久連結"
 
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2769,19 +2826,24 @@ msgstr ""
 msgid "Permit blank updates"
 msgstr ""
 
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "電話"
+
 #: templates/web/base/report/inspect/information.html:15
 msgid "Phone Reporter:"
 msgstr ""
 
 #: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
 #: templates/web/base/report/new/form_user_loggedin.html:34
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
 msgstr "電話號碼"
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
 msgid "Phone number (optional)"
 msgstr "電話號碼(非必填)"
 
@@ -2789,30 +2851,26 @@ msgstr "電話號碼(非必填)"
 msgid "Phone numbers are limited to %s characters in length."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
 msgid "Phone verified:"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
 #: templates/web/zurich/admin/stats/index.html:60
 msgid "Phone:"
 msgstr "電話"
 
 #: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
 #: templates/web/base/report/new/form_report.html:56
 #: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
 #: templates/web/zurich/admin/stats/index.html:58
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 #: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2832,9 +2890,8 @@ msgstr "要求提供照片"
 msgid "Photo upload failed."
 msgstr ""
 
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
 #: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2843,7 +2900,7 @@ msgstr ""
 msgid "Photos of recent nearby reports"
 msgstr "最近申報之照片"
 
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
 msgid "Photos/Documents"
 msgstr ""
 
@@ -2857,6 +2914,11 @@ msgstr ""
 msgid "Pick your ward"
 msgstr ""
 
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "在地圖上作標記"
+
 #. ("JS")
 #: templates/web/base/around/display_location.html:79
 #: templates/web/base/js/translation_strings.html:44
@@ -2884,27 +2946,26 @@ msgid "Please check your email address is correct"
 msgstr "請確認您電郵地址無誤"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:7
 msgid "Please check your phone number is correct"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
 #: templates/web/base/js/translation_strings.html:21
 msgid "Please choose a category"
 msgstr "請選擇類別"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
 #: perllib/FixMyStreet/App/Controller/Auth.pm:497
 msgid "Please choose a less commonly-used password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
 #: templates/web/base/admin/bodies/body.html:12
 #: templates/web/base/admin/bodies/index.html:4
 #: templates/web/base/admin/templates/edit.html:13
@@ -2926,27 +2987,27 @@ 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:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter a message"
 msgstr "請寫下您的留言"
 
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:4
 msgid "Please enter a mobile number"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
 msgid "Please enter a name"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
 msgid "Please enter a name for this body"
 msgstr ""
 
@@ -2959,16 +3020,16 @@ msgstr "請輸入密碼"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please enter a subject"
 msgstr "請填下主旨"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
 #: templates/web/base/js/translation_strings.html:24
 #: templates/web/base/js/translation_strings.html:28
 msgid "Please enter a valid email"
@@ -2979,20 +3040,20 @@ msgstr "請輸入有效電子郵件"
 msgid "Please enter a valid email address"
 msgstr "請輸入有效的電子郵件"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
 msgid "Please enter a valid email or phone number"
 msgstr ""
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
 #: templates/web/base/js/translation_strings.html:14
 msgid "Please enter some details"
 msgstr "請填寫進一步細節"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
 #: templates/web/base/auth/_username_error.html:1
 #: templates/web/base/auth/_username_error.html:8
 #: templates/web/base/auth/change_email.html:24
@@ -3008,7 +3069,7 @@ msgid "Please enter your first name"
 msgstr "請輸入您的大名"
 
 #. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
 #: templates/web/base/js/translation_strings.html:19
 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
 msgstr "請輸入您的全名，地方政府需要此資料 – 如果您不希望名字公開在網站上，請在下面方格中劃掉勾選。"
@@ -3020,9 +3081,9 @@ msgstr "請輸入您的姓氐"
 
 #. ("JS")
 #: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
 #: templates/web/base/js/translation_strings.html:18
 msgid "Please enter your name"
 msgstr "請輸入您的姓氐"
@@ -3063,19 +3124,19 @@ msgstr "請利用下方表單填寫問題細節，在細節項請儘量述明準
 msgid "Please generate a two-factor code and enter it below:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "請選擇您是否願意收到其它問卷"
 
 #. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
 #: templates/web/base/js/translation_strings.html:11
 #, fuzzy
 msgid "Please make sure you are not including an email address"
 msgstr "請輸入有效的電子郵件"
 
 #. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
 #: templates/web/base/js/translation_strings.html:34
 msgid "Please make sure your password is at least %d characters long"
 msgstr ""
@@ -3102,24 +3163,28 @@ msgstr ""
 msgid "Please note:"
 msgstr "請加註記"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
 msgid "Please provide a duplicate ID or public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "如果您是再次申報，請說明原因"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
 msgid "Please provide some text as well as a photo"
 msgstr "請提供一些文字敍述與照片"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "請敍明您是否曾向地方政府申報過問題？　"
 
@@ -3127,7 +3192,7 @@ msgstr "請敍明您是否曾向地方政府申報過問題？　"
 msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
 msgid "Please select a body."
 msgstr "請選擇單位"
 
@@ -3139,7 +3204,7 @@ msgstr "請選擇訂閱方式"
 msgid "Please select the type of alert you want"
 msgstr "請選擇更新通知方式"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
 msgid "Please state whether or not the problem has been fixed"
 msgstr "請敍明該問題是否已解決"
 
@@ -3147,12 +3212,12 @@ msgstr "請敍明該問題是否已解決"
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
 msgid "Please upload an image only"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
 msgid "Please verify at least one of email/phone"
 msgstr ""
 
@@ -3160,27 +3225,23 @@ msgstr ""
 msgid "Please write a message"
 msgstr "諘寫下您的留言"
 
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "張貼"
-
 #: templates/web/base/alert/index.html:11
 msgid "Postcode or street name and area"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "Posted anonymously at %s"
 msgstr "匿名張貼  %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
 msgid "Posted by %s at %s"
 msgstr "由 %s 在 %s 張貼"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "由<strong>%s</strong> (%s) 在%s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "由<strong>%s</strong> 在%s"
 
@@ -3196,7 +3257,7 @@ msgstr ""
 msgid "Prevent new reports from using this category, but keep it available in map filters."
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
 msgid "Prevent user from submitting the form until this field is filled in."
 msgstr ""
 
@@ -3204,11 +3265,11 @@ msgstr ""
 msgid "Previous"
 msgstr "之前"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
 #: templates/web/base/report/inspect/extra_details.html:2
 msgid "Priority"
 msgstr ""
@@ -3224,9 +3285,9 @@ msgid "Privacy and cookies"
 msgstr "隱私與cookies"
 
 #: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
 #: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
 msgid "Private"
 msgstr "私人"
 
@@ -3275,7 +3336,7 @@ msgstr "%s　問題已送達到地方政府　%s　"
 msgid "Problem breakdown by state"
 msgstr "本站出現故障問題　"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
 msgid "Problem marked as open."
 msgstr "問題標註為開放"
 
@@ -3283,8 +3344,7 @@ msgstr "問題標註為開放"
 msgid "Problem state change based on survey results"
 msgstr "依調查結果呈現的問題改善"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "問題"
@@ -3309,18 +3369,18 @@ msgstr "FixMyStreet　最近回報的已修復問題　"
 msgid "Problems within %.1fkm of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
 msgid "Problems within %s"
 msgstr "在 %s 內的問題"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
 msgid "Problems within %s ward"
 msgstr "在 %s 里/區的問題"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
 msgid "Problems within %s ward, %s"
 msgstr ""
 
@@ -3328,7 +3388,7 @@ msgstr ""
 #: templates/web/base/admin/triage/index.html:0
 #: templates/web/base/admin/triage/index.html:14
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
 msgid "Problems within %s, %s"
 msgstr "在 %s, %s的問題　"
 
@@ -3336,11 +3396,15 @@ msgstr "在 %s, %s的問題　"
 msgid "Property address:"
 msgstr "公物地址："
 
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
 msgid "Protect from Open311 changes"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
 msgid "Protect this category's name and group(s) from Open311 changes"
 msgstr ""
 
@@ -3354,11 +3418,11 @@ msgstr "提供更新資訊"
 msgid "Provide update as"
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
 msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
 msgstr ""
 
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "提供名稱與密碼非為必要，但其可以讓您更便於申報問題，提供更新與管理您的申報。"
 
@@ -3366,12 +3430,12 @@ msgstr "提供名稱與密碼非為必要，但其可以讓您更便於申報問
 msgid "Public details"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
 msgid "Public response:"
 msgstr "公眾反應"
 
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
 msgid "Public update:"
 msgstr ""
 
@@ -3414,11 +3478,11 @@ msgstr "由問題申報者所填之問卷"
 msgid "RSS feed"
 msgstr "RSS訂閱"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
 msgid "RSS feed for %s"
 msgstr "%s RSS訂閱"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
 msgid "RSS feed for %s ward, %s"
 msgstr "%s里/區 RSS訂閱"
 
@@ -3426,11 +3490,11 @@ msgstr "%s里/區 RSS訂閱"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
 msgid "RSS feed of %s"
 msgstr "%s RSS訂閱"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
 msgid "RSS feed of %s, within %s ward"
 msgstr "%s, 在%s 里/區"
 
@@ -3438,13 +3502,13 @@ msgstr "%s, 在%s 里/區"
 msgid "RSS feed of nearby problems"
 msgstr " RSS訂閱 %s區域問題"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
 msgid "RSS feed of problems within %s"
 msgstr "在 %s 內之問題RSS 訂閱"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
 msgid "RSS feed of problems within %s ward"
 msgstr "在 %s 里/區問題的RSS 訂閱"
 
@@ -3458,11 +3522,11 @@ msgstr "最近當地問題的RSS訂閱"
 msgid "RSS feed of updates to this problem"
 msgstr "最近當地問題更新的RSS訂閱"
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read less"
 msgstr ""
 
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
 msgid "Read more"
 msgstr ""
 
@@ -3475,7 +3539,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "透過電子郵件收取該問題之更新消息"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -3489,7 +3553,7 @@ msgstr "近期的當地問題%s　"
 msgid "Recently reported problems"
 msgstr "近期申報之問題　"
 
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
 #: templates/web/base/reports/_list-filters-sort.html:9
 msgid "Recently updated"
 msgstr ""
@@ -3502,7 +3566,8 @@ msgstr ""
 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
 msgstr "記住 FixMyStreet主要為申報可修復之物理性問題。如果您的問題不適合透過本網站投送，請直接到地方政府各機關之網站。　"
 
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
 msgid "Remove account details"
 msgstr ""
 
@@ -3514,8 +3579,8 @@ msgstr ""
 msgid "Remove flag"
 msgstr "移除標記"
 
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
 #: templates/web/base/report/_main.html:147
 #: templates/web/base/report/_main.html:24
 #: templates/web/base/report/_main.html:32
@@ -3530,17 +3595,21 @@ msgstr ""
 msgid "Remove option"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
 #: templates/web/base/admin/update_edit.html:74
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr "移陯照片(無法回復)"
 
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
 msgid "Replace token"
 msgstr ""
 
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
 msgid "Reply to user:"
 msgstr "給用戶的回應"
 
@@ -3548,14 +3617,14 @@ msgstr "給用戶的回應"
 msgid "Report"
 msgstr "提報　"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
 #: templates/web/base/report/inspect/information.html:7
 msgid "Report ID:"
 msgstr ""
 
 #. ("JS")
 #: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
 #: templates/web/base/navigation/_report.html:6
 #: templates/web/base/navigation/_report.html:8
 #: templates/web/zurich/footer.html:18
@@ -3564,7 +3633,7 @@ msgid "Report a problem"
 msgstr "申報問題"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
 #: templates/web/base/navigation/_report.html:4
 msgid "Report a problem here"
 msgstr ""
@@ -3580,7 +3649,7 @@ msgid "Report anonymously"
 msgstr "在%s 匿名申報 "
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
 #: templates/web/base/navigation/_report.html:2
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "Report another problem here"
@@ -3616,7 +3685,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "申報，檢視，或討論在地問題"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
 #: templates/web/base/contact/index.html:64
 msgid "Reported anonymously at %s"
 msgstr "在%s 匿名申報 "
@@ -3627,7 +3696,7 @@ msgstr "在%s 匿名申報 "
 msgid "Reported before"
 msgstr "之前的申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
 #: templates/web/base/contact/index.html:66
 msgid "Reported by %s at %s"
 msgstr "由%s 的 %s 申報"
@@ -3641,27 +3710,27 @@ msgstr "由　　申報"
 msgid "Reported in the %s category"
 msgstr "%s 種類之申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
 msgid "Reported in the %s category anonymously at %s"
 msgstr "%s 種類下的匿名申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
 msgid "Reported in the %s category by %s at %s"
 msgstr "%s 在 %s　%s類別的申報　"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
 msgid "Reported via %s anonymously at %s"
 msgstr "在%s 匿名申報 "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
 msgid "Reported via %s by %s at %s"
 msgstr "%s　透過 %s　在　%s類別的申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "透過 %s　在　%s類別的匿名申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "%s 在 %s　%s類別的申報　"
 
@@ -3680,17 +3749,15 @@ msgstr "已申報 %s"
 msgid "Reporting a problem"
 msgstr "申報問題"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
 #: templates/web/base/around/tabbed_lists.html:3
 #: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
 msgid "Reports"
 msgstr "申報"
 
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
 msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3718,15 +3785,15 @@ msgid "Reports published"
 msgstr "己公開之申報"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
 msgid "Reports saved offline."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
 msgid "Reports sent to %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
 msgid "Reports sent to %s, within %s ward"
 msgstr ""
 
@@ -3739,7 +3806,7 @@ msgstr ""
 msgid "Reposition if needed, then hit Continue"
 msgstr ""
 
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
 msgid "Required"
 msgstr ""
 
@@ -3792,39 +3859,45 @@ msgstr ""
 msgid "Right place?"
 msgstr "正確地點？"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
 msgid "Road operator for this named road (derived from road reference number and type): %s"
 msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s"
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s"
 
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
 #: templates/web/base/admin/roles/index.html:5
 msgid "Role"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
 #: templates/web/base/admin/users/index.html:29
 msgid "Role:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: templates/web/base/admin/roles/form.html:1
 #: templates/web/base/admin/roles/index.html:1
 msgid "Roles"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
 #: templates/web/base/admin/update_edit.html:71
 #: templates/web/zurich/admin/reports/edit.html:106
 msgid "Rotate Left"
 msgstr "左轉　"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
 #: templates/web/base/admin/update_edit.html:72
 #: templates/web/zurich/admin/reports/edit.html:107
 msgid "Rotate Right"
@@ -3840,20 +3913,20 @@ msgstr "旋轉這張照片將會導致申報中未存檔的照片更動消失"
 msgid "Satellite"
 msgstr "衛星"
 
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
 #: templates/web/base/admin/manifesttheme/form.html:58
 #: templates/web/base/admin/reportextrafields/edit.html:64
 #: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
 #: templates/web/base/report/_main.html:129
 #: templates/web/base/report/update.html:58
 #: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3870,13 +3943,12 @@ msgid "Save with a public update"
 msgstr ""
 
 #. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
 msgid "Saving reports offline"
 msgstr ""
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
 msgid "Search Reports"
 msgstr "搜尋申報"
 
@@ -3889,7 +3961,7 @@ msgstr "搜尋使用者"
 msgid "Search for location of email alert or RSS feed"
 msgstr ""
 
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
 msgid "Search reports"
 msgstr "搜尋申報"
 
@@ -3904,12 +3976,12 @@ msgstr "搜尋"
 msgid "Searching found no reports."
 msgstr "查無此申報"
 
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
 msgid "Searching found no users."
 msgstr "查無此用戶"
 
 #: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
 #: templates/web/base/my/my.html:75
 msgid "Security"
 msgstr ""
@@ -3919,8 +3991,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3930,7 +4001,7 @@ msgid "Select a body"
 msgstr "選擇單位"
 
 #: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
 #: templates/web/zurich/admin/bodies/form.html:37
 msgid "Select an area"
 msgstr "選擇區域"
@@ -3951,7 +4022,7 @@ msgstr ""
 msgid "Select:"
 msgstr ""
 
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
 #: templates/web/base/contact/index.html:120
 msgid "Send"
 msgstr ""
@@ -3964,7 +4035,7 @@ msgstr ""
 msgid "Send extended Open311 statuses with service request updates"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
 msgid "Send login email"
 msgstr ""
 
@@ -3973,11 +4044,11 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
 msgid "Sent report back"
 msgstr "送回申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
 msgid "Sent to %s %s later"
 msgstr "%s 稍後送給%s"
 
@@ -4015,7 +4086,7 @@ msgstr ""
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
 msgid "Shortlist all visible"
 msgstr ""
 
@@ -4026,7 +4097,7 @@ msgstr ""
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
 #: templates/web/base/report/_main.html:157
 msgid "Shortlisted by %s"
 msgstr ""
@@ -4051,8 +4122,8 @@ msgstr ""
 msgid "Show older"
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Show older reports"
 msgstr ""
 
@@ -4063,7 +4134,7 @@ msgstr ""
 #. ("JS")
 #: templates/web/base/around/display_location.html:63
 #: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
 msgid "Show pins"
 msgstr "顯示地圖標示"
 
@@ -4126,7 +4197,7 @@ msgid "Some photos of recent reports"
 msgstr "最近申報之照片"
 
 #. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
 msgid "Some text to localize"
 msgstr "有些文字需在地化"
 
@@ -4135,12 +4206,11 @@ msgid "Someone has moderated this report since you started."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
 msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "抱歉，該郵區號碼我們尚未支援"
 
@@ -4158,9 +4228,9 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "抱歉無法確認你的問題"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
 msgid "Sorry, we could not find that location."
 msgstr "抱歉，我們無法找到此位置"
 
@@ -4170,13 +4240,13 @@ msgstr "抱歉，我們無法找到此位置"
 msgid "Sorry, we could not log you in. Please fill in the form below."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
 #: perllib/FixMyStreet/Geocode/Google.pm:56
 #: perllib/FixMyStreet/Geocode/Zurich.pm:119
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "抱歉，我們無法解析此地點，請重試一次"
 
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
 #: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
 #: perllib/FixMyStreet/PhotoStorage.pm:63
 #, fuzzy
@@ -4191,11 +4261,11 @@ msgstr ""
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
 msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
 msgstr ""
 
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
 #: templates/web/base/reports/_list-filters-sort.html:2
 msgid "Sort by"
 msgstr ""
@@ -4204,11 +4274,11 @@ msgstr ""
 msgid "Staff only"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
 msgid "Staff users have permission to log in to the admin."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
 msgid "Staff:"
 msgstr ""
 
@@ -4232,18 +4302,18 @@ msgstr ""
 #: templates/web/base/admin/users/alerts.html:11
 #: templates/web/base/dashboard/index.html:102
 #: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
 #: templates/web/zurich/admin/bodies/contact-form.html:37
 msgid "State"
 msgstr "陳述"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
 msgid "State and external status code cannot be used simultaneously."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
 #: templates/web/base/report/_update_state.html:7
 #: templates/web/base/report/updates.html:21
 msgid "State changed to:"
@@ -4252,31 +4322,28 @@ msgstr ""
 #: templates/web/base/admin/reports/edit.html:128
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
 #: templates/web/zurich/admin/reports/edit.html:91
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "陳述:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
 #: templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
 #: templates/web/base/admin/stats/index.html:1
 #: templates/web/base/admin/stats/state.html:1
 #: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
 msgid "Stats"
 msgstr "統計"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Status"
 msgstr "狀態"
 
@@ -4294,7 +4361,7 @@ msgstr "街景圖"
 msgid "Subcategory"
 msgstr ""
 
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
 msgid "Subdivision/Body"
 msgstr "下屬單位/機關"
 
@@ -4313,50 +4380,48 @@ msgstr "主旨:"
 #: templates/web/base/auth/2fa/form.html:20
 #: templates/web/base/auth/smsform.html:27
 #: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
 #: templates/web/base/report/form/user_loggedout_password.html:29
 #: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
 #: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
 msgid "Submit"
 msgstr "送出"
 
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
 #: templates/web/base/admin/reports/edit.html:25
 #: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
 #: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
 msgid "Submit changes"
 msgstr "送出更新"
 
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
 msgid "Submit questionnaire"
 msgstr "送出問卷"
 
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
 #: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
 msgid "Submitted"
 msgstr "已送出"
 
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
 msgid "Subscribe"
 msgstr "訂閱"
 
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
 msgid "Subscribe by email"
 msgstr ""
 
@@ -4369,7 +4434,7 @@ msgstr ""
 msgid "Summaries are limited to %d characters in length. Please shorten your summary"
 msgstr "更新內容有　%s 字數限制，請簡化您的更新。"
 
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
 #: perllib/FixMyStreet/Cobrand/Rutland.pm:16
 msgid "Summaries are limited to %s characters in length. Please shorten your summary"
 msgstr ""
@@ -4383,20 +4448,19 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
 #: templates/web/base/admin/bodies/index.html:29
 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
 #: templates/web/base/status/index.html:3
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
 msgid "Summary"
 msgstr "摘要"
 
@@ -4407,14 +4471,19 @@ msgstr "申報摘要"
 
 #: templates/web/base/admin/stats/index.html:15
 #: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
 msgid "Summary statistics"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -4432,13 +4501,17 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr "模版 &laquo;%s&raquo;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
 #: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
 msgid "Templates"
 msgstr "模版"
 
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
 #: templates/web/zurich/admin/templates/view.html:9
 msgid "Text"
 msgstr "內文"
@@ -4459,6 +4532,11 @@ msgstr "文字版"
 msgid "Text:"
 msgstr "內文:"
 
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "內文"
+
 #: templates/web/base/tokens/confirm_problem.html:29
 msgid "Thank you for reporting this issue!"
 msgstr "感謝您申報此問題"
@@ -4488,7 +4566,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
 msgstr "謝謝，很高興知道此問題己修復了。請問您過去是否曾申報過問題？ "
 
 #: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
 msgid "Thanks, you have successfully enabled two-factor authentication on your account."
 msgstr ""
 
@@ -4500,27 +4578,29 @@ msgstr "照片上傳似乎無法正常 (%s), 請再試一次。 "
 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
 msgstr "該地區似乎非該地方政府管轄，它可能在轄區外，請再試 一次 "
 
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
 msgid "That location does not appear to be in the UK; please try again."
 msgstr "這地點似乎不在台灣; 請再試 一次。"
 
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
 msgid "That postcode was not recognised, sorry."
 msgstr "抱歉此郵遞區號無法辨識"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
 msgid "That problem has been marked as sent."
 msgstr "問題被標註為送出"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
 msgid "That problem will now be resent."
 msgstr "此問題將重新送出"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
 msgid "That report has been removed from FixMyStreet."
 msgstr "該申報已遭FixMyStreet 移除　"
 
@@ -4570,8 +4650,8 @@ msgstr ""
 msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
 msgstr ""
 
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
 #: templates/web/base/admin/bodies/form.html:101
 #: templates/web/base/admin/bodies/form.html:102
 msgid ""
@@ -4630,7 +4710,7 @@ msgstr "顯示錯誤為: %s"
 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 msgstr "下列 Open311 v2 屬性視要求之回覆而定: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
 
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
 msgstr "下方關於最近道路之資訊未必準確，如果鄰近有多條道路或是在OpenStreetMap上無登記路名資料。"
 
@@ -4692,8 +4772,8 @@ msgstr "用戶無法在地點上標示問題，但可以看到他們輸入的地
 msgid "The user has been sent a login email"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
 msgid ""
 "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
 "                Names are not necessarily unique."
@@ -4728,7 +4808,7 @@ msgstr ""
 msgid "There is already a template with that title."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
@@ -4746,12 +4826,12 @@ msgstr "本頁出現錯誤，請再試一次"
 msgid "There was a problem with your login information."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
 msgid "There was a problem with your update. Please try again."
 msgstr "您的申報有問題，請重試一次"
 
@@ -4759,7 +4839,7 @@ msgstr "您的申報有問題，請重試一次"
 msgid "There were problems with your report. Please see below."
 msgstr "您的申報有問題，請見下方說明"
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
 msgid "There were problems with your update. Please see below."
 msgstr "您的更新有問題，請見下方說明"
 
@@ -4845,10 +4925,10 @@ msgstr "當用戶沒有選擇類別時，電子郵件將送到負責該區域的
 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
 msgstr "電子郵件將送到負責該區域的多個地方政府，因選擇的類別提供這些對象。如果您不是負責受理機關，請略過。"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
 msgid "This information is required"
 msgstr "本項資訊必填"
 
@@ -4865,19 +4945,23 @@ msgstr ""
 msgid "This is the problem"
 msgstr ""
 
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
 #: templates/web/base/admin/users/import.html:65
 msgid "This page is a quick way to create many new staff users in one go."
 msgstr ""
 
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
 msgid "This problem has been fixed"
 msgstr "問題己處理完畢"
 
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
 msgid "This problem has not been fixed"
 msgstr "問題尚未解決"
 
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
 msgid "This problem is still ongoing"
 msgstr ""
 
@@ -4890,26 +4974,26 @@ msgstr ""
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr "此問題尚待審核"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
 msgid "This report is currently marked as closed."
 msgstr "該申報目前注記為結案狀態"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
 msgid "This report is currently marked as fixed."
 msgstr "該申報目前注記為解決狀態"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
 msgid "This report is currently marked as open."
 msgstr "該申報目前注記為開放狀態"
 
 #: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
 msgid "This report is now closed to updates."
 msgstr ""
 
@@ -4917,15 +5001,18 @@ msgstr ""
 msgid "This web page also contains a photo of the problem, provided by the user."
 msgstr "本頁包括由用戶提供反應問題的照片　"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
 #: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
 #: templates/web/zurich/admin/reports/edit.html:94
 msgid "Time spent (in minutes):"
 msgstr "花費時間(以分鐘計):"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
 #: templates/web/base/admin/timeline.html:1
 #: templates/web/base/admin/users/index.html:68
 #: templates/web/base/admin/users/log.html:1
@@ -4949,6 +5036,10 @@ msgstr "標題"
 msgid "Title:"
 msgstr "標題"
 
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
 #: templates/web/base/alert/_index_text.html:21
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
 msgstr "找出適合您的在地通知，請輸入您的郵編或街名區域"
@@ -4974,7 +5065,7 @@ msgid "To view a map of the precise location of this issue"
 msgstr "檢視地圖上問題之確切位置"
 
 #: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
 msgid "Token"
 msgstr ""
 
@@ -4999,11 +5090,6 @@ msgstr ""
 msgid "Total"
 msgstr "總數"
 
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
 #: templates/web/base/admin/bodies/_translations.html:7
 msgid "Translation"
 msgstr ""
@@ -5026,16 +5112,16 @@ msgstr "何不直接發信給我們:"
 
 #: templates/web/base/auth/2fa/intro.html:2
 #: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
 msgid "Two-factor authentication"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
 msgid "Two-factor authentication has been activated"
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
 msgid "Two-factor authentication has been deactivated"
 msgstr ""
 
@@ -5045,7 +5131,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 msgid "Unban"
 msgstr ""
 
@@ -5075,10 +5161,10 @@ msgstr "未知的錯誤"
 
 #: perllib/FixMyStreet/App/Controller/Develop.pm:188
 #: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
 msgid "Unknown problem ID"
 msgstr "未知的問題編號　　"
 
@@ -5090,13 +5176,13 @@ msgstr ""
 msgid "Unshortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
 msgid "Up one"
 msgstr ""
 
 #: templates/web/base/admin/states/index.html:76
 #: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
 msgid "Update"
 msgstr "更新"
 
@@ -5147,29 +5233,27 @@ msgstr "更新重申報之問題　"
 msgid "Update statuses"
 msgstr "更新之狀態"
 
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
 msgid "Updated"
 msgstr "已更新"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
 msgid "Updated by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
 msgid "Updated!"
 msgstr "已更新！"
 
@@ -5180,7 +5264,7 @@ msgstr "已更新！"
 msgid "Updates"
 msgstr "更新"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "更新內容有　%s 字數限制，請簡化您的更新。"
 
@@ -5210,6 +5294,14 @@ msgstr ""
 msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
 msgstr ""
 
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
 #: templates/web/base/admin/bodies/open311-form-fields.html:90
 msgid "User ID to attribute fetched comments to"
 msgstr ""
@@ -5223,8 +5315,8 @@ msgstr ""
 msgid "User added to abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
 msgid "User already exists"
 msgstr ""
 
@@ -5242,7 +5334,7 @@ msgid "User flagged"
 msgstr "給用戶標記警告"
 
 #: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
 #: templates/web/base/admin/users/index.html:65
 msgid "User in abuse table"
 msgstr ""
@@ -5255,27 +5347,25 @@ msgstr "用戶找到相符的名稱與電子郵件"
 msgid "User's alerts"
 msgstr ""
 
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
 #: templates/web/base/admin/update_edit.html:36
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
 #: templates/web/base/admin/flagged.html:29
 #: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
 msgid "Users"
 msgstr "使用者"
 
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
 msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
 msgstr ""
 
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -5283,9 +5373,9 @@ msgstr ""
 msgid "Users with this role can perform the following actions within their assigned body or area."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
 msgid "Values updated"
 msgstr "數值更新"
 
@@ -5311,7 +5401,7 @@ msgstr ""
 msgid "View report on site"
 msgstr "檢視本站之申報　"
 
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
 msgid "View reports by ward"
 msgstr "檢視里/區之申報　"
 
@@ -5319,7 +5409,7 @@ msgstr "檢視里/區之申報　"
 msgid "View wards"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
 msgid "View/Mark private reports"
 msgstr ""
 
@@ -5337,7 +5427,7 @@ msgstr "檢視問題　"
 msgid "Ward:"
 msgstr ""
 
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
 msgid "Wards of this council"
 msgstr "地方政府轄下的里/區"
 
@@ -5407,7 +5497,7 @@ msgstr "何時送出"
 msgid "Which problems do you want alerts about?"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
@@ -5427,7 +5517,7 @@ msgstr ""
 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
 msgstr "您願為FixMyStreet貢獻嗎?這個一個開放原始碼，可從  <a href=\"https://fixmystreet.org\">fixmystreet.org</a>官網進一步了解　"
 
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
 msgstr "您是否願意4週後再收到另一份問卷？以提醒您確認最新的狀況"
 
@@ -5439,7 +5529,6 @@ msgstr ""
 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
 msgstr "請注意留言內容，勿用注音文並應加上標點符號以利閱讀。"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
 #: templates/web/base/admin/bodies/category.html:6
@@ -5450,12 +5539,12 @@ msgstr "請注意留言內容，勿用注音文並應加上標點符號以利閱
 #: templates/web/base/admin/list_updates.html:36
 #: templates/web/base/admin/problem_row.html:20
 #: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users/alerts.html:21
 #: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
 #: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
 msgid "Yes"
 msgstr "是"
 
@@ -5468,7 +5557,7 @@ msgid "You are not sure of the origin or validity of the contact."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
 msgid "You are offline"
 msgstr ""
 
@@ -5481,7 +5570,7 @@ msgid "You are reporting the following update for being abusive, containing pers
 msgstr "您檢舉下列問題之更為濫用，包括個人資料或相似"
 
 #: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
 msgid "You can <a href=\"%s\">make a new report in the same location</a>."
 msgstr ""
 
@@ -5490,7 +5579,7 @@ msgstr ""
 msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
 msgstr "您可<a href=\"%s%s\">在本站上檢視問題</a>."
 
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
 msgstr "您可以新增某位用戶到濫用者名單，它會自動隱藏(不會送出)該名用戶所提交的申報　"
 
@@ -5523,7 +5612,7 @@ msgstr "您可協助我們找出當地問題的承辦人員 %s電子郵件，把
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
 msgstr "您可以刪除某一單位如果不想讓它在本站激活"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
 msgid "You cannot rename a category to an existing category"
 msgstr ""
 
@@ -5533,7 +5622,7 @@ msgid "You declined; please fill in the box above"
 msgstr "您受到拒絕，請填寫上方表格。"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
 msgstr ""
 
@@ -5541,7 +5630,7 @@ msgstr ""
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr "您已回覆過本問卷。如果您有問題，請<href='%s'>保持聯絡</a>, 或是<a href='%s'>檢視　您作的申報</a>\n"
 
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
 #, fuzzy
 msgid "You have already attached files to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "在此申報中你已經附加了照片(注意你最多可附3張照片,如果你還想上傳更多張,原先的照片會被移除)"
@@ -5551,8 +5640,7 @@ msgstr "在此申報中你已經附加了照片(注意你最多可附3張照片,
 msgid "You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
 msgstr "在此申報中你已經附加了照片(注意你最多可附3張照片,如果你還想上傳更多張,原先的照片會被移除)"
 
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
 msgid "You have already attached photos to this update.  Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
 msgstr ""
 
@@ -5619,9 +5707,9 @@ 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/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
@@ -5630,13 +5718,14 @@ msgstr ""
 msgid "Your account requires two-factor authentication to be set up."
 msgstr ""
 
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
 #: templates/web/base/auth/create.html:50
 #: templates/web/base/auth/general.html:56
 #: templates/web/base/contact/enquiry/index.html:18
 #: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
 #: templates/web/base/report/new/duplicate_suggestions.html:42
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
@@ -5665,16 +5754,16 @@ msgstr "姓名"
 msgid "Your name has already been sent to %s, but we can hide it on this page:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
 msgid "Your name has been hidden from all your reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
 msgid "Your name has been hidden."
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
 msgid "Your offline reports"
 msgstr ""
 
@@ -5694,8 +5783,8 @@ msgid "Your password has expired, please create a new one below. When you click
 msgstr ""
 
 #: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
 #: templates/web/zurich/auth/general.html:56
 msgid "Your password should include %d or more characters."
 msgstr ""
@@ -5728,7 +5817,7 @@ msgid "Your update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
@@ -5759,19 +5848,19 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
 #: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
 #: templates/web/base/admin/update_edit.html:92
 #: templates/web/base/report/update/moderation_meta.html:2
 msgid "an administrator"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
 msgid "and a defect raised"
 msgstr ""
 
@@ -5779,8 +5868,8 @@ msgstr ""
 msgid "by %s"
 msgstr "由 %s"
 
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
 msgid "council"
 msgstr "地方政府"
 
@@ -5811,6 +5900,10 @@ msgstr "用戶編輯"
 msgid "from %s different users"
 msgstr "從不同的用戶%s  "
 
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
 #: templates/web/base/report/_item_small.html:22
 #: templates/web/zurich/report/_item.html:16
 msgid "last updated %s"
@@ -5828,7 +5921,7 @@ msgstr "不適用"
 
 #: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
 #: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
 msgid "none"
 msgstr ""
 
@@ -5911,12 +6004,12 @@ msgid "today"
 msgstr "今天"
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
 msgid "update"
 msgstr ""
 
 #. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
 msgid "updates"
 msgstr ""
 
@@ -5941,7 +6034,7 @@ msgid "user removed from abuse list"
 msgstr ""
 
 #: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
 msgid "ward"
 msgstr "路檔"
 
@@ -5993,7 +6086,7 @@ msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
 #, perl-format
 msgid "%s day"
 msgid_plural "%s days"
@@ -6011,7 +6104,7 @@ msgid "%s problem reported"
 msgid_plural "%s problems reported"
 msgstr[0] ""
 
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
 #, perl-format
 msgid "%s report"
 msgid_plural "%s reports"
@@ -6029,19 +6122,19 @@ msgid "<big>%s</big> fixed in past month"
 msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] "上個月解決的<big>%s</big> "
 
-#: templates/web/westminster/front/stats.html:8
+#: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big>  上一週的申報 "
 
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] "近期的申報 <big>%s</big> "
 
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
@@ -6071,18 +6164,30 @@ msgid "last updated %d day ago"
 msgid_plural "last updated %d days ago"
 msgstr[0] ""
 
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
 #, perl-format
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
 #, perl-format
 msgid "report"
 msgid_plural "reports"
 msgstr[0] ""
 
+#~ msgid "Closed by council"
+#~ msgstr "由地方政府關閉"
+
+#~ msgid "Filter report list"
+#~ msgstr "過濾初次申報　"
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "無效的權責單位數值 %s"
+
+#~ msgid "Post"
+#~ msgstr "張貼"
+
 #~ msgid ""
 #~ "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
 #~ "                <br>\n"
diff --git a/templates/web/base/admin/users/_form_details.html b/templates/web/base/admin/users/_form_details.html
index e526ceb06..78debca32 100644
--- a/templates/web/base/admin/users/_form_details.html
+++ b/templates/web/base/admin/users/_form_details.html
@@ -3,7 +3,7 @@
     <p>
       [% loc(
         "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.
-        Names are not necessarily unique.")
+                Names are not necessarily unique.")
       %]
     </p>
   </div>
-- 
cgit v1.2.3